6b0ee17046
Do not leak followers count on public pages
...
Fixes #873
2018-12-28 20:05:47 +01:00
9bc763840f
Fix account unsilencing and unsuspension
...
Fix regression from 2e0d617b8b
2018-12-26 19:13:54 +01:00
9e2ceac0ba
[Glitch] Add moderation warnings
...
Port SCSS changes from 2e0d617b8b
2018-12-23 12:54:09 +01:00
df5e49696f
[Glitch] Remove links to bridge.joinmastodon.org (non-functional)
...
Port eb2994d454
2018-12-23 11:43:47 +01:00
89e7274a7f
Remove file added by error
2018-12-23 11:43:25 +01:00
e5a25656e8
[Glitch] Fix unnecessary loadMore calls when the end of a timeline has been reached
...
Port 240d41b3ca
2018-12-23 11:40:52 +01:00
48e6b2360d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/routes.rb
Upstream changed some admin routes, conflict was because of an added :show
action for statuses on our side. Kept it.
2018-12-23 11:28:28 +01:00
4bf67e9cd0
Sanitize and sandbox toot embeds ( #9552 )
2018-12-23 02:16:35 +01:00
eb2994d454
Remove links to bridge.joinmastodon.org (non-functional) ( #9608 )
...
Add link to profile directory
2018-12-22 23:32:00 +01:00
5fdfe0c4cf
Show 40 profiles per directory page instead of 30 ( #9609 )
...
To better align with the list of hashtags
2018-12-22 23:31:23 +01:00
2e0d617b8b
Add moderation warnings ( #9519 )
...
* Add moderation warnings
Replace individual routes for disabling, silencing, and suspending
a user, as well as the report update route, with a unified account
action controller that allows you to select an action (none,
disable, silence, suspend) as well as whether it should generate an
e-mail notification with optional custom text. That notification,
with the optional custom text, is saved as a warning.
Additionally, there are warning presets you can configure to save
time when performing the above.
* Use Account#local_username_and_domain
2018-12-22 20:02:09 +01:00
fb34dafd3c
[i18n] Occitan update ( #9607 )
...
* Update for new On Board messages
* Update oc.json
2018-12-22 18:27:03 +01:00
c2efe52de7
Remove MailerHelper does nothing ( #9604 )
2018-12-22 02:35:55 +01:00
d9a6c27f3b
Fix composer not getting focus after reply confirmation dialog
...
The modal-handling code gives back focus to the element focused when the
modal opened. However, in the case of reply confirmation, it would do so
*after* the composer code itself requested focus.
2018-12-21 20:00:49 +01:00
e8845f0cb2
Fix incorrect and duplicate onConfirm callback
2018-12-21 20:00:49 +01:00
89db203110
[Glitch] Fix that translation is not applied to "joining hashtags"
...
Port 88e40d03d9
2018-12-21 19:54:54 +01:00
0cac543474
[Glitch] Deep compare tags for hashtag column reload
...
Port 98c9ad366b
2018-12-21 19:54:54 +01:00
423c953518
[Glitch] Allow joining several hashtags in a single column
...
Port d2a9ea58da
2018-12-21 19:54:54 +01:00
7fbf9eb817
i18n: Update Polish translation ( #9594 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-12-21 18:56:24 +01:00
39e4cbe2dc
Fix composer not getting focus after reply confirmation dialog ( #9602 )
...
The modal-handling code gives back focus to the element focused when the
modal opened. However, in the case of reply confirmation, it would do so
*after* the composer code itself requested focus.
2018-12-21 18:52:41 +01:00
85dc4507e7
[Glitch] Display customized mascot in web UI
...
Port relevant parts of 2a36092328
2018-12-20 18:39:05 +01:00
bbba494092
Make drawer markup and styling closer to upstream
...
WARNING: This may break some custom skins!
`.drawer > .contents` has been moved to
`.drawer > .drawer__pager > .drawer__iner`, and the waves have been moved
from `.drawer > .contents` to `.drawer__inner__mastodon`!
2018-12-20 18:39:05 +01:00
7d437f7fc9
[Glitch] Back to the getting-started when pins the timeline
...
Port f579f1b10e
2018-12-20 14:51:28 +01:00
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
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
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
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
26f2c1240e
Update Japanese translations. ( #9574 )
2018-12-19 08:51:02 +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
Thibaut Girka