fef/nyastodon
1
1
Fork 0
forked from mirrors/catstodon
Code Issues Pull requests Projects Releases Packages Wiki Activity
nyastodon/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
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
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
blurhash.js
common.js
compare_id.js
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
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
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
settings.js Add dismissable hints to various timelines in web UI (#19315) 2022-10-09 06:08:37 +02:00
stream.js
test_setup.js
uuid.js