about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-03-29Merge pull request #404 from ThibG/glitch-soc/features/moved-noteDavid Yip
[Untested] [Glitch] Profile redirect notes
2018-03-29[Glitch] Display unfollow button even if account movedThibaut Girka
Backport 3987bd18a4bfaee49ea9a3439fc51610aeca6c2c to glitch-soc
2018-03-29[Glitch] Profile redirect notesThibaut Girka
Port WebUI changes from 58cede4808baa4db6cc143b80ef23e8179a8415b
2018-03-28Merge pull request #402 from ThibG/glitch-soc/fixes/accept-empty-toot-contentsDavid Yip
Render toots with empty contents
2018-03-28Merge pull request #403 from ThibG/glitch-soc/fixes/attachment-lists-fixupDavid Yip
Fix attachment lists
2018-03-28Fix attachment listsThibaut Girka
2018-03-28Render toots with empty contentsThibaut Girka
This is necessary to display toots with media but otherwise no contents, as glitch-soc displays the media as a child of StatusContent, unlike Mastodon.
2018-03-27Merge pull request #400 from vulpineclub/dev-gs-392-frontmatterDavid Yip
Remove ignored 'u' parameter on regexp (#392)
2018-03-27Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-03-27Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-masterDavid Yip
2018-03-27Remove ignored 'u' parameter on regexp (#392)Rey Tucker
2018-03-27Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
Conflicts: app/javascript/styles/mastodon/components.scss app/models/media_attachment.rb
2018-03-27Merge pull request #399 from ThibG/glitch-soc/features/attachments-listDavid Yip
Port attachment lists to glitch-soc flavour
2018-03-27Fix LoadMore on account media gallery (#6933)unarist
max_id in the fetch request should be a status id, but media attachment id was used.
2018-03-27[Glitch] Display AttachmentList in notificationsThibaut Girka
Port 77406d3a092db48250a85984dde2f2cc81386146 to glitch-soc
2018-03-27[Glitch] Display AttachmentList in timelines in compact style when media missingThibaut Girka
Port 86a9de6753fc425b247699c7822bc8a5d49af043 to glitch-soc
2018-03-27Clone response before put it to the cache (#6932)unarist
`Response.prototype.clone()` must be called before the response used. This fixes an error from ServiceWorker and failing to load image when the image is not cached.
2018-03-27Add missing null handling in notification reducer (#6930)unarist
This patch adds null item (i.e. gap) handling on below functions to avoid TypeError. * `filterNotifications` called on user mute/block * `deleteByStatus` called on status deletion
2018-03-27Cache media (#6902)Akihiko Odaki
2018-03-27fix #6846 (#6914)Yuto Tokunaga
2018-03-27Add a spec for UniqueUsernameValidator (#6927)unarist
Note that this spec has a pending test about dots in the username, because allowing it has been reverted for now.
2018-03-27Fix UniqueUsernameValidator comparison (#6926)Eugen Rochko
Comparison was downcasing only one side, therefore if previously existing account had a non-lowercase spelling, it would be ignored when checking for duplicates. New rake task `mastodon:maintenance:find_duplicate_usernames` will help find constraint violations that might have occured from the presence of this bug. Bump version to 2.3.3
2018-03-26Validate HTTP response length while receiving (#6891)Akihiko Odaki
to_s method of HTTP::Response keeps blocking while it receives the whole content, no matter how it is big. This means it may waste time to receive unacceptably large files. It may also consume memory and disk in the process. This solves the inefficency by checking response length while receiving.
2018-03-26feat(ShowMore): Add classname to show more/show less button (#6904)Stephen Burgess
2018-03-26Refactor scss (#6913)Yuto Tokunaga
* Refactoring scss introduce scss variables for the media modal fix css block structure corresponding to react components fix flex layouts remove background image of the loaded image on the media modal * Fix typo
2018-03-26Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-26Fix moved account handling in IndexedDB feature (#6915)unarist
* Fix stack overflow on importFetchedAccounts When the account has moved property, it should process destination account instead of source account itself. * Set account id instead of account object for moved property This restores "foo has moved to" indication on account view, and fixes `reblog` index on `accounts` object store.
2018-03-26Missing OTP_SECRET in scalingo.json (#6917)Yann Klis
2018-03-25Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-25i18n: Update Polish translation (#6903)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-03-24Allow clients to fetch notifications made while they were offline (#6886)Akihiko Odaki
2018-03-24Allow clients to fetch statuses made while they were offline (#6876)Akihiko Odaki
2018-03-24Rename variables to have semantic meanings in notifications reducer (#6890)Akihiko Odaki
2018-03-24Store objects to IndexedDB (#6826)Akihiko Odaki
2018-03-24Revert "Revert "Upgrade Paperclip to version 6.0.0" (#6807)" (#6808)Yamagishi Kazutoshi
This reverts commit 40871caa4b06c7ee1c3b07f439ed984ead295ced.
2018-03-24Show media modal on public pages (#6801)Akihiko Odaki
2018-03-24Change “Toots with replies” to “Toots and replies” (#6875)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-03-24Change columns in notifications nonnullable (#6764)Akihiko Odaki
2018-03-24Note if the user is already following the target when authorizing follow (#6325)Akihiko Odaki
2018-03-24Invites: Add '1 week' as expire option (#6872)Jeroen
* Invites: Add '1 week' as expire option IMO a max. of 1 day is too short. Not everyone has the time and motivation to use an invite in a 24 hour period. 1 week as a max. is I think a good compromise between convenience and security. * Invites: Add '1 week' as expire option IMO a max. of 1 day is too short. Not everyone has the time and motivation to use an invite in a 24 hour period. 1 week as a max. is I think a good compromise between convenience and security. * Update en.yml
2018-03-24Close http connection in perform method of Request class (#6889)Akihiko Odaki
HTTP connections must be explicitly closed in many cases, and letting perform method close connections makes its callers less redundant and prevent them from forgetting to close connections.
2018-03-24Internationalize unexpected error message (#6887)Akihiko Odaki
2018-03-24Weblate translations (2018-03-23) (#6874)Yamagishi Kazutoshi
* Translated using Weblate (Galician) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Arabic) Currently translated at 76.4% (449 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Slovak) Currently translated at 92.3% (542 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 92.3% (542 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Polish) Currently translated at 98.9% (581 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (French) Currently translated at 99.6% (585 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Catalan) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * bundle exec i18n-tasks normalize && yarn manage:translations
2018-03-23Re-insert stack size fix in DockerfileDavid Yip
2018-03-23Merge pull request #398 from ashkitten/compressed-notifsDavid Yip
make expanded notifications show like default
2018-03-23Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-23[i18n] Occitan update (#6869)Quentí
* Update oc.yml * Update simple_form.oc.yml * Update oc.json * Update oc.yml * bundle exec i18n-tasks normalize
2018-03-22expanded notifications show like defaultAsh Levy
2018-03-22Bump version to 2.3.2Eugen Rochko
2018-03-22Bump version to 2.3.2rc5Eugen Rochko