me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
10299 commits 2 branches 0 tags 429 MiB
Commit graph

2121 commits

Author SHA1 Message Date
Masoud Abkenar
572a3dfc21 l10n: update Persian translations (fa.yml) (#11052) 
* l10n: update Persian translations (fa.yml)

* Fix fa.yml syntax

* i18n-tasks normalize
 2019-06-12 02:55:29 +09:00
Masoud Abkenar
d12625fa74 l10n: update Persian translation (#11050) 
* l10n: update Persian translation

* Update fa.yml
 2019-06-12 00:37:52 +09:00
唐宗勛
cca89f3e06 update zh-CN translations (#11046) 2019-06-11 13:08:40 +09:00
Jeong Arm
f3c34e3743 Fix Korean translate (#11047) 2019-06-11 13:06:42 +09:00
Eugen Rochko
f03dd5728a Add German translations (#11043) 2019-06-10 21:36:20 +02:00
Thibaut Girka
5a158899bc Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb
 2019-06-10 18:59:53 +02:00
Marek Ľach
30946461be Update simple_form.sk.yml (#11028) 2019-06-10 16:25:27 +09:00
manuelviens
602bccc0ab Update simple_form.fr.yml (#11021) 2019-06-10 13:12:51 +09:00
manuelviens
2e12b42f2b Update fr.yml (#11023) 2019-06-10 13:12:28 +09:00
Marek Ľach
843bc1d3da Update sk.yml (#11015) 
* Update sk.yml

* Update sk.yml

* Update sk.yml

* Update sk.yml

* Update sk.yml

* Update sk.yml
 2019-06-09 22:55:37 +02:00
Jeong Arm
bd5ab2542c Add missing Korean translations (#11014) 2019-06-09 21:07:50 +02:00
spla
df11f10efd i18n: Update Catalan translations (#10998) 
* 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

* i18n: Update Catalan translation

* i18n Update Catalan translation

* i18n: Update Catalan translations

* i18n: Update Catalan translations
 2019-06-09 08:32:22 +09:00
Aditoo17
2d601a278c I18n: Update Czech translation 🇨🇿 (#10995) 
* I18n: Update Czech translation

* Fix

* Re-fix

* And also this

* The real fix now (hopefully)
 2019-06-08 17:58:40 +02:00
Thibaut Girka
00552d2f79 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
 2019-06-07 17:00:36 +02:00
Eugen Rochko
b788e58ea4 Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988) 2019-06-07 16:51:08 +02:00
Alix Rossi
9cf5686de5 i18n: Update Corsican translations (#10987) 2019-06-07 19:12:17 +09:00
Eugen Rochko
8bf8d6d9d9 Change preferences page into appearance, notifications, and other (#10977) 2019-06-07 03:39:24 +02:00
Eugen Rochko
87f5646ec3 Add waiting time to list of pending accounts in admin UI (#10985) 2019-06-07 03:24:10 +02:00
Thibaut Girka
a76c660645 Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 2019-06-04 20:40:19 +02:00
Jeong Arm
ca61d7577a Add missing Korean translations (#10962) 
And change some word.
 2019-06-04 18:00:09 +02:00
Yamagishi Kazutoshi
ac8f6df6f1 Replace from uglifyjs to terser (#10956) 2019-06-04 14:17:09 +02:00
Thibaut Girka
a4e0071538 Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
 2019-06-03 14:54:30 +02:00
Marek Ľach
3e18c4ea5f Small update for sk.yml (#10913) 2019-06-01 00:33:09 +09:00
Yamagishi Kazutoshi
93ef0e7555 Remove dependency on fibers (#10902) 2019-05-30 19:27:19 +03:00
Thibaut Girka
206d0ea6a2 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-30 13:31:01 +02:00
Eugen Rochko
865c72cde3 Change default to single column UI (#10847) 
Keep current setting for users who were active within the last month
 2019-05-30 14:30:38 +03:00
mayaeh
7403b0ec05 Update Japanese translations. (#10875) 
run yarn manage:translations ja && i18n-tasks add-missing ja
 2019-05-29 11:09:59 +09:00
Thibaut Girka
b9c5aed987 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-28 17:45:06 +02:00
Hinaloe
ae5f2716a5 Fix undefined method error (#10868) 2019-05-28 15:31:51 +03:00
mayaeh
a08bfea202 Fix undefined method error. (#10867) 2019-05-28 05:42:04 +02:00
Alix Rossi
c84a0df608 Update simple_form.co.yml (#10862) 2019-05-28 10:21:30 +09:00
ThibG
875faa1da6 Improve rate limiting (#10860) 
* Rate limit based on remote address IP, not on potential reverse proxy

* Limit rate of unauthenticated API requests further

* Rate-limit paging requests to one every 3 seconds
 2019-05-27 21:57:49 +02:00
Thibaut Girka
d46668d34b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb

Conflicts due to the addition of a new preference upstream,
“advanced layout”.
 2019-05-26 15:41:40 +02:00
Marek Ľach
16ae227935 Update simple_form.sk.yml (#10842) 2019-05-26 19:26:39 +09:00
Aditoo17
40f6439e03 I18n: Update Czech translation (#10832) 2019-05-26 05:34:40 +09:00
Eugen Rochko
a1bceb2cb6 Add responsive panels to the single-column layout (#10820) 
* Add responsive panels to the single-column layout

* Fixes

* Fix not being able to save the preference

* Fix code style issues

* Set max-height on the compose textarea and add a link to relationship manager
 2019-05-25 21:27:00 +02:00
Thibaut Girka
d445d5833e Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb

Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.
 2019-05-23 19:01:30 +02:00
Marek Ľach
42bdd0766d Update sk.yml (#10788) 
* Update sk.yml

* Update sk.yml

* Update sk.yml

* Update sk.yml

* Update sk.yml

* Update sk.yml

* normalize
 2019-05-20 15:42:19 +09:00
Thibaut Girka
e21662d370 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 21:53:44 +02:00
Marek Ľach
7a88a5b44a sk.yml grammar update (#10786) 
* sk.yml grammar update

* bundle exec i18n-tasks normalize
 2019-05-20 02:27:32 +09:00
Thibaut Girka
fd5da4033e Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 17:46:31 +02:00
Marek Ľach
875d18d636 Small corrections for sk translation (#10784) 2019-05-19 22:42:10 +09:00
Aditoo17
7660ac5008 I18n: Update Czech translation (#10781) 2019-05-19 14:39:16 +09:00
Thibaut Girka
08a793cbd9 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-18 10:04:32 +02:00
Thibaut Girka
7aece1eec5 Add option for default toot content-type 2019-05-17 23:51:14 +02:00
Alix Rossi
b34a562b63 i18n: Update Corsican translation (#10770) 
* i18n: update Corsican translation

* Fix typo in co.yml
 2019-05-17 06:32:46 +02:00
Thibaut Girka
422dd06806 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-15 17:11:40 +02:00
manuelviens
7898b67b3d Update simple_form.fr.yml (#10756) 
Remplacement des ' par des ’
 2019-05-15 14:52:11 +09:00
ThibG
f1a3135809 Record account suspend/silence time and keep track of domain blocks (#10660) 
* Record account suspend/silence time and keep track of domain blocks

* Also unblock users who were suspended/silenced before dates were recorded

* Add tests

* Keep track of suspending date for users suspended through the CLI

* Show accurate number of accounts that would be affected by unsuspending an instance

* Change migration to set silenced_at and suspended_at

* Revert "Also unblock users who were suspended/silenced before dates were recorded"

This reverts commit a015c65d2d1e28c7b7cfab8b3f8cd5fb48b8b71c.

* Switch from using suspended and silenced to suspended_at and silenced_at

* Add post-deployment migration script to remove `suspended` and `silenced` columns

* Use Account#silence! and Account#suspend! instead of updating the underlying property

* Add silenced_at and suspended_at migration to post-migration

* Change account fabricator to translate suspended and silenced attributes

* Minor fixes

* Make unblocking domains always retroactive
 2019-05-14 19:05:02 +02:00
Marek Ľach
0aaca064a6 Update slovak simple_forms (#10763) 2019-05-14 19:55:47 +09:00
Thibaut Girka
5262820fae Merge branch 'master' into glitch-soc/merge-upstream 2019-05-11 18:23:46 +02:00
Alix Rossi
062684bcf8 i18n: Update French translations (#10747) 
* Update French JSON

* i18n: Update fr.yml

* i18n: Update simple_form.fr.yml

* Update simple_form.fr.yml

* Update fr.yml
 2019-05-10 18:09:46 +02:00
Alix Rossi
1959e4e5ec i18n: Update Corsican translations (#10746) 
* i18n: Update Corsican translations

* Update co.yml

* Fix a translation in co.yml
 2019-05-10 18:09:34 +02:00
Thibaut Girka
1bf48b01e3 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/statuses_controller.rb
  minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
  minor conflict because of glitch-soc's theming system
 2019-05-10 17:09:12 +02:00
manuelviens
f0b5e0c46d Update simple_form.fr.yml (#10726) 
* Minor modif and add

Modified '' by ’ and added invite_request

* Update simple_form.fr.yml

Modifications suggérées par ThibG

* Update simple_form.fr.yml

Remplacement des ' par des ’.

* Update simple_form.fr.yml

Ajout de deux petits espaces devant sessions:
 2019-05-09 23:16:24 +02:00
Marek Ľach
5ba0684958 Add strings for Slovak (#10734) 
* Add strings for Slovak

* Update sk.yml
 2019-05-09 23:16:05 +02:00
manuelviens
221a6a0e6d Update fr.yml (#10727) 
* Update fr.yml

Added missing lines

* Update fr.yml

Application des modifications de ThibG

* Update fr.yml

Modifications proposées par ThibG
 2019-05-09 23:15:39 +02:00
spla
13244f7bb3 i18n Update Catalan translation (#10719) 
* 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

* i18n: Update Catalan translation

* i18n Update Catalan translation
 2019-05-07 00:55:37 +09:00
mayaeh
683a5ae765 i18n: Update Japanese translations (#10706) 
* Update Japanese translations.

run yarn manage:translations

This commit includes translations by some users that were done at the transifex.

* Reduce translation text because it becomes two lines.
 2019-05-06 04:34:32 +09:00
Thibaut Girka
23829e09f5 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-05 12:28:10 +02:00
Marek Ľach
a20c26aba7 Minor Slovak locale update (#10705) 2019-05-05 17:25:35 +09:00
Aditoo17
71fd62835e I18n: Update Czech translation 🇨🇿 (#10704) 
* I18n: Update Czech translation

* Tiny fix
 2019-05-05 15:33:33 +09:00
Thibaut Girka
73bc58c656 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/media_attachment.rb
 2019-05-04 16:37:26 +02:00
Alix Rossi
4bf9e83f85 i18n: Update Corsican translation (#10692) 2019-05-04 20:09:25 +09:00
Thibaut Girka
06bcab6e99 Fix CSP when PAPERCLIP_ROOT_URL is set to a different host 2019-05-04 10:55:56 +02:00
Thibaut Girka
5d24d50987 Fix CSP when dealing with S3 hosts 2019-05-04 00:47:51 +02:00
ThibG
8c716f917f 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
dependabot[bot]
592ab699fe 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
Thibaut Girka
c4865cbd25 Add site-wide options to show reblogs and replies in local/public timelines 
Fixes #1021
 2019-05-01 22:33:09 +02:00
ThibG
05bf900109 Minor fixes to the French translation (#10662) 2019-05-01 22:19:55 +09:00
Marek Ľach
63e9783e7d New string added for Slovak translation (#10637) 2019-04-26 18:07:36 +02:00
Thibaut Girka
0f97c82eac Merge branch 'master' into glitch-soc/merge-upstream 2019-04-24 15:25:22 +02:00
Eugen Rochko
55449c0b41 Fix stoplight logging to stderr separate from Rails logger (#10624) 2019-04-23 04:39:48 +02:00
Thibaut Girka
6f85bb754b 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
marcin mikołajczak
ebd171eb0f i18n: Fix misleading strings in Polish translation (#10615) 2019-04-21 22:30:04 +02:00
jeroenpraat
5205009df6 Small fix Dutch translation (#10612) 
* Small fix Dutch translation

* Better descriptive titles

See #10611
 2019-04-21 18:44:51 +02:00
Yamagishi Kazutoshi
a59d2e0926 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
jeroenpraat
f7cc05db80 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
Thibaut Girka
3673665b46 Merge branch 'master' into glitch-soc/merge-upstream 2019-04-19 10:44:10 +02:00
Thibaut Girka
707ae5d37a Add forgotten text 2019-04-19 00:57:39 +02:00
Thibaut Girka
c22175bb86 Allow turning keybase off instance-wide 2019-04-19 00:57:39 +02:00
Marek Ľach
b5850a99aa Some new strings for Slovak (#10596) 2019-04-18 15:08:59 +09:00
Marek Ľach
e82b7347a2 Update sk.yml translation again (#10589) 
* Update sk.yml

* Update sk.yml

* Update sk.yml
 2019-04-16 21:59:54 +09:00
Marek Ľach
970dfb92a9 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
Marek Ľach
d6c6431e5c Updates the Slovak translation further (#10584) 2019-04-15 22:18:51 +09:00
Alix Rossi
159d224bba i18n: Update Corsican translation (#10583) 2019-04-15 22:18:27 +09:00
Marek Ľach
709b519bed Small SK locale fixes (#10561) 
* Small SK locale fixes

* Update devise.sk.yml
 2019-04-13 21:24:00 +09:00
Marek Ľach
ff1e9408e4 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
Renato "Lond" Cerqueira
83420b9d41 Add new pt-br translations (#10564) 2019-04-13 21:23:41 +09:00
Thibaut Girka
f8a3c00755 Merge branch 'master' into glitch-soc/merge-upstream 2019-04-11 15:13:52 +02:00
Quentí
aee82e3b73 [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
Thibaut Girka
5a24934449 Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 21:19:21 +02:00
Evgeny Petrov
4c19204392 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
Eugen Rochko
a0000b9a94 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
mayaeh
020c6ae72f i18n: Update Japanese translations (#10536) 
* run i18n-tasks add-missing

* Update Japanese translations.
 2019-04-10 17:36:45 +02:00
Aditoo17
7568f716a1 I18n: Add one more string (#10543) 2019-04-10 17:17:17 +02:00
Aditoo17
db70d35c3f 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
koyu
fc14f14e20 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
Jeong Arm
70a6a8aabc Translation - Korean (#10540) 2019-04-10 14:49:40 +02:00
Alix Rossi
73bbfcb482 i18n: Update Corsican translations (#10538) 2019-04-10 14:49:06 +02:00
Thibaut Girka
cde0ac1aa7 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
Eugen Rochko
75ab8cef8f 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
Eugen Rochko
13c1b5bac8 Add preference to disable e-mails about new pending accounts (#10529) 2019-04-10 00:35:49 +02:00
Eugen Rochko
7eb05b8724 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
Alix Rossi
fb93400e7d i18n: Update Corsican translations (#10510) 
* i18n: Update Corsican translations

* i18n: Update Corsican translations
 2019-04-08 19:01:41 +02:00
ThibG
a604f766e0 Fix batch actions not working on pending accounts (#10508) 2019-04-08 18:35:41 +02:00
Thibaut Girka
5c8f9a3220 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
koyu
c66a043591 Updated German locales (#10505) 
* Updated German locales

* Added account approval locales (German)

* Updated JSON locales (German)
 2019-04-08 21:14:08 +09:00
Alix Rossi
a5a7780ad1 i18n: Update Corsican translations (#10504) 2019-04-08 21:12:06 +09:00
Aditoo17
20040927fc i18n: Update Czech translation (#10506) 2019-04-08 21:11:39 +09:00
Jeong Arm
d035f4af41 Translate Korean (#10499) 2019-04-08 12:35:37 +09:00
Hugo "Slaynash" Flores
5858035e39 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
mayaeh
4f8beb3717 i18n: Update Japanese translations (#10494) 
* Update Japanese translations

* Update Japanese translations.
 2019-04-08 09:16:14 +09:00
Alix Rossi
6893b404f2 i18n: Update Corsican translations (#10496) 
* Update Corsican translation

* Fix brackets typo
 2019-04-07 21:32:27 +09:00
Eugen Rochko
c84c30c542 Improve blocked view of profiles (#10491) 
* Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447)"

This reverts commit 0317f37c6f.

* Revert "Hide blocking accounts from blocked users (#10442)"

This reverts commit 4cd944d364.

* Improve blocked view of profiles

- Change "You are blocked" to "Profile unavailable"
- Hide following/followers in API when blocked
- Disable follow button and show "Profile unavailable" on public profile as well
 2019-04-07 04:59:13 +02:00
Eugen Rochko
1ed2c9c16e Add rate limit for media proxy requests (#10490) 
30 per 30 minutes, like media uploads
 2019-04-07 04:26:43 +02:00
Aditoo17
12ebe48505 I18n: Update Czech translation (#10489) 2019-04-07 09:34:52 +09:00
koyu
59de320605 Updated German locales (#10488) 2019-04-07 03:13:03 +09:00
Eugen Rochko
c34a7f5bd2 Add batch actions for approving and rejecting pending accounts (#10469) 2019-04-06 17:53:45 +02:00
marcin mikołajczak
0e7c4d0c69 i18n: Update Polish translation (#10479) 
Signed-off-by: Marcin Mikołajczak <m4sk1n@m4sk1n.nazwa.pl>
 2019-04-06 02:51:13 +09:00
jeroenpraat
4c20f5376a Dutch (nl) translation (#10474) 
* Translation Dutch

* Update activerecord.nl.yml

* Update devise.nl.yml

* Update nl.yml

* Update nl.yml

* Update devise.nl.yml

* Update nl.yml
 2019-04-05 06:12:08 +09:00
Thibaut Girka
a835ea0e8f Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/following_accounts_controller.rb
  Conflicts were due to glitch-soc's theming system.
- app/javascript/packs/public.js
  Some code has been change upstream, but it has been
  moved to app/javascript/core/settings.js in glitch-soc.
  Applied the changes there.
 2019-04-04 14:53:52 +02:00
spla
f46cd7f002 i18n: update Catalan translation (#10458) 
* 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
 2019-04-04 10:25:20 +09:00
Jeong Arm
e09e68b656 Translate Korean (devise) (#10464) 2019-04-04 01:31:08 +02:00
Jeong Arm
7deedcc0cf Esperanto translations (#10461) 
* Esperanto translations

* Translate untranslated Esperanto strings

* Normalize eo translation
 2019-04-03 18:19:10 +09:00
Renato "Lond" Cerqueira
a0eaf51ad4 Re-dd PT-br translations (#10459) 2019-04-03 07:24:39 +09:00
spla
8cc94c38cf i18n: update catalan translations (#10455) 
* 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
 2019-04-03 01:31:36 +09:00
Aditoo17
445568eff3 I18n: Improve Czech translation (#10454) 2019-04-03 00:10:27 +09:00
Thibaut Girka
5eb2632410 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml
 2019-04-01 21:28:31 +02:00
mayaeh
0615bc56aa i18n: Update Japanese translations (#10427) 
* Update Japanese translations.

run yarn manage:translations && i18n-tasks add-missing

* Update Japanese translations.

* Fix mistake

* Change to be concise.
 2019-04-01 05:50:05 +02:00
Thibaut Girka
99336afaff Merge branch 'master' into glitch-soc/merge-upstream 2019-03-30 12:36:24 +01:00
Eugen Rochko
ed2862e249 Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413) 
Fix #10315

This reverts commit e781d842a5.
 2019-03-30 01:41:35 +01:00
Aditoo17
0c334481cc I18n: Update Czech translation (#10419) 2019-03-29 16:59:48 +01:00
Jeong Arm
6c39082e87 Add missing Korean translations (#10416) 
* Fix Korean translation

* Add missing translation
 2019-03-29 22:14:24 +09:00
Alix Rossi
1ce9bd86b3 Update Corsican translations (#10418) 
* Update Corsican translation

* Update Corsican YML

* Corsican JSON fix

* Update co.yml
 2019-03-29 22:06:16 +09:00
Thibaut Girka
1600aeb6cb Merge branch 'master' into glitch-soc/merge-upstream 2019-03-28 18:35:25 +01:00
Aditoo17
2a740c3e9a I18n: Update Czech translation (#10410) 2019-03-28 18:01:28 +01:00
Alex Gessner
be7c92061c squashed identity proof updates (#10375) 2019-03-28 18:01:09 +01:00
Thibaut Girka
0117de0a01 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
 2019-03-28 13:01:33 +01:00
Eugen Rochko
364e49ae1f Rename :poll to :preloadable_poll and :owned_poll to :poll on Status (#10401) 
Also, fix some n+1 queries

Resolve #10365
 2019-03-28 04:44:59 +01:00
Eugen Rochko
7aeb50cc89 Add order options to relationship manager UI (#10404) 2019-03-28 02:16:01 +01:00
Eugen Rochko
f1a582dc15 Revert locales touched by automated translations (#10399) 
* Revert ruined translations

Regression from #10362

* yarn manage:translations
 2019-03-28 00:30:47 +01:00
Aditoo17
02d5017d85 Fix interpolations in some localizations (#10397) 2019-03-27 17:07:35 +01:00
Eugen Rochko
367ab6764f Remove unused ActivityPub @context values depending on response (#10378) 
Fix #8078
 2019-03-27 15:55:23 +01:00
Thibaut Girka
451a79bda3 Revert "fix: update to emoji-mart 2.10.0 (#10281)" 
This reverts commit e781d842a5.
 2019-03-27 14:04:58 +01:00
Thibaut Girka
cab7e62235 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-26 17:39:20 +01:00
ThibG
cffb8cb38d Fix HTML validation (#10354) 
* Fix HTML validation

* Report first HTML error instead on validation error
 2019-03-26 17:33:26 +01:00
Thibaut Girka
1f70b51fff Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/locales/es.yml
- config/locales/pl.yml
- config/locales/pt-BR.yml
 2019-03-26 16:02:54 +01:00
Thibaut Girka
e97d76632d Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/admin/settings_controller.rb
- app/models/form/admin_settings.rb

Conflicts caused by upstream refactoring, while we have
flavours and skins, with the flavour_and_skin pseudo-setting.
 2019-03-26 16:01:59 +01:00
Eugen Rochko
88a85f2574 Change icons of features on admin dashboard to remove bias (#10366) 
Red crosses implied that it was bad/unexpected that certain features
were not enabled. In reality, they are options, so showing a green
or grey power-off icon is more appropriate.

Add status of timeline preview as well

Fix sample accounts changing too frequently due to wrong query

Sample accounts are intended to be sorted by popularity
 2019-03-26 01:24:19 +01:00