monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/javascript/mastodon
History
Claire 0aa69487a2 Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `config/routes.rb`:
  Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
  an extra route.
  Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
  This spec got converted to a system spec upstream.
  However, the theme setting works differently in glitch-soc, so the spec had been
  changed.
  Changed the corresponding system spec as well.
 		2024-12-25 18:01:37 +01:00
..
actions Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 2024-12-25 18:01:37 +01:00
api Change search to use query params in web UI (#32949) 2024-12-12 17:12:33 +00:00
api_types Change search to use query params in web UI (#32949) 2024-12-12 17:12:33 +00:00
components Change animation on feed generation screen in web UI (#33311) 2024-12-16 07:38:56 +00:00
containers Convert polls to Typescript / Immutable Records (#29789) 2024-12-10 22:54:07 +00:00
features Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 2024-12-25 18:01:37 +01:00
locales Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 2024-12-25 18:01:37 +01:00
models Change search to use query params in web UI (#32949) 2024-12-12 17:12:33 +00:00
polyfills Improve Babel configuration and automatically load polyfills (#27333) 2023-10-31 10:55:13 +00:00
reducers Change search to use query params in web UI (#32949) 2024-12-12 17:12:33 +00:00
selectors Change design of lists in web UI (#32881) 2024-11-21 16:10:04 +00:00
service_worker Fix notification push notifications not including the author's username (#32254) 2024-10-04 14:29:23 +00:00
store Convert notification requests actions and reducers to Typescript (#31866) 2024-09-16 09:54:03 +00:00
utils Fix too many requests caused by relationship look-ups in web UI (#32042) 2024-09-24 17:02:36 +00:00
api.ts Change design of lists in web UI (#32881) 2024-11-21 16:10:04 +00:00
blurhash.ts Upgrade to `typescript-eslint` v6 (#25904) 2023-07-13 11:49:16 +02:00
common.js Update typescript-eslint monorepo to v8 (major) (#31231) 2024-09-11 13:59:46 +00:00
compare_id.ts Use Prettier for ESLint formatting TypeScript (#23631) 2023-05-09 19:02:12 +02:00
identity_context.tsx Remove the access token from Redux & context (#30275) 2024-05-22 14:45:18 +00:00
initial_state.js Add terms of service (#33055) 2024-12-09 10:04:46 +00:00
is_mobile.ts Change links in multi-column mode so tabs are open in single-column mode (#25893) 2023-07-13 17:18:09 +02:00
load_keyboard_extensions.js fix: support KaiOS arrow navigation on public pages (#12251) 2019-11-04 13:03:09 +01:00
main.jsx Use helpers to check environment in frontend (#27633) 2023-10-31 16:05:44 +00:00
performance.js Use helpers to check environment in frontend (#27633) 2023-10-31 16:05:44 +00:00
permissions.ts Add link from Web UI for Hashtags to the Moderation UI (#31448) 2024-11-29 07:36:17 +00:00
ready.js Disable push notification when not logged in (#19272) 2022-10-03 18:15:47 +02:00
scroll.ts Fix browser glitch caused by two overlapping scroll animations in web UI (#31960) 2024-09-19 10:52:46 +00:00
settings.js Update typescript-eslint monorepo to v8 (major) (#31231) 2024-09-11 13:59:46 +00:00
stream.js Remove unused E2EE-related methods (#31964) 2024-09-19 10:23:58 +00:00
test_helpers.tsx Fix browser glitch caused by two overlapping scroll animations in web UI (#31960) 2024-09-19 10:52:46 +00:00
test_setup.js Update dependency @testing-library/jest-dom to v6 (#26479) 2023-08-28 12:19:42 +02:00
uuid.ts Update eslint (non-major) (#29820) 2024-04-03 18:05:39 +00:00