1b4242ddf7
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
572a3dfc21
l10n: update Persian translations (fa.yml) ( #11052 )
...
* l10n: update Persian translations (fa.yml)
* Fix fa.yml syntax
* i18n-tasks normalize
6 years ago
d12625fa74
l10n: update Persian translation ( #11050 )
...
* l10n: update Persian translation
* Update fa.yml
6 years ago
cca89f3e06
update zh-CN translations ( #11046 )
6 years ago
f3c34e3743
Fix Korean translate ( #11047 )
6 years ago
f03dd5728a
Add German translations ( #11043 )
6 years ago
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
6 years ago
30946461be
Update simple_form.sk.yml ( #11028 )
6 years ago
602bccc0ab
Update simple_form.fr.yml ( #11021 )
6 years ago
2e12b42f2b
Update fr.yml ( #11023 )
6 years ago
843bc1d3da
Update sk.yml ( #11015 )
...
* Update sk.yml
* Update sk.yml
* Update sk.yml
* Update sk.yml
* Update sk.yml
* Update sk.yml
6 years ago
bd5ab2542c
Add missing Korean translations ( #11014 )
6 years ago
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
6 years ago
2d601a278c
I18n: Update Czech translation 🇨🇿 ( #10995 )
...
* I18n: Update Czech translation
* Fix
* Re-fix
* And also this
* The real fix now (hopefully)
6 years ago
00552d2f79
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
6 years ago
b788e58ea4
Change /settings/preferences to redirect to appearance, add /settings/preferences/other ( #10988 )
6 years ago
9cf5686de5
i18n: Update Corsican translations ( #10987 )
6 years ago
8bf8d6d9d9
Change preferences page into appearance, notifications, and other ( #10977 )
6 years ago
87f5646ec3
Add waiting time to list of pending accounts in admin UI ( #10985 )
6 years ago
a76c660645
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
6 years ago
ca61d7577a
Add missing Korean translations ( #10962 )
...
And change some word.
6 years ago
ac8f6df6f1
Replace from uglifyjs to terser ( #10956 )
6 years ago
a4e0071538
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
6 years ago
3e18c4ea5f
Small update for sk.yml ( #10913 )
6 years ago
93ef0e7555
Remove dependency on fibers ( #10902 )
6 years ago
206d0ea6a2
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
865c72cde3
Change default to single column UI ( #10847 )
...
Keep current setting for users who were active within the last month
6 years ago
7403b0ec05
Update Japanese translations. ( #10875 )
...
run yarn manage:translations ja && i18n-tasks add-missing ja
6 years ago
b9c5aed987
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ae5f2716a5
Fix undefined method error ( #10868 )
6 years ago
a08bfea202
Fix undefined method error. ( #10867 )
6 years ago
c84a0df608
Update simple_form.co.yml ( #10862 )
6 years ago
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
6 years ago
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”.
6 years ago
16ae227935
Update simple_form.sk.yml ( #10842 )
6 years ago
40f6439e03
I18n: Update Czech translation ( #10832 )
6 years ago
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
6 years ago
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`.
6 years ago
42bdd0766d
Update sk.yml ( #10788 )
...
* Update sk.yml
* Update sk.yml
* Update sk.yml
* Update sk.yml
* Update sk.yml
* Update sk.yml
* normalize
6 years ago
e21662d370
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
7a88a5b44a
sk.yml grammar update ( #10786 )
...
* sk.yml grammar update
* bundle exec i18n-tasks normalize
6 years ago
fd5da4033e
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
875d18d636
Small corrections for sk translation ( #10784 )
6 years ago
7660ac5008
I18n: Update Czech translation ( #10781 )
6 years ago
08a793cbd9
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
7aece1eec5
Add option for default toot content-type
6 years ago
b34a562b63
i18n: Update Corsican translation ( #10770 )
...
* i18n: update Corsican translation
* Fix typo in co.yml
6 years ago
422dd06806
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
7898b67b3d
Update simple_form.fr.yml ( #10756 )
...
Remplacement des ' par des ’
6 years ago
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
6 years ago
Thibaut Girka
Masoud Abkenar
唐宗勛
Jeong Arm
Eugen Rochko
Marek Ľach
manuelviens
spla
Aditoo17
Alix Rossi
Yamagishi Kazutoshi
mayaeh
Hinaloe
Alix Rossi