David Yip
e6e537d002
Merge pull request #400 from vulpineclub/dev-gs-392-frontmatter
...
Remove ignored 'u' parameter on regexp (#392 )
2018-03-27 13:06:28 -05:00
David Yip
2567d0a704
Merge remote-tracking branch 'origin/master' into gs-master
2018-03-27 10:44:12 -05:00
David Yip
1bf0a6548c
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2018-03-27 10:41:18 -05:00
Rey Tucker
b65fc60334
Remove ignored 'u' parameter on regexp ( #392 )
2018-03-27 11:30:49 -04:00
David Yip
7cdf2b05b6
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/javascript/styles/mastodon/components.scss
app/models/media_attachment.rb
2018-03-27 10:26:47 -05:00
David Yip
9f55021e7e
Merge pull request #399 from ThibG/glitch-soc/features/attachments-list
...
Port attachment lists to glitch-soc flavour
2018-03-27 10:20:52 -05:00
unarist
2111defbbf
Fix LoadMore on account media gallery ( #6933 )
...
max_id in the fetch request should be a status id, but media attachment id was used.
2018-03-27 16:53:52 +02:00
Thibaut Girka
8fc7f85356
[Glitch] Display AttachmentList in notifications
...
Port 2cb19bf443
to glitch-soc
2018-03-27 16:09:33 +02:00
Thibaut Girka
9454cfc0ad
[Glitch] Display AttachmentList in timelines in compact style when media missing
...
Port 5079c1e322
to glitch-soc
2018-03-27 16:09:27 +02:00
unarist
cfd1fe74c9
Clone response before put it to the cache ( #6932 )
...
`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-27 15:18:35 +02:00
unarist
9487e8a4c0
Add missing null handling in notification reducer ( #6930 )
...
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-27 13:05:59 +02:00
Akihiko Odaki
e829c21cc6
Cache media ( #6902 )
2018-03-27 12:32:30 +02:00
Yuto Tokunaga
5eea3f9877
fix #6846 ( #6914 )
2018-03-27 12:30:28 +02:00
unarist
0fb7252ac4
Add a spec for UniqueUsernameValidator ( #6927 )
...
Note that this spec has a pending test about dots in the username,
because allowing it has been reverted for now.
2018-03-27 05:22:58 +02:00
Eugen Rochko
ebba6fb7f5
Fix UniqueUsernameValidator comparison ( #6926 )
...
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-27 04:33:57 +02:00
Akihiko Odaki
acece7a2e6
Validate HTTP response length while receiving ( #6891 )
...
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-26 14:02:10 +02:00
Stephen Burgess
f9e88856e3
feat(ShowMore): Add classname to show more/show less button ( #6904 )
2018-03-26 13:59:44 +02:00
Yuto Tokunaga
480131a376
Refactor scss ( #6913 )
...
* 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-26 13:59:21 +02:00
Jenkins
43a16782ef
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-26 11:17:19 +00:00
unarist
351203118c
Fix moved account handling in IndexedDB feature ( #6915 )
...
* 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-26 12:48:01 +02:00
Yann Klis
740f44ecc4
Missing OTP_SECRET in scalingo.json ( #6917 )
2018-03-26 12:47:34 +02:00
Jenkins
ae55717f50
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-25 15:17:21 +00:00
Marcin Mikołajczak
29dfe740f6
i18n: Update Polish translation ( #6903 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-03-25 23:33:07 +09:00
Akihiko Odaki
9eaa47845c
Allow clients to fetch notifications made while they were offline ( #6886 )
2018-03-24 22:07:23 +01:00
Akihiko Odaki
34cb1a5461
Allow clients to fetch statuses made while they were offline ( #6876 )
2018-03-24 15:25:15 +01:00
Akihiko Odaki
42786040d1
Rename variables to have semantic meanings in notifications reducer ( #6890 )
2018-03-24 13:36:44 +01:00
Akihiko Odaki
43f2b0281d
Store objects to IndexedDB ( #6826 )
2018-03-24 13:06:27 +01:00
Yamagishi Kazutoshi
6daa722e87
Revert "Revert "Upgrade Paperclip to version 6.0.0" ( #6807 )" ( #6808 )
...
This reverts commit d35272245e
.
2018-03-24 12:52:45 +01:00
Akihiko Odaki
47d2277ef1
Show media modal on public pages ( #6801 )
2018-03-24 12:52:26 +01:00
Marcin Mikołajczak
3386112fb1
Change “Toots with replies” to “Toots and replies” ( #6875 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-03-24 12:51:51 +01:00
Akihiko Odaki
472fba6771
Change columns in notifications nonnullable ( #6764 )
2018-03-24 12:51:28 +01:00
Akihiko Odaki
9125608145
Note if the user is already following the target when authorizing follow ( #6325 )
2018-03-24 12:50:41 +01:00
Jeroen
0bedd0bb45
Invites: Add '1 week' as expire option ( #6872 )
...
* 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-24 12:50:14 +01:00
Akihiko Odaki
11c19f6cc9
Close http connection in perform method of Request class ( #6889 )
...
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-24 12:49:54 +01:00
Akihiko Odaki
e8a1d0b4d4
Internationalize unexpected error message ( #6887 )
2018-03-24 10:54:19 +01:00
Yamagishi Kazutoshi
ed074766aa
Weblate translations (2018-03-23) ( #6874 )
...
* 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-24 01:04:02 +01:00
David Yip
7c45e21b25
Re-insert stack size fix in Dockerfile
2018-03-23 12:09:22 -05:00
David Yip
5a833423e2
Merge pull request #398 from ashkitten/compressed-notifs
...
make expanded notifications show like default
2018-03-23 11:57:12 -05:00
Jenkins
60eafb173f
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-23 10:17:18 +00:00
Quentí
a8c2ce486f
[i18n] Occitan update ( #6869 )
...
* Update oc.yml
* Update simple_form.oc.yml
* Update oc.json
* Update oc.yml
* bundle exec i18n-tasks normalize
2018-03-23 18:52:25 +09:00
Ash Levy
21e374356a
expanded notifications show like default
2018-03-22 10:20:36 -04:00
Eugen Rochko
3939ca8a33
Bump version to 2.3.2
2018-03-22 14:13:46 +01:00
Eugen Rochko
f4ef86a334
Bump version to 2.3.2rc5
2018-03-22 11:31:52 +01:00
Eugen Rochko
6383580e6f
Do not re-query mentions from serializers ( #6858 )
...
Fix performance regression from #6836
2018-03-22 11:31:17 +01:00
Eugen Rochko
f4e8e39c99
Restore username validation to disallow dots, for now ( #6863 )
...
Usernames with dots in them do not work with routes, because the dot usually separates the desired page format (e.g. json). I don't want to mess with changing route constraints for this patch release.
2018-03-22 11:30:22 +01:00
ThibG
7d7a725e82
Fix MENTION_RE to not match nil usernames ( #6862 )
2018-03-22 10:45:48 +01:00
Eugen Rochko
692d03239b
Hide floating action button on thread views ( #6859 )
2018-03-22 09:33:14 +01:00
David Yip
fe6b28185f
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2018-03-21 13:39:31 -05:00
Jenkins
a9bcd383b8
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-21 17:17:20 +00:00
Patrick Figel
e62904bcba
Update sanitize and loofah ( #6855 )
...
Fixes CVE-2018-8048 and CVE-2018-3740, two medium-severity XSS
vulnerabilities present in these gems when built against
libxml2 >= 2.9.2.
2018-03-21 17:43:28 +01:00