mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
mastodon-glitch/app/javascript/mastodon
History
Claire c59fb65ddc Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Conflict due to glitch-soc's option to hide followers count.
  Ported upstream changes.

Additional changes:
- `app/views/application/mailer/_account.html.haml`:
  Ported glitch-soc's option to hide followers count.
- `app/views/settings/flavours/show.html.haml`:
  Ported the `frontend_asset_url` helper change to glitch-soc.
 		2024-01-17 18:32:15 +01:00
..
actions Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream 2023-12-21 19:42:13 +01:00
api_types Add profile setup to onboarding in web UI (#27829) 2023-11-15 11:13:53 +00:00
components Change media “ALT” label to a specific class (#28777) 2024-01-17 15:32:56 +00:00
containers Use helpers to check environment in frontend (#27633) 2023-10-31 16:05:44 +00:00
features Merge commit '01b6c83c369061c2175d50dfb3ae1db502862664' into glitch-soc/merge-upstream 2024-01-16 12:04:11 +01:00
locales Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream 2024-01-17 18:32:15 +01:00
models Add profile setup to onboarding in web UI (#27829) 2023-11-15 11:13:53 +00:00
polyfills Improve Babel configuration and automatically load polyfills (#27333) 2023-10-31 10:55:13 +00:00
reducers Update devDependencies (non-major) (#28728) 2024-01-16 18:34:22 +00:00
selectors Upgrade Redux packages (#28585) 2024-01-08 10:57:40 +00:00
service_worker
…
store Upgrade Redux packages (#28585) 2024-01-08 10:57:40 +00:00
utils Converted app/javascript/mastodon/utils/ folder to TypeScript (#27895) 2023-11-28 17:47:55 +00: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
…
compare_id.ts
…
initial_state.js Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main 2023-12-17 17:43:30 +01: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
…
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
…
ready.js
…
scroll.ts Upgrade to `typescript-eslint` v6 (#25904) 2023-07-13 11:49:16 +02:00
settings.js Add volume saving/reuse to video player (#27488) 2023-11-07 18:15:38 +00:00
stream.js
…
test_helpers.tsx Simplify column headers (#27557) 2023-10-27 13:21:07 +00: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