tykayn
/
mastodon
mirror of https://framagit.org/tykayn/mastodon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript/mastodon
History
Claire c118918520 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/custom_emoji.rb`:
  Not a real conflict, just upstream changing a line too close to
  a glitch-soc-specific validation.
  Applied upstream changes.
- `app/models/public_feed.rb`:
  Not a real conflict, just upstream changing a line too close to
  a glitch-soc-specific parameter documentation.
  Applied upstream changes.
 		2022-11-10 09:36:47 +01:00
..
actions Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
components Change larger reblogs/favourites numbers to be shortened in web UI (#20303) 2022-11-10 08:49:59 +01:00
containers Remove unused timeline_container to fix linter errors (#20305) 2022-11-10 08:50:45 +01:00
features Merge branch 'main' into glitch-soc/merge-upstream 2022-11-10 09:36:47 +01:00
locales Merge branch 'main' into glitch-soc/merge-upstream 2022-11-10 09:36:47 +01:00
middleware Fix 404 and 410 API errors being silently discarded in WebUI (#13279) 2020-03-28 17:59:45 +01:00
reducers Fix redrafting a currently-editing post not leaving edit mode (#20023) 2022-11-08 04:06:54 +01:00
selectors Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
service_worker Disable media cache on service worker (#19471) 2022-10-26 18:21:36 +02:00
store Code style improvements in JavaScript (#13159) 2020-03-08 16:02:36 +01:00
utils Fix WebUI error in development mode (#19078) 2022-08-29 10:02:40 +02:00
api.js Replace `CancelToken` to `AbortSignal` (#19352) 2022-10-14 03:16:37 +02: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
blurhash.js Fix not being able to open audio modal in web UI (#15283) 2020-12-07 04:29:37 +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 Replace `CancelToken` to `AbortSignal` (#19352) 2022-10-14 03:16:37 +02:00
initial_state.js Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
is_mobile.js Hide list panel from nav bar in mobile layout (#19337) 2022-10-10 21:41:25 +02:00
load_keyboard_extensions.js fix: support KaiOS arrow navigation on public pages (#12251) 2019-11-04 13:03:09 +01:00
load_polyfills.js Replace `CancelToken` to `AbortSignal` (#19352) 2022-10-14 03:16:37 +02:00
main.js Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
performance.js Restore vanilla components 2017-11-17 19:29:16 -08:00
permissions.js Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
ready.js Disable push notification when not logged in (#19272) 2022-10-03 18:15:47 +02:00
scroll.js Use ScrollToOptions for smooth scrolling if supported (#11207) 2019-06-29 18:32:06 +02:00
settings.js Add dismissable hints to various timelines in web UI (#19315) 2022-10-09 06:08:37 +02:00
stream.js Fixed ESLint error (#15214) 2020-11-23 17:35:14 +01:00
test_setup.js Replace to testing-library from enzyme (#14152) 2020-06-29 13:58:07 +02:00
uuid.js Restore vanilla components 2017-11-17 19:29:16 -08:00