fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2025-01-03 21:42:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/javascript/mastodon
History
Thibaut Girka 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
  Updating rails-ujs, no real conflict, but a comment to close to changed
  code. Various glitch-soc-only files have been updated to match those changes,
  though.
- `package.json`:
  No real conflict, just an additional dependency in glitch-soc that was too
  close to something updated upstream. Took upstream's changes.
2020-03-22 16:10:44 +01:00
..
actions Fix regression in “Edit media” modal in web UI (#13243) 2020-03-10 11:59:44 +01:00
components Fix WebUI crash in single-column mode on prehistoric browsers (#13267) 2020-03-17 20:43:55 +01:00
containers Change the string "hidden" to "blocked" in WebUI (#13221) 2020-03-09 09:13:21 +01:00
features Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
middleware
reducers Code style improvements in JavaScript (#13159) 2020-03-08 16:02:36 +01:00
selectors Code style improvements in JavaScript (#13159) 2020-03-08 16:02:36 +01:00
service_worker Code style improvements in JavaScript (#13159) 2020-03-08 16:02:36 +01:00
storage
store Code style improvements in JavaScript (#13159) 2020-03-08 16:02:36 +01:00
utils Migrate Rails ujs as required for Rails 6 Upgrade. (#13280) 2020-03-21 03:14:50 +01:00
api.js Do not set CSRF Token when no csrf header (#10383) 2019-03-26 11:13:20 +01:00
base_polyfills.js Fix old browsers crashing because of missing finally polyfill in web UI (#13115) 2020-02-18 17:22:44 +01:00
common.js Migrate Rails ujs as required for Rails 6 Upgrade. (#13280) 2020-03-21 03:14:50 +01:00
compare_id.js Add option to disable real-time updates in web UI (#9984) 2019-07-16 16:11:50 +02:00
extra_polyfills.js fix multiple space (#12655) 2019-12-19 07:39:08 +09:00
initial_state.js Merge branch 'master' into glitch-soc/merge-upstream 2019-10-27 12:14:01 +01:00
is_mobile.js
load_keyboard_extensions.js fix: support KaiOS arrow navigation on public pages (#12251) 2019-11-04 13:03:09 +01:00
load_polyfills.js Fix old browsers crashing because of missing finally polyfill in web UI (#13115) 2020-02-18 17:22:44 +01:00
main.js Fix /web redirecting to /web/web in web UI (#13128) 2020-02-22 01:27:34 +01:00
performance.js
ready.js
rtl.js Exclude URLs from text analysis (#11759) 2019-09-04 22:30:49 +02:00
scroll.js Use ScrollToOptions for smooth scrolling if supported (#11207) 2019-06-29 18:32:06 +02:00
settings.js
stream.js minor server-sent events fixes (#12945) 2020-01-24 20:51:33 +01:00
test_setup.js
uuid.js