izaliamae/glitch-soc
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
glitch-soc/app/javascript/mastodon
History
Claire 7623e18124 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream README has been changed, but we have a completely different one.
  Kept our `README.md`.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for more incoming HTML tags (a large subset of what
  glitch-soc accepts).
  Change the code style to match upstream's but otherwise do not change our
  code.
- `spec/lib/sanitize_config_spec.rb`:
  Upstream added support for more incoming HTML tags (a large subset of what
  glitch-soc accepts).
  Kept our version, since the tests are mostly glitch-soc's, except for cases
  which are purposefuly different.
2023-03-05 20:46:56 +01:00
..
actions Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
components Do not leave Mastodon when clicking “Back” (#23953) 2023-03-04 23:18:19 +01:00
containers Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
features Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
locales Merge branch 'main' into glitch-soc/merge-upstream 2023-03-02 17:32:38 +01:00
middleware Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
reducers Fix case-sensitive check for previously used hashtags (#23526) 2023-02-13 14:54:08 +01:00
selectors Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
service_worker fix(web-push-notifications): fix favourite push notifications (#23286) 2023-02-03 09:29:32 +01:00
store Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
utils Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01: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 Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
compare_id.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
extra_polyfills.js chore: remove intersection-observer for old Safari support (#23284) 2023-01-29 19:02:04 +01:00
initial_state.js Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +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 Remove object-fit polyfill for the old Microsoft Edge (#22693) 2023-01-05 13:32:02 +01:00
main.jsx Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
performance.js
permissions.js Add dropdown menu item to open admin interface for remote domains (#21895) 2023-01-05 14:03:46 +01: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 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 Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00