Thibaut Girka
|
aaec64a500
|
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
- config/locales/simple_form.en.yml
|
2019-06-26 23:19:22 +02:00 |
|
ThibG
|
3086c645fd
|
Add option to disable blurhash previews (#11188)
* Add option to disable blurhash previews
* Update option text
* Change options order
|
2019-06-26 19:33:04 +02:00 |
|
Thibaut Girka
|
1b0ff4cd69
|
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 |
|
Eugen Rochko
|
1db4117030
|
Change preferences page into appearance, notifications, and other (#10977)
|
2019-06-07 03:39:24 +02:00 |
|