masto-fe/app/javascript/mastodon
Thibaut Girka 5bb8563f6c Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/admin/base_controller.rb
- app/controllers/filters_controller.rb
- app/controllers/invites_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/javascript/packs/public.js
- app/views/settings/profiles/show.html.haml

Conflicts were mostly due to the addition of body classes to the settings page,
this was caused by rejecting upstream changes for most of those files and
modifying Settings::BaseController instead.

Another cause of conflicts was the deletion of client-side checking of
display name / bio length, this was modified in app/javascript/core/settings.js
instead.
2018-10-26 20:41:43 +02:00
..
actions Fix JS error when posting from page without router context (#9073) 2018-10-24 01:31:31 +02:00
components Show suggested follows on search screen in mobile layout (#9010) 2018-10-23 00:08:39 +02:00
containers Add a confirmation dialog when hitting reply and the compose box isn't empty (#8893) 2018-10-05 18:44:44 +02:00
features Merge branch 'master' into glitch-soc/merge-upstream 2018-10-26 20:41:43 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
middleware Add missing rejection handling for Promises (#7008) 2018-04-02 14:51:02 +02:00
reducers Show suggested follows on search screen in mobile layout (#9010) 2018-10-23 00:08:39 +02:00
selectors Don't filter own toots (fixes #8289) (#8298) 2018-08-19 18:44:18 +02:00
service_worker Fix a problem about generating an url of notifications (#8758) 2018-09-24 05:45:58 +02:00
storage Cache media only when storage can be freed (#7547) 2018-05-19 19:22:11 +02:00
store Restore vanilla components 2017-11-17 19:29:16 -08:00
utils Resize images by area instead of fixed dimensions (#8083) 2018-07-28 03:33:00 +02:00
api.js Refactor /api/web APIs to use the centralized axios instance (#6223) 2018-01-08 20:01:33 +01:00
base_polyfills.js Refactor resizeImage method (#7236) 2018-04-23 09:15:51 +02:00
common.js Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
compare_id.js Fix comparing id (#7180) 2018-04-18 16:50:19 +02:00
extra_polyfills.js Restore vanilla components 2017-11-17 19:29:16 -08:00
initial_state.js Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
is_mobile.js Restore vanilla components 2017-11-17 19:29:16 -08:00
link_header.js Restore vanilla components 2017-11-17 19:29:16 -08:00
load_polyfills.js Refactor resizeImage method (#7236) 2018-04-23 09:15:51 +02:00
main.js bug fix (WebPush does not work) (#6120) 2017-12-28 16:20:34 +01:00
performance.js Restore vanilla components 2017-11-17 19:29:16 -08:00
ready.js Restore vanilla components 2017-11-17 19:29:16 -08:00
rtl.js Restore vanilla components 2017-11-17 19:29:16 -08:00
scroll.js Restore vanilla components 2017-11-17 19:29:16 -08:00
settings.js Implement tag auto-completion by history (#6621) 2018-03-04 20:27:25 +01:00
stream.js Use randomized setTimeout when fallback-polling and re-add since_id (#7522) 2018-05-18 02:32:35 +02:00
test_setup.js Restore vanilla components 2017-11-17 19:29:16 -08:00
uuid.js Restore vanilla components 2017-11-17 19:29:16 -08:00