luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-10 00:46:12 +00:00
Code Issues Projects Releases Wiki Activity
6081 commits 1 branch 0 tags 248 MiB
Commit graph

6081 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thibaut Girka a59c146bf8 [Glitch] Profile redirect notes 
Port WebUI changes from 58cede4808
 2018-03-29 14:59:20 +02:00
David Yip 4e45954280
Merge pull request #402 from ThibG/glitch-soc/fixes/accept-empty-toot-contents 
Render toots with empty contents
 2018-03-28 16:39:12 -05:00
David Yip d37a79adce
Merge pull request #403 from ThibG/glitch-soc/fixes/attachment-lists-fixup 
Fix attachment lists
 2018-03-28 16:38:53 -05:00
Thibaut Girka 7db431eac6 Fix attachment lists 2018-03-28 22:19:36 +02:00
Thibaut Girka 53eab4470d Render toots with empty contents 
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-28 21:13:45 +02:00
David Yip 1ed9500b52
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 d2cdc2b5a3
Merge remote-tracking branch 'origin/master' into gs-master 2018-03-27 10:44:12 -05:00
David Yip 49c957bc3b
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master 2018-03-27 10:41:18 -05:00
Rey Tucker 21b586436e Remove ignored 'u' parameter on regexp (#392) 2018-03-27 11:30:49 -04:00
David Yip f61aa8e0f7
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 6af17b79c5
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 3523aa440b 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 88790b91de [Glitch] Display AttachmentList in notifications 
Port 77406d3a09 to glitch-soc
 2018-03-27 16:09:33 +02:00
Thibaut Girka 3bc5452449 [Glitch] Display AttachmentList in timelines in compact style when media missing 
Port 86a9de6753 to glitch-soc
 2018-03-27 16:09:27 +02:00
unarist f5ed5f3860 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 2f3ac14a43 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 ca42f9b0eb Cache media (#6902) 2018-03-27 12:32:30 +02:00
Yuto Tokunaga 31e7b73084 fix #6846 (#6914) 2018-03-27 12:30:28 +02:00
unarist a1d0915585 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 2a90da1837
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 40e5d2303b 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 18965cb0e6 feat(ShowMore): Add classname to show more/show less button (#6904) 2018-03-26 13:59:44 +02:00
Yuto Tokunaga f691afaae9 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 db3be77890 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-26 11:17:19 +00:00
unarist 605a92b460 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 3b2c7a33a9 Missing OTP_SECRET in scalingo.json (#6917) 2018-03-26 12:47:34 +02:00
Jenkins 837b3804bf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-25 15:17:21 +00:00
Marcin Mikołajczak 85a395fab6 i18n: Update Polish translation (#6903) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-03-25 23:33:07 +09:00
Akihiko Odaki cbf97c03bb Allow clients to fetch notifications made while they were offline (#6886) 2018-03-24 22:07:23 +01:00
Akihiko Odaki 9a1a55ce52 Allow clients to fetch statuses made while they were offline (#6876) 2018-03-24 15:25:15 +01:00
Akihiko Odaki 59657e24b9 Rename variables to have semantic meanings in notifications reducer (#6890) 2018-03-24 13:36:44 +01:00
Akihiko Odaki fe398a098e Store objects to IndexedDB (#6826) 2018-03-24 13:06:27 +01:00
Yamagishi Kazutoshi 28384c1771 Revert "Revert "Upgrade Paperclip to version 6.0.0" (#6807)" (#6808) 
This reverts commit 40871caa4b.
 2018-03-24 12:52:45 +01:00
Akihiko Odaki ff7941e652 Show media modal on public pages (#6801) 2018-03-24 12:52:26 +01:00
Marcin Mikołajczak 1c15329cce 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 b2a4ffd3a9 Change columns in notifications nonnullable (#6764) 2018-03-24 12:51:28 +01:00
Akihiko Odaki fa310695fa Note if the user is already following the target when authorizing follow (#6325) 2018-03-24 12:50:41 +01:00
Jeroen 580835ab69 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 54b273bf99 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 4e71b104e6 Internationalize unexpected error message (#6887) 2018-03-24 10:54:19 +01:00
Yamagishi Kazutoshi 65c10c0bc8 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 995b59526b
Re-insert stack size fix in Dockerfile 2018-03-23 12:09:22 -05:00
David Yip 1772034ef2
Merge pull request #398 from ashkitten/compressed-notifs 
make expanded notifications show like default
 2018-03-23 11:57:12 -05:00
Jenkins 03b2f701e7 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-23 10:17:18 +00:00
Quentí ecdc5957a3 [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 58eeb92755 expanded notifications show like default 2018-03-22 10:20:36 -04:00
Eugen Rochko 6cc432bbc4
Bump version to 2.3.2 2018-03-22 14:13:46 +01:00
Eugen Rochko dafae9818d
Bump version to 2.3.2rc5 2018-03-22 11:31:52 +01:00
Eugen Rochko 9fe1619db9
Do not re-query mentions from serializers (#6858) 
Fix performance regression from #6836
 2018-03-22 11:31:17 +01:00
Eugen Rochko da70aca28e
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