1b4242ddf7
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-11 21:55:00 +02:00
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
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
f3c34e3743
Fix Korean translate ( #11047 )
2019-06-11 13:06:42 +09:00
f03dd5728a
Add German translations ( #11043 )
2019-06-10 21:36:20 +02:00
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
30946461be
Update simple_form.sk.yml ( #11028 )
2019-06-10 16:25:27 +09:00
602bccc0ab
Update simple_form.fr.yml ( #11021 )
2019-06-10 13:12:51 +09:00
2e12b42f2b
Update fr.yml ( #11023 )
2019-06-10 13:12:28 +09:00
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
bd5ab2542c
Add missing Korean translations ( #11014 )
2019-06-09 21:07:50 +02:00
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
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
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
9cf5686de5
i18n: Update Corsican translations ( #10987 )
2019-06-07 19:12:17 +09:00
8bf8d6d9d9
Change preferences page into appearance, notifications, and other ( #10977 )
2019-06-07 03:39:24 +02:00
87f5646ec3
Add waiting time to list of pending accounts in admin UI ( #10985 )
2019-06-07 03:24:10 +02:00
a76c660645
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
2019-06-04 20:40:19 +02:00
ca61d7577a
Add missing Korean translations ( #10962 )
...
And change some word.
2019-06-04 18:00:09 +02:00
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
3e18c4ea5f
Small update for sk.yml ( #10913 )
2019-06-01 00:33:09 +09:00
206d0ea6a2
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-30 13:31:01 +02:00
7403b0ec05
Update Japanese translations. ( #10875 )
...
run yarn manage:translations ja && i18n-tasks add-missing ja
2019-05-29 11:09:59 +09:00
b9c5aed987
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-28 17:45:06 +02:00
c84a0df608
Update simple_form.co.yml ( #10862 )
2019-05-28 10:21:30 +09:00
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
16ae227935
Update simple_form.sk.yml ( #10842 )
2019-05-26 19:26:39 +09:00
40f6439e03
I18n: Update Czech translation ( #10832 )
2019-05-26 05:34:40 +09:00
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
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
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
e21662d370
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-19 21:53:44 +02:00
7a88a5b44a
sk.yml grammar update ( #10786 )
...
* sk.yml grammar update
* bundle exec i18n-tasks normalize
2019-05-20 02:27:32 +09:00
fd5da4033e
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-19 17:46:31 +02:00
875d18d636
Small corrections for sk translation ( #10784 )
2019-05-19 22:42:10 +09:00
7660ac5008
I18n: Update Czech translation ( #10781 )
2019-05-19 14:39:16 +09:00
08a793cbd9
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-18 10:04:32 +02:00
7aece1eec5
Add option for default toot content-type
2019-05-17 23:51:14 +02:00
b34a562b63
i18n: Update Corsican translation ( #10770 )
...
* i18n: update Corsican translation
* Fix typo in co.yml
2019-05-17 06:32:46 +02:00
422dd06806
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-15 17:11:40 +02:00
7898b67b3d
Update simple_form.fr.yml ( #10756 )
...
Remplacement des ' par des ’
2019-05-15 14:52:11 +09:00
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
0aaca064a6
Update slovak simple_forms ( #10763 )
2019-05-14 19:55:47 +09:00
5262820fae
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-11 18:23:46 +02:00
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
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
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
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
5ba0684958
Add strings for Slovak ( #10734 )
...
* Add strings for Slovak
* Update sk.yml
2019-05-09 23:16:05 +02:00
Thibaut Girka