namekuji/chuckya
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
chuckya/app/javascript/mastodon
History
Claire 702d162998 Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/auth/registrations_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.
- `app/controllers/auth/sessions_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.
2023-10-08 16:48:19 +02:00
..
actions Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream 2023-10-08 16:30:00 +02:00
api_types Add Typescript types for some API objects (#26602) 2023-09-26 11:25:01 +02:00
components Fix retention dashboard not displaying correct month (#27180) 2023-09-28 10:16:15 +02:00
containers Convert dropdown_menu state to Typescript (#25585) 2023-09-22 18:18:46 +02:00
features Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream 2023-09-26 13:13:27 +02:00
locales Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream 2023-10-08 16:48:19 +02:00
polyfills Upgrade to typescript-eslint v6 (#25904) 2023-07-13 11:49:16 +02:00
reducers Convert dropdown_menu state to Typescript (#25585) 2023-09-22 18:18:46 +02:00
selectors Add toast with option to open post after publishing in web UI (#25564) 2023-07-08 20:01:08 +02:00
service_worker Upgrade react-intl (#24906) 2023-05-31 23:43:39 +02:00
store Fix Redux types (#26899) 2023-09-12 12:18:19 +02:00
utils Upgrade to typescript-eslint v6 (#25904) 2023-07-13 11:49:16 +02:00
api.ts Convert actions/account_notes into Typescript (#26601) 2023-09-11 16:09:22 +02:00
blurhash.ts Upgrade to typescript-eslint v6 (#25904) 2023-07-13 11:49:16 +02:00
common.js Dont use CommonJS (require, module.exports) anywhere (#24913) 2023-05-09 03:08:47 +02:00
compare_id.ts Use Prettier for ESLint formatting TypeScript (#23631) 2023-05-09 19:02:12 +02:00
initial_state.js Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream 2023-09-02 15:02:29 +02: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 Fix notification permissions being requested immediately after login (#26472) 2023-09-12 18:27:01 +02:00
performance.js Dont use CommonJS (require, module.exports) anywhere (#24913) 2023-05-09 03:08:47 +02:00
permissions.ts Use Prettier for ESLint formatting TypeScript (#23631) 2023-05-09 19:02:12 +02:00
ready.js Disable push notification when not logged in (#19272) 2022-10-03 18:15:47 +02:00
scroll.ts Upgrade to typescript-eslint v6 (#25904) 2023-07-13 11:49:16 +02:00
settings.js Add recent searches in web UI (#26834) 2023-09-07 14:56:19 +02:00
stream.js Add eslint-plugin-jsdoc (#24719) 2023-04-30 02:29:54 +02:00
test_setup.js Update dependency @testing-library/jest-dom to v6 (#26479) 2023-08-28 12:19:42 +02:00
uuid.ts Upgrade to typescript-eslint v6 (#25904) 2023-07-13 11:49:16 +02:00