ae7d5ee768
Move hide_followers_count logic to an helper
2018-12-20 14:51:12 +01:00
cabf2772ea
Add a per-user setting to hide followers count
...
This is only available if the instance-wide setting isn't set and allows
people to hide their own followers count. This does not hide others' to
them.
2018-12-20 14:51:12 +01:00
80f956bc3e
Per-user followers count display in profile directory
2018-12-20 14:51:12 +01:00
3ba1aa8d2b
Hide negative follower counts from glitch flavour
2018-12-20 14:51:12 +01:00
20418dc7a7
Add admin setting to disable followers count
2018-12-20 14:51:12 +01:00
a52a0e021b
Refactor followers_accounts_controller
2018-12-20 14:51:12 +01:00
e756191722
Add specs for InvitePolicy ( #9589 )
2018-12-20 04:23:09 +01:00
d4b4e87153
Add specs for EmailDomainBlockPolicy ( #9586 )
2018-12-20 03:51:41 +01:00
fcb045060e
Add specs for InstancePolicy ( #9587 )
2018-12-20 03:51:31 +01:00
ce51a08674
Add specs for DomainBlockPolicy ( #9585 )
2018-12-20 03:47:51 +01:00
31f7af3cad
Add specs for CustomEmojiPolicy ( #9584 )
2018-12-20 03:24:28 +01:00
ae8c6b892f
Allow unauthenticated REST API access to GET /api/v1/accounts/:id/statuses ( #9573 )
...
Fix #7087
The same data is available over the ActivityPub outbox, RSS, and Atom, so
there is little benefit to keeping it limited in this method.
2018-12-20 01:30:43 +01:00
240d41b3ca
Fix unnecessary loadMore calls when the end of a timeline has been reached ( #9581 )
...
Fixes #9568
2018-12-19 22:23:16 +01:00
450b428536
Override current_user when generating static pages
2018-12-19 20:49:58 +01:00
2e964346ce
Restore oops.gif animation for user who have auto_play_gif set
2018-12-19 20:49:58 +01:00
2059bbd0ed
Replace animated oops.gif by a non-animated image
...
Fixes #6060
2018-12-19 20:49:58 +01:00
dcab109a1c
Add specs for BackupPolicy ( #9576 )
2018-12-19 18:24:15 +01:00
bdb82dd64a
Merge pull request #865 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-12-19 16:19:00 +01:00
e60b59e5ca
Weblate translations (2018-12-19) ( #9578 )
...
* Translated using Weblate (Greek)
Currently translated at 99.7% (715 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Czech)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Japanese)
Currently translated at 97.5% (699 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Slovak)
Currently translated at 99.7% (715 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Dutch)
Currently translated at 99.7% (715 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Galician)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Korean)
Currently translated at 100.0% (717 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/
* Translated using Weblate (Korean)
Currently translated at 100.0% (350 of 350 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/
* Translated using Weblate (Korean)
Currently translated at 100.0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 98.9% (709 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 97.8% (91 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/
* Translated using Weblate (Corsican)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/
* Translated using Weblate (French)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (French)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Arabic)
Currently translated at 96.8% (90 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Arabic)
Currently translated at 96.8% (694 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Dutch)
Currently translated at 100,0% (717 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Czech)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Slovak)
Currently translated at 99.7% (715 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Czech)
Currently translated at 100.0% (350 of 350 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Czech)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Italian)
Currently translated at 100,0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/
* Translated using Weblate (Czech)
Currently translated at 99,9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Catalan)
Currently translated at 100,0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/
* Translated using Weblate (Catalan)
Currently translated at 100,0% (717 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Czech)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Occitan)
Currently translated at 100,0% (350 of 350 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/
* Translated using Weblate (Occitan)
Currently translated at 99,7% (715 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (Occitan)
Currently translated at 100,0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/
* Translated using Weblate (Czech)
Currently translated at 99.9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Greek)
Currently translated at 99.7% (715 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (350 of 350 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (French)
Currently translated at 100.0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/
* Translated using Weblate (German)
Currently translated at 100,0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/
* Translated using Weblate (German)
Currently translated at 99,9% (716 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (Japanese)
Currently translated at 97,5% (699 of 717 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Korean)
Currently translated at 100,0% (350 of 350 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/
* Translated using Weblate (Czech)
Currently translated at 100.0% (350 of 350 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Normalize translations
* Normalize translations, remove unused, add missing plurals
2018-12-19 21:07:05 +09:00
ce7ac8c1d7
[Glitch] Improved appearance of notification filter on safari
...
Port e9ad8044cc
2018-12-19 13:00:08 +01:00
d53f315824
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-19 12:58:49 +01:00
d338a2099e
Add specs for AccountPolicy ( #9575 )
2018-12-19 08:56:59 +01:00
26f2c1240e
Update Japanese translations. ( #9574 )
2018-12-19 08:51:02 +01:00
48a70180e2
Add specs for AccountModerationNotePolicy ( #9571 )
2018-12-19 07:24:03 +01:00
bae098d118
Add specs for StatusPolicy ( #9569 )
2018-12-19 05:19:20 +01:00
e9ad8044cc
improved appearance of notification filter on safari ( #9564 )
2018-12-18 22:28:09 +01:00
a8f77d9f91
Clean up dead code in public timeline code ( #9565 )
2018-12-18 22:00:18 +01:00
4b8cb9696e
Reword confirm_before_clearing_draft description
2018-12-18 21:54:34 +01:00
ba8d23c7cb
Allow disabling the reply confirmation dialog
2018-12-18 21:54:34 +01:00
55e3dae600
Allow disabling media confirmation from the confirmation dialog itself
2018-12-18 21:54:34 +01:00
79b793be2a
Remove dead code
2018-12-18 21:39:35 +01:00
2bf78186aa
[Glitch] Put "Media Only" option in column settings instead of content area headline
...
Port 9c2fc4d684
2018-12-18 21:39:35 +01:00
677f430f23
[Glitch] Always display tab navigation on local/federated timeline even when empty
...
Port bc464619f3
2018-12-18 21:39:35 +01:00
7a91431b6f
Do not replace history state
...
This is both for consistency with account timelines and to not mess with
the logic used to decide whether going back in the browser's history is
going to make us leave the WebUI.
2018-12-18 21:39:35 +01:00
4073773a9f
[Glitch] Enable media timeline
...
Port 590ae5ac66
2018-12-18 21:39:35 +01:00
adcfdafc26
[Glitch] Hide section headline for timelines in production
...
Port ff98de966f
2018-12-18 21:39:35 +01:00
0ea5823484
[Glitch] Change column params on pinned timeline
...
Port f5421e5309
2018-12-18 21:39:35 +01:00
f39c452cab
[Glitch] Save onlyMedia prop when pinning column
...
Port 20c650b644
2018-12-18 21:39:35 +01:00
498ff2b52e
[Glitch] Add exact attribute to WrappedRoute for community timeline
...
Port 4a0207e3ea
2018-12-18 21:39:35 +01:00
0a87d07f97
[Glitch] Add media timeline
...
Port ccc240b59c
2018-12-18 21:39:35 +01:00
a0a32a68c4
Merge pull request #862 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-12-18 19:37:07 +01:00
e1f8359ea4
[Glitch] Make notifications quick-filter use consistent style with profile tabs
...
Port 84385d876f
2018-12-18 17:23:04 +01:00
cdc9dca649
[Glitch] Add notification quick-filter bar in the frontend app
...
Port df7186e93a
2018-12-18 17:22:01 +01:00
c678e1906a
[Glitch] Responsive design for profile directory
...
Port SCSS changes from 32bd452b56
2018-12-18 17:03:53 +01:00
720cb01715
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/admin/base_controller.rb
Some refactoring made upstream, no real conflict.
- app/javascript/mastodon/features/compose/components/compose_form.js
Updated using upstream's code but using maxChars instead of the
hardcoded length of 500 characters per toot.
- app/javascript/styles/mastodon/components.scss
Upstream redesigned the onboarding modal. Not sure why we had a
conflict there.
2018-12-18 16:55:15 +01:00
f579f1b10e
Back to the getting-started when pins the timeline. ( #9561 )
2018-12-18 16:43:50 +01:00
66b994aa7a
Add spec for AccountableConcern#log_action ( #9559 )
2018-12-18 16:43:03 +01:00
6602350f85
Bump nokogiri from 1.8.5 to 1.9.1 ( #9557 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.8.5 to 1.9.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.8.5...v1.9.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-18 16:41:41 +01:00
dc9f3d2cf2
fix CSP / X-Frame-Options for media embeds ( #9558 )
2018-12-18 16:40:30 +01:00
652595d802
Fix tootctl accounts rotate not updating public keys ( #9556 )
...
This allowed you to brick your system when running that command, because the accounts would continue to advertise the old public key, but sign things with the new one
2018-12-18 01:22:29 +01:00
Thibaut Girka