33c80e0783
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
2019-05-04 16:37:26 +02:00
c88d9e524b
i18n: Update Corsican translation ( #10692 )
2019-05-04 20:09:25 +09:00
2c2f649200
Fix CSP when PAPERCLIP_ROOT_URL is set to a different host
2019-05-04 10:55:56 +02:00
58720aa2bd
Fix CSP when dealing with S3 hosts
2019-05-04 00:47:51 +02:00
011b032300
Provide a link to existing domain block when trying to block an already-blocked domain ( #10663 )
...
* When trying to block an already-blocked domain, provide a link to the block
* Fix styling for links in flash messages
* Allow blocks to be upgraded but not downgraded
2019-05-03 20:36:36 +02:00
ecbea2e3c6
Bump rack-attack from 5.4.2 to 6.0.0 ( #10599 )
...
* Bump rack-attack from 5.4.2 to 6.0.0
Bumps [rack-attack](https://github.com/kickstarter/rack-attack ) from 5.4.2 to 6.0.0.
- [Release notes](https://github.com/kickstarter/rack-attack/releases )
- [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/kickstarter/rack-attack/compare/v5.4.2...v6.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
* fix payload[:request]
2019-05-03 16:16:11 +02:00
fcbf557bd2
Add site-wide options to show reblogs and replies in local/public timelines
...
Fixes #1021
2019-05-01 22:33:09 +02:00
0db269f3dc
Minor fixes to the French translation ( #10662 )
2019-05-01 22:19:55 +09:00
c008911249
New string added for Slovak translation ( #10637 )
2019-04-26 18:07:36 +02:00
7783ec921b
Merge branch 'master' into glitch-soc/merge-upstream
2019-04-24 15:25:22 +02:00
8a0d677cde
Fix stoplight logging to stderr separate from Rails logger ( #10624 )
2019-04-23 04:39:48 +02:00
a9eaa780f5
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
Upstream cleaned up a bit, including on lines in which
we replaced the hardcoded 500 character limit with a maxChar
constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
Moved upstream's new animated avatar hover handling in
app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
Upstream made repo URL configurable, did the same, but
default to glitch-soc
2019-04-22 20:40:04 +02:00
46321dc993
i18n: Fix misleading strings in Polish translation ( #10615 )
2019-04-21 22:30:04 +02:00
cf5414e5d3
Small fix Dutch translation ( #10612 )
...
* Small fix Dutch translation
* Better descriptive titles
See #10611
2019-04-21 18:44:51 +02:00
a430f2a03e
i18n: Update Catalan translation ( #10559 )
...
* Updated Catalan strings
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* bundle exec i18n-tasks
* Update ca.json
* Update simple_form.ca.yml
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
2019-04-21 04:53:45 +02:00
951f8d5b44
Update NL (Dutch) translation ( #10601 )
...
* Update NL language strings
Have to do it this way, cause this file is locked on Weblate
* fix
* Update simple_form.nl.yml
* Update nl.yml
2019-04-21 04:46:08 +02:00
268417daf3
Merge branch 'master' into glitch-soc/merge-upstream
2019-04-19 10:44:10 +02:00
546688aa1d
Add forgotten text
2019-04-19 00:57:39 +02:00
d83068016b
Allow turning keybase off instance-wide
2019-04-19 00:57:39 +02:00
3d70ec470a
Some new strings for Slovak ( #10596 )
2019-04-18 15:08:59 +09:00
a8c6feb7ee
Update sk.yml translation again ( #10589 )
...
* Update sk.yml
* Update sk.yml
* Update sk.yml
2019-04-16 21:59:54 +09:00
9254bbe875
Important Slovak grammar fixes ( #10585 )
...
* Important grammar fixes for SK Devise translation
* Important Slovak grammar fixes
* Update devise.sk.yml
* Important Slovak grammar fixes
Last batch for today :-)
* Update devise.sk.yml
* Update sk.yml
* Update sk.yml
* Update sk.yml
2019-04-16 07:16:12 +09:00
b2d9dcf5e5
Updates the Slovak translation further ( #10584 )
2019-04-15 22:18:51 +09:00
4ca402ffbd
i18n: Update Corsican translation ( #10583 )
2019-04-15 22:18:27 +09:00
b4acbd1a30
Small SK locale fixes ( #10561 )
...
* Small SK locale fixes
* Update devise.sk.yml
2019-04-13 21:24:00 +09:00
43a2154575
New strings added into the Slovak translation ( #10562 )
...
* New strings added into the Slovak translation
* Update sk.yml
* Update sk.yml
* Update sk.yml
* Update sk.yml
2019-04-13 21:23:52 +09:00
d305d8747d
Add new pt-br translations ( #10564 )
2019-04-13 21:23:41 +09:00
f5b4e9a54a
Merge branch 'master' into glitch-soc/merge-upstream
2019-04-11 15:13:52 +02:00
21193b0a12
[i18n] Update for Occitan language ( #10548 )
...
* Update activerecord.oc.yml
* Update simple_form.oc.yml
* Fix typo
* Update simple_form.oc.yml
* Remove trailing whitespace
2019-04-10 22:33:04 +02:00
2f422b708f
Merge branch 'master' into glitch-soc/merge-upstream
2019-04-10 21:19:21 +02:00
5dd14dfded
i18n: Russian localization update ( #10515 )
...
* i18n: Updated ru.json for Russian language
* i18n: Updated ru.yml
* Normalize ru.yml
* i18n: Updated simple_form.ru.yml
* i18n: Updated activerecord.ru.yml, devise.ru.yml, normalized strings
* Added new strings to ru.json
* Deleted unused (?) string
* i18n: Added recent strings (Settings refactor)
2019-04-10 20:43:08 +02:00
793b0513eb
Weblate translations (2019-04-10) ( #10545 )
...
* Translated using Weblate (Occitan)
Currently translated at 95.7% (780 of 815 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (Greek)
Currently translated at 100,0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 100,0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (French)
Currently translated at 100.0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fr/
* Translated using Weblate (Dutch)
Currently translated at 100,0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/nl/
* Translated using Weblate (Galician)
Currently translated at 100,0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/gl/
* Translated using Weblate (Dutch)
Currently translated at 100,0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Galician)
Currently translated at 100,0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Arabic)
Currently translated at 97.4% (372 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (French)
Currently translated at 100.0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (Thai)
Currently translated at 75.4% (288 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/th/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sk/
* Translated using Weblate (German)
Currently translated at 100,0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/de/
* Translated using Weblate (Slovak)
Currently translated at 100,0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sk/
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/kk/
* Translated using Weblate (Persian)
Currently translated at 100.0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Translated using Weblate (Kazakh)
Currently translated at 99.0% (378 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/
* i18n-tasks normalize
* yarn manage:translations
* Fix empty string in Occitan
2019-04-10 18:17:24 +02:00
9e2a1f1838
i18n: Update Japanese translations ( #10536 )
...
* run i18n-tasks add-missing
* Update Japanese translations.
2019-04-10 17:36:45 +02:00
2e01a9b20d
I18n: Add one more string ( #10543 )
2019-04-10 17:17:17 +02:00
4e59f709aa
I18n: Final Czech translation 🇨🇿 ( #10542 )
...
* I18n: Update Czech translation
* I18n: Why do you want to join translation
* I18n: Translating a bunch of more stuff
2019-04-10 14:52:08 +02:00
6402701965
Updated German translation ( #10539 )
...
* Updated German locales
* Added account approval locales (German)
* Updated JSON locales (German)
* Updated German translation
* Fixed grammar error (German)
* New strings and adjustments (German)
2019-04-10 14:50:14 +02:00
4595168863
Translation - Korean ( #10540 )
2019-04-10 14:49:40 +02:00
a5c60f87b1
i18n: Update Corsican translations ( #10538 )
2019-04-10 14:49:06 +02:00
5085559b15
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/views/admin/pending_accounts/index.html.haml
No real conflict, upstream changes too close to glitch-specific
theming system changes.
- config/navigation.rb
Upstream redesigned the settings navigation, took those changes
and re-inserted the flavours menu.
2019-04-10 09:16:08 +02:00
9b0d8f74cb
Change the groupings of menu items in settings navigation ( #10533 )
...
* Change the groupings of menu items in settings navigation
Fix #10307
* Remove unused translations
2019-04-10 03:47:11 +02:00
36b39fbac5
Add preference to disable e-mails about new pending accounts ( #10529 )
2019-04-10 00:35:49 +02:00
8b69a66380
Add "why do you want to join" field to invite requests ( #10524 )
...
* Add "why do you want to join" field to invite requests
Fix #10512
* Remove unused translations
* Fix broken registrations when no invite request text is submitted
2019-04-09 23:06:30 +09:00
2a168a002c
i18n: Update Corsican translations ( #10510 )
...
* i18n: Update Corsican translations
* i18n: Update Corsican translations
2019-04-08 19:01:41 +02:00
5247ea4efd
Fix batch actions not working on pending accounts ( #10508 )
2019-04-08 18:35:41 +02:00
f5f6d23d55
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/locales/pl.yml
Conflict caused by new upstream string too close to glitch-specific
“flavour” string. Took both strings.
2019-04-08 15:57:56 +02:00
3f036ac6b8
Updated German locales ( #10505 )
...
* Updated German locales
* Added account approval locales (German)
* Updated JSON locales (German)
2019-04-08 21:14:08 +09:00
6e111152e0
i18n: Update Corsican translations ( #10504 )
2019-04-08 21:12:06 +09:00
ae58bbd705
i18n: Update Czech translation ( #10506 )
2019-04-08 21:11:39 +09:00
619bbc23ef
Translate Korean ( #10499 )
2019-04-08 12:35:37 +09:00
38b8a5c5b2
Updated french translations ( #10498 )
...
* updated "Invalid email or password" french translation
* Updated FR translations ("instance" in now "serveur")
2019-04-08 09:22:09 +09:00
Thibaut Girka