6 commits

Author	SHA1	Message	Date
Thibaut Girka	0fd3f87ea2	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.	2020-03-08 19:38:53 +01:00
guigeekz	eb525ef602	Add submit button to the top of preferences pages (#13068) ... * Move submit button to the top of the edit page * Duplicate save button on long form * Fix click submit on profile spec	2020-03-08 16:04:03 +01:00
Thibaut Girka	403ab873d4	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 20:09:05 +02:00
ふるふる	cf7950977a	Fix can't save preference other (#11042)	2019-06-10 19:26:43 +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
Eugen Rochko	b788e58ea4	Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988)	2019-06-07 16:51:08 +02:00

Renamed from app/views/settings/preferences/show.html.haml (Browse further)