me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Commit graph

  • 89740d69ec Fix upload file input being re-rendered needlessly Eugen Rochko 2017-01-16 14:21:55 +0100
  • 1a33e4042e Fix upload file input being re-rendered needlessly Eugen Rochko 2017-01-16 14:21:55 +0100
  • f4d7f4c687 Fix #238 - Add "favourites" column Eugen Rochko 2017-01-16 13:27:58 +0100
  • 7d53ee73f3 Fix #238 - Add "favourites" column Eugen Rochko 2017-01-16 13:27:58 +0100
  • 81db795253 Fix #414 - Improve lightbox, add loading indicator Eugen Rochko 2017-01-16 12:04:02 +0100
  • da5d366230 Fix #414 - Improve lightbox, add loading indicator Eugen Rochko 2017-01-16 12:04:02 +0100
  • 1ed33af06c Merge branch 'blackle-sensitive' Eugen Rochko 2017-01-16 11:37:35 +0100
  • a78148f763 Merge branch 'blackle-sensitive' Eugen Rochko 2017-01-16 11:37:35 +0100
  • 780df33037 Merge branch 'sensitive' of https://github.com/blackle/mastodon into blackle-sensitive Eugen Rochko 2017-01-16 11:36:02 +0100
  • 2ae0fb4419 Merge branch 'sensitive' of https://github.com/blackle/mastodon into blackle-sensitive Eugen Rochko 2017-01-16 11:36:02 +0100
  • 972fb80de6 Move follow requests link above logout link in getting started column Eugen Rochko 2017-01-16 11:35:32 +0100
  • 0439c7d58b Move follow requests link above logout link in getting started column Eugen Rochko 2017-01-16 11:35:32 +0100
  • 9ac182d831 Show visibility toggle on media gallery for sensitive images blackle 2017-01-15 20:26:03 -0500
  • 144402ec7e Show visibility toggle on media gallery for sensitive images blackle 2017-01-15 20:26:03 -0500
  • b1075ccb86 Merge pull request #478 from blackle/backflip Eugen 2017-01-15 18:45:53 +0100
  • 3778355454 Merge pull request #478 from blackle/backflip Eugen 2017-01-15 18:45:53 +0100
  • 5c3c7c545c Change boost sprite to look like fa-retweet blackle 2017-01-15 10:55:31 -0500
  • 383114add3 Change boost sprite to look like fa-retweet blackle 2017-01-15 10:55:31 -0500
  • 7e46083338 Fix typo introduced in #470 which made unlisted toggle only fade in/out and not also collapse Eugen Rochko 2017-01-15 14:59:25 +0100
  • 926459fc0a Fix typo introduced in #470 which made unlisted toggle only fade in/out and not also collapse Eugen Rochko 2017-01-15 14:59:25 +0100
  • 73e217d9d7 Fix #427 - don't suggest hashtag if the search value contains a space Eugen Rochko 2017-01-15 14:45:43 +0100
  • 7d7a11250c Fix #427 - don't suggest hashtag if the search value contains a space Eugen Rochko 2017-01-15 14:45:43 +0100
  • 58b0fe2f28 Fix #449 - don't do relationships fetch for empty array of IDs Eugen Rochko 2017-01-15 14:41:49 +0100
  • 1d5cbfa356 Fix #449 - don't do relationships fetch for empty array of IDs Eugen Rochko 2017-01-15 14:41:49 +0100
  • 11117f5aec Fix #466 - when logged in, make "get started" link to the frontpage instead of sign up Eugen Rochko 2017-01-15 14:38:59 +0100
  • cc1eccc8bc Fix #466 - when logged in, make "get started" link to the frontpage instead of sign up Eugen Rochko 2017-01-15 14:38:59 +0100
  • 3471b9acb1 Merge pull request #476 from ineffyble/fix-paperclip-s3-acl Eugen 2017-01-15 14:29:47 +0100
  • 16f9490d33 Merge pull request #476 from ineffyble/fix-paperclip-s3-acl Eugen 2017-01-15 14:29:47 +0100
  • cd8e2f8ac8 Merge branch 'ineffyble-feature/toot-app-source' Eugen Rochko 2017-01-15 14:04:56 +0100
  • bfec9aaee0 Merge branch 'ineffyble-feature/toot-app-source' Eugen Rochko 2017-01-15 14:04:56 +0100
  • 5d88ef90c9 Fix tests, add applications to eager loading/cache for statuses, fix application website validation, don't link to app website if website isn't set, also comment out animated boost icon from #464 until it's consistent with non-animated version Eugen Rochko 2017-01-15 14:01:33 +0100
  • e9737c2235 Fix tests, add applications to eager loading/cache for statuses, fix application website validation, don't link to app website if website isn't set, also comment out animated boost icon from #464 until it's consistent with non-animated version Eugen Rochko 2017-01-15 14:01:33 +0100
  • 3a957e127a Merge branch 'feature/toot-app-source' of https://github.com/ineffyble/mastodon into ineffyble-feature/toot-app-source Eugen Rochko 2017-01-15 13:23:47 +0100
  • ab165547fd Merge branch 'feature/toot-app-source' of https://github.com/ineffyble/mastodon into ineffyble-feature/toot-app-source Eugen Rochko 2017-01-15 13:23:47 +0100
  • 91edf829ec Merge pull request #464 from blackle/backflip Eugen 2017-01-15 13:19:15 +0100
  • 1f7c0ad8d3 Merge pull request #464 from blackle/backflip Eugen 2017-01-15 13:19:15 +0100
  • db40fd4641 Change default S3 ACL string used by Paperclip from 'public' (which is invalid) to 'public-read' Effy Elden 2017-01-15 20:58:46 +1100
  • a097dd489b Change default S3 ACL string used by Paperclip from 'public' (which is invalid) to 'public-read' Effy Elden 2017-01-15 20:58:46 +1100
  • 195d976d1a Merge pull request #474 from ineffyble/add-back-link-to-settings Eugen 2017-01-15 02:15:37 +0100
  • 777f527d86 Merge pull request #474 from ineffyble/add-back-link-to-settings Eugen 2017-01-15 02:15:37 +0100
  • 21c888fefd Add a textual 'Back to Mastodon' link in footer of settings pages Effy Elden 2017-01-15 11:03:35 +1100
  • e45fed58cb Add a textual 'Back to Mastodon' link in footer of settings pages Effy Elden 2017-01-15 11:03:35 +1100
  • 80f186cdf0 Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether Effy Elden 2017-01-15 10:30:23 +1100
  • ed41f9f0b1 Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether Effy Elden 2017-01-15 10:30:23 +1100
  • c10a41e89e Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether Effy Elden 2017-01-15 10:27:54 +1100
  • 3f84816b24 Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether Effy Elden 2017-01-15 10:27:54 +1100
  • 77e78ed6aa Make boost button arrows spin around blackle 2017-01-13 23:32:27 -0500
  • a67ffcbf56 Make boost button arrows spin around blackle 2017-01-13 23:32:27 -0500
  • 6d333d9fc6 Merge branch 'feature/toot-app-source' of github.com:ineffyble/mastodon into feature/toot-app-source Effy Elden 2017-01-15 09:12:11 +1100
  • f81dc7a33a Merge branch 'feature/toot-app-source' of github.com:ineffyble/mastodon into feature/toot-app-source Effy Elden 2017-01-15 09:12:11 +1100
  • 2c042fe57f Test for presence of Application in haml before trying to render details, to fix errors identified by CI Effy Elden 2017-01-15 09:10:44 +1100
  • 6c002cf615 Test for presence of Application in haml before trying to render details, to fix errors identified by CI Effy Elden 2017-01-15 09:10:44 +1100
  • e751dd669a Fix typo in rel Effy Elden 2017-01-15 09:04:14 +1100
  • 65122798b2 Fix typo in rel Effy Elden 2017-01-15 09:04:14 +1100
  • 8e0c1914fb Add tracking of OAuth app that posted a status, extend OAuth apps to have optional website field, add application details to API, show application name and website on detailed status views. Resolves #11 Effy Elden 2017-01-15 08:58:50 +1100
  • d6bc0e8db4 Add tracking of OAuth app that posted a status, extend OAuth apps to have optional website field, add application details to API, show application name and website on detailed status views. Resolves #11 Effy Elden 2017-01-15 08:58:50 +1100
  • cbcd9b3503 Merge pull request #470 from ineffyble/fix/412-hide-public-timeline-option-for-replies Eugen 2017-01-14 20:33:10 +0100
  • 88801f7554 Merge pull request #470 from ineffyble/fix/412-hide-public-timeline-option-for-replies Eugen 2017-01-14 20:33:10 +0100
  • 49ff508743 Hide 'Do not display on public timeline' for reply toots. Fixes #412. Effy Elden 2017-01-15 06:10:23 +1100
  • 32d756fb22 Hide 'Do not display on public timeline' for reply toots. Fixes #412. Effy Elden 2017-01-15 06:10:23 +1100
  • 4b384d6914 Fix too late return Eugen 2017-01-14 02:22:16 +0100
  • f63f0c4625 Fix too late return Eugen 2017-01-14 02:22:16 +0100
  • 8442a176c5 Improve extended about page layout Eugen Rochko 2017-01-13 20:27:02 +0100
  • 7cde08e30b Improve extended about page layout Eugen Rochko 2017-01-13 20:27:02 +0100
  • f2667139ad Adding about/more page with extended information that can be set up by an admin Eugen Rochko 2017-01-13 20:14:21 +0100
  • c01dd089ff Adding about/more page with extended information that can be set up by an admin Eugen Rochko 2017-01-13 20:14:21 +0100
  • 533448be42 Add extended about page stub Eugen Rochko 2017-01-13 03:24:41 +0100
  • e25170f960 Add extended about page stub Eugen Rochko 2017-01-13 03:24:41 +0100
  • 6d98465db2 Extend rails-settings-cached to merge db-saved hash values with defaults Eugen Rochko 2017-01-13 02:42:22 +0100
  • 2939e9898b Extend rails-settings-cached to merge db-saved hash values with defaults Eugen Rochko 2017-01-13 02:42:22 +0100
  • 1a30737ff5 Add settings for contact information Eugen Rochko 2017-01-12 20:54:14 +0100
  • ca50ceeaf0 Add settings for contact information Eugen Rochko 2017-01-12 20:54:14 +0100
  • 7e7c2bbb0f Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings with YAML-defined defaults. Add admin page for editing global settings. Add "site_description" setting that would show as a paragraph on the frontpage Eugen Rochko 2017-01-12 20:46:24 +0100
  • b11fdc3ae3 Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings with YAML-defined defaults. Add admin page for editing global settings. Add "site_description" setting that would show as a paragraph on the frontpage Eugen Rochko 2017-01-12 20:46:24 +0100
  • f622f4e137 Merge pull request #461 from vjackson725/master Eugen 2017-01-12 13:50:17 +0100
  • babc6a1528 Merge pull request #461 from vjackson725/master Eugen 2017-01-12 13:50:17 +0100
  • 1403f5b31b fix Vagrantfile so that the correct ruby is installed vjackson725 2017-01-12 23:20:55 +1100
  • 91dc21c469 fix Vagrantfile so that the correct ruby is installed vjackson725 2017-01-12 23:20:55 +1100
  • ac95c2dbfe Add rake task for clearing out media from silenced accounts Eugen Rochko 2017-01-12 04:19:04 +0100
  • 8f54a8851a Add rake task for clearing out media from silenced accounts Eugen Rochko 2017-01-12 04:19:04 +0100
  • 1a77ccb668 Fix #457 - escape JSON in INITIAL_STATE (this bug only ever allowed a user to xss themselves rather than anyone else) Eugen Rochko 2017-01-12 03:54:50 +0100
  • 4a2ee43e80 Fix #457 - escape JSON in INITIAL_STATE (this bug only ever allowed a user to xss themselves rather than anyone else) Eugen Rochko 2017-01-12 03:54:50 +0100
  • 992c8d2c41 Add ruby version to Gemfile, move devDependencies in package.json to dependencies, fix bug in process feed service Eugen Rochko 2017-01-11 15:39:31 +0100
  • 7951e7ffd5 Add ruby version to Gemfile, move devDependencies in package.json to dependencies, fix bug in process feed service Eugen Rochko 2017-01-11 15:39:31 +0100
  • 9eb3f68499 Merge pull request #456 from ineffyble/fix-repo-url Eugen 2017-01-11 14:19:19 +0100
  • 10739df458 Merge pull request #456 from ineffyble/fix-repo-url Eugen 2017-01-11 14:19:19 +0100
  • efd8ce920f Better animations Eugen Rochko 2017-01-11 04:21:49 +0100
  • 3ad0496ccb Better animations Eugen Rochko 2017-01-11 04:21:49 +0100
  • ad61a21752 Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places Effy Elden 2017-01-11 13:24:14 +1100
  • f876a8681d Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places Effy Elden 2017-01-11 13:24:14 +1100
  • 001a73c6fc Fix env variable name Eugen 2017-01-10 22:01:13 +0100
  • 4292cf60ae Fix env variable name Eugen 2017-01-10 22:01:13 +0100
  • bc17613e70 Fix issue when settings are not defined for column type Eugen Rochko 2017-01-10 17:33:32 +0100
  • 18b11100e7 Fix issue when settings are not defined for column type Eugen Rochko 2017-01-10 17:33:32 +0100
  • c8bcd413e2 Home column filters Eugen Rochko 2017-01-10 17:25:10 +0100
  • 312c51b5c8 Home column filters Eugen Rochko 2017-01-10 17:25:10 +0100
  • 15b183117c Add "not found" component to UI Eugen Rochko 2017-01-10 13:50:40 +0100
  • 1e9d2c4b1e Add "not found" component to UI Eugen Rochko 2017-01-10 13:50:40 +0100
  • 14a0bec2d8 Add link to list of apps Eugen 2017-01-10 12:23:30 +0100
  • a1db2a191b Add link to list of apps Eugen 2017-01-10 12:23:30 +0100