3e686beaea
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
e25947db4a
Sanitize and sandbox toot embeds ( #9552 )
2018-12-23 02:16:35 +01:00
bb62827c16
Remove links to bridge.joinmastodon.org (non-functional) ( #9608 )
...
Add link to profile directory
2018-12-22 23:32:00 +01:00
59e333385b
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
3c033c4352
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
00862dcaff
[i18n] Occitan update ( #9607 )
...
* Update for new On Board messages
* Update oc.json
2018-12-22 18:27:03 +01:00
bd4ee732c2
Remove MailerHelper does nothing ( #9604 )
2018-12-22 02:35:55 +01:00
1a3088364f
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
0605c004a5
Fix incorrect and duplicate onConfirm callback
2018-12-21 20:00:49 +01:00
6166751f9e
[Glitch] Fix that translation is not applied to "joining hashtags"
...
Port bfec030a4e
2018-12-21 19:54:54 +01:00
3611ea02e2
[Glitch] Deep compare tags for hashtag column reload
...
Port 4fdefffb99
2018-12-21 19:54:54 +01:00
4be7313298
[Glitch] Allow joining several hashtags in a single column
...
Port 4c03e05a4e
2018-12-21 19:54:54 +01:00
aa0e1ff286
i18n: Update Polish translation ( #9594 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-12-21 18:56:24 +01:00
eee2b05ea2
Add specs for CustomEmojiFilter ( #9599 )
2018-12-21 18:52:57 +01:00
a6079a42b6
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
de3cecf37a
Add specs for AdminMailer ( #9597 )
2018-12-21 09:34:34 +01:00
1bc78ec50e
Add specs for InstancePresenter ( #9596 )
2018-12-21 08:59:56 +01:00
240c122767
Skip mailer job retries when a record no longer exists ( #9590 )
...
Fix #8666
2018-12-21 06:16:17 +01:00
6073195a7d
[Glitch] Display customized mascot in web UI
...
Port relevant parts of 9d4541c612
2018-12-20 18:39:05 +01:00
fb63941c47
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
6a2d030c2f
Add specs for ReportNotePolicy ( #9592 )
2018-12-20 17:52:18 +01:00
b93e317886
Add specs for policies ( #9591 )
...
* Add spec for RelayPolicy
* Add specs for SubscriptionPolicy
* Add specs for SettingsPolicy
* Add specs for TagPolicy
* Add specs for ReportPolicy
2018-12-20 17:52:07 +01:00
be9640bfc2
Add specs for UserPolicy ( #9593 )
2018-12-20 17:51:55 +01:00
5eaf2c9e02
[Glitch] Back to the getting-started when pins the timeline
...
Port 5bf100f87b
2018-12-20 14:51:28 +01:00
bc113927d6
Move hide_followers_count logic to an helper
2018-12-20 14:51:12 +01:00
bd23288a52
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
9e04b2e8a4
Per-user followers count display in profile directory
2018-12-20 14:51:12 +01:00
1b18eb49e3
Hide negative follower counts from glitch flavour
2018-12-20 14:51:12 +01:00
a1c56fcef1
Add admin setting to disable followers count
2018-12-20 14:51:12 +01:00
0cd367e295
Refactor followers_accounts_controller
2018-12-20 14:51:12 +01:00
d649d84594
Add specs for InvitePolicy ( #9589 )
2018-12-20 04:23:09 +01:00
44189c33d1
Add specs for EmailDomainBlockPolicy ( #9586 )
2018-12-20 03:51:41 +01:00
08cb8a1ff3
Add specs for InstancePolicy ( #9587 )
2018-12-20 03:51:31 +01:00
e181f99739
Add specs for DomainBlockPolicy ( #9585 )
2018-12-20 03:47:51 +01:00
5088213f5e
Add specs for CustomEmojiPolicy ( #9584 )
2018-12-20 03:24:28 +01:00
108b2139cd
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
8389b496ba
Fix unnecessary loadMore calls when the end of a timeline has been reached ( #9581 )
...
Fixes #9568
2018-12-19 22:23:16 +01:00
c2b1e8bc43
Override current_user when generating static pages
2018-12-19 20:49:58 +01:00
e8d5affe06
Restore oops.gif animation for user who have auto_play_gif set
2018-12-19 20:49:58 +01:00
0c2d48b60a
Replace animated oops.gif by a non-animated image
...
Fixes #6060
2018-12-19 20:49:58 +01:00
5d724aa129
Add specs for BackupPolicy ( #9576 )
2018-12-19 18:24:15 +01:00
aae088aaf0
Merge pull request #865 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-12-19 16:19:00 +01:00
af37f4a70f
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
2228655848
[Glitch] Improved appearance of notification filter on safari
...
Port 2e1b5edfea
2018-12-19 13:00:08 +01:00
add74816a5
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-19 12:58:49 +01:00
af56efdec5
Add specs for AccountPolicy ( #9575 )
2018-12-19 08:56:59 +01:00
ff472d2cfb
Update Japanese translations. ( #9574 )
2018-12-19 08:51:02 +01:00
0a1ade4f02
Add specs for AccountModerationNotePolicy ( #9571 )
2018-12-19 07:24:03 +01:00
102e4cfa32
Add specs for StatusPolicy ( #9569 )
2018-12-19 05:19:20 +01:00
2e1b5edfea
improved appearance of notification filter on safari ( #9564 )
2018-12-18 22:28:09 +01:00
Thibaut Girka