35b576dbec
Improve form for selecting media display preference ( #8965 )
...
Regression from #8569
2018-10-16 14:07:54 +02:00
d35801aaa2
Fixes 8987 broken alignment at "Remote interaction dialog" ( #8988 )
2018-10-15 16:09:08 +02:00
efd09e2ebb
undo part of PR 8202 to fix RTL ( #8979 )
2018-10-15 04:39:20 +02:00
b0527a4ce7
Handle alt+enter in the spoiler input as shortcut for secondary post
...
Fixes #780
2018-10-14 12:00:21 +02:00
b972478812
Improve style of notice/alert messages ( #8973 )
2018-10-13 01:51:30 +02:00
7d182442a7
Weblate translations (2018-10-12) ( #8972 )
...
* Translated using Weblate (Welsh)
Currently translated at 64.4% (448 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/
* Translated using Weblate (Arabic)
Currently translated at 98.0% (682 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (French)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Arabic)
Currently translated at 94.3% (82 of 87 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Welsh)
Currently translated at 88.7% (297 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/
* Translated using Weblate (French)
Currently translated at 100.0% (335 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (French)
Currently translated at 100,0% (87 of 87 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/
* Translated using Weblate (Czech)
Currently translated at 100.0% (335 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Czech)
Currently translated at 100.0% (87 of 87 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/
* Translated using Weblate (Czech)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Persian)
Currently translated at 100.0% (335 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Translated using Weblate (Arabic)
Currently translated at 94.6% (88 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (335 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Czech)
Currently translated at 100.0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/
* Translated using Weblate (Galician)
Currently translated at 100,0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Translated using Weblate (Galician)
Currently translated at 100,0% (696 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Greek)
Currently translated at 100.0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/
* Translated using Weblate (Greek)
Currently translated at 98.8% (331 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 99.7% (694 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Persian)
Currently translated at 100.0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/
* Translated using Weblate (Czech)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* 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 (French)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Japanese)
Currently translated at 99.4% (692 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Corsican)
Currently translated at 100.0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/co/
* Translated using Weblate (Corsican)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/
* Translated using Weblate (German)
Currently translated at 99.6% (693 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* 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 (Japanese)
Currently translated at 99.4% (692 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (335 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Japanese)
Currently translated at 94.6% (88 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* i18n-tasks normalize
* yarn manage:translations
2018-10-13 01:51:14 +02:00
70d346ea95
Fix auto-unfold CWs when no regexp is set
...
Fixes #778
2018-10-12 23:34:26 +02:00
3d5d899094
Allow selecting both default flavour and theme
...
Fixes #672
2018-10-12 19:06:35 +02:00
fac529975b
Improve signature verification safeguards ( #8959 )
...
* Downcase signed_headers string before building the signed string
The HTTP Signatures draft does not mandate the “headers” field to be downcased,
but mandates the header field names to be downcased in the signed string, which
means that prior to this patch, Mastodon could fail to process signatures from
some compliant clients. It also means that it would not actually check the
Digest of non-compliant clients that wouldn't use a lowercased Digest field
name.
Thankfully, I don't know of any such client.
* Revert "Remove dead code (#8919 )"
This reverts commit a00ce8c92c
2018-10-12 07:00:41 +02:00
9d4541c612
Display customized mascot in web UI and fix admin form for it ( #8964 )
...
Follow-up to #8766
2018-10-12 04:04:08 +02:00
22de24b8ca
Fix missing protocol in dns-prefetch, improve code style ( #8963 )
...
Regression from #8942
2018-10-12 02:19:10 +02:00
5cbbd2c3b5
Fix microformats on statuses according to updated spec ( #8958 )
2018-10-12 02:04:07 +02:00
8fd2cc54c1
Fix type of conversation ID in conversations API ( #8961 )
2018-10-12 01:36:51 +02:00
21ad21cb50
Improve signature verification safeguards ( #8959 )
...
* Downcase signed_headers string before building the signed string
The HTTP Signatures draft does not mandate the “headers” field to be downcased,
but mandates the header field names to be downcased in the signed string, which
means that prior to this patch, Mastodon could fail to process signatures from
some compliant clients. It also means that it would not actually check the
Digest of non-compliant clients that wouldn't use a lowercased Digest field
name.
Thankfully, I don't know of any such client.
* Revert "Remove dead code (#8919 )"
This reverts commit a00ce8c92c
2018-10-12 00:15:55 +02:00
0075964244
Merge pull request #775 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-11 21:28:03 +02:00
2d27c11061
Set Content-Security-Policy rules through RoR's config ( #8957 )
...
* Set CSP rules in RoR's configuration
* Override CSP setting in the embed controller to allow frames
2018-10-11 20:35:46 +02:00
8f720be9f3
Merge commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into glitch-soc/merge-upstream
2018-10-11 14:12:36 +02:00
61d44dd11f
Fix typo in ActivityPub Create handler ( #8952 )
...
Regression from #8951
2018-10-11 02:10:15 +02:00
87fdd139b8
Do not push DMs into the home feed ( #8940 )
...
* Do not push DMs into the home feed
* Show DMs column after sending a DM, if DMs column is not already shown
2018-10-11 01:31:03 +02:00
790d3bc637
Move network calls out of transaction in ActivityPub handler ( #8951 )
...
Mention and emoji code may perform network calls, but does not need
to do that inside the database transaction. This may improve availability
of database connections when using pgBouncer in transaction mode.
2018-10-11 00:50:18 +02:00
bb1103d974
Really fix HotKeys
2018-10-10 17:40:06 +02:00
2459da29c2
Add description meta tag additionally to og:description ( #8941 )
...
Fix #8685
2018-10-10 02:21:30 +02:00
da7705b274
Add dns-prefetch if using different host for assets or uploads ( #8942 )
2018-10-10 01:31:10 +02:00
a02244f17c
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/javascript/packs/public.js
Changes made to app/javascript/packs/publics.js were applied to
app/javascript/core/settings.js
2018-10-09 21:08:26 +02:00
e50cb5f4bd
Fix that the copy button of verify link did not work. ( #8938 )
2018-10-09 19:36:13 +02:00
7f9dd92a27
Track historical space stats in PgHero to determine PostgreSQL growth ( #8906 )
2018-10-09 19:35:14 +02:00
269edc0e48
Fix CW icon color in local-settings modal
2018-10-09 18:10:54 +02:00
721aec40cd
Define some local-settings hints
2018-10-09 18:10:54 +02:00
26409f3e8e
Add support for hints (or extended descriptions) in local-settings pages
2018-10-09 18:10:54 +02:00
5f308a7f05
When screen width is too narrow, hide local-settings page text, keep only icons
2018-10-09 18:10:54 +02:00
6cd793f0ac
Change “preferences” icon to match settings page icon
2018-10-09 18:10:54 +02:00
edb9ec8543
Add icons for each of the local-setting pages
2018-10-09 18:10:54 +02:00
122ac9cd1d
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-09 12:12:03 +02:00
4134a10549
Merge pull request #770 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-09 12:11:14 +02:00
d0b1369a85
Fix app-wide hotkeys randomly failing to work
2018-10-09 12:10:51 +02:00
87abbb07f3
Add Japanese translations. ( #8927 )
2018-10-09 07:12:37 +09:00
b368d3c15d
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-08 15:34:53 +02:00
770e337497
Fixed error occurrence when pinning the DM column. ( #8922 )
2018-10-08 14:43:38 +02:00
d17844e6d1
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-08 13:51:33 +02:00
96c3d26870
Move “Show action buttons in collapsed toots” option
2018-10-08 13:49:25 +02:00
faecb35fe0
Switch from selects to radio buttons for local settings, improve styling
2018-10-08 13:49:25 +02:00
f194857ac9
rubocop issues - Cleaning up ( #8912 )
...
* cleanup pass
* undo mistakes
* fixed.
* revert
2018-10-08 04:50:11 +02:00
a00ce8c92c
Remove dead code ( #8919 )
...
SignatureVerification#matches_time_window? is not called anywhere.
2018-10-08 04:48:54 +02:00
2dba313100
Replace SVG asset with Custom mascot ( #8766 )
2018-10-08 00:20:45 +02:00
774ac47373
Add conversations API ( #8832 )
...
* Add conversations API
* Add web UI for conversations
* Add test for conversations API
* Add tests for ConversationAccount
* Improve web UI
* Rename ConversationAccount to AccountConversation
* Remove conversations on block and mute
* Change last_status_id to be a denormalization of status_ids
* Add optimistic locking
2018-10-07 23:44:58 +02:00
a3677a828d
[Glitch] Change documentation URL
...
Port 28401962ca
2018-10-07 22:56:24 +02:00
b4ba1058b8
[Glitch] RTL: fix margins of public-account-header__tabs
...
Port 185cb2dc3a
2018-10-07 22:56:24 +02:00
611740ce81
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-07 19:47:56 +02:00
25744d43b0
Ensure only toots from the reported users are reported ( #8916 )
2018-10-07 19:45:40 +02:00
7cc7843109
Do not scroll timelines when *closing* media modals
...
Media modals push an history state so that pressing back on mobile closes them.
We made sure to not scroll when opening them, but not when *closing* them,
which caused some issues in rare cases.
2018-10-07 12:08:32 +02:00
