monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/javascript/mastodon
History
Claire 95a1fde6b6 Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/fonts/roboto-mono.scss`:
  Upstream updated the linter, which changed a few linter rules.
  Some of those changed lines are different in glitch-soc because we use
  different paths for the assets.
  Applied the same style rules on our version of the file.
- `app/javascript/styles/fonts/roboto.scss`:
  Upstream updated the linter, which changed a few linter rules.
  Some of those changed lines are different in glitch-soc because we use
  different paths for the assets.
  Applied the same style rules on our version of the file.
 		2023-07-13 13:49:58 +02:00
..
actions Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream 2023-07-12 15:27:32 +02:00
components Upgrade to Prettier 3 (#25902) 2023-07-13 11:26:45 +02:00
containers Fix `/share` and cleanup and reorganize frontend locale loading (#25240) 2023-06-02 15:00:27 +02:00
features Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream 2023-07-13 13:49:58 +02:00
locales Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream 2023-07-12 15:38:35 +02:00
polyfills Upgrade to Prettier 3 (#25902) 2023-07-13 11:26:45 +02:00
reducers Upgrade to Prettier 3 (#25902) 2023-07-13 11:26:45 +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 Upgrade to Prettier 3 (#25902) 2023-07-13 11:26:45 +02:00
utils Upgrade to Prettier 3 (#25902) 2023-07-13 11:26:45 +02:00
api.js Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
blurhash.ts Use Prettier for ESLint formatting TypeScript (#23631) 2023-05-09 19:02:12 +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 '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream 2023-07-12 15:27:32 +02:00
is_mobile.ts Add stricter ESLint rules for Typescript files (#24926) 2023-05-10 12:59:29 +02:00
load_keyboard_extensions.js
…
main.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +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
…
scroll.ts Upgrade to Prettier 3 (#25902) 2023-07-13 11:26:45 +02:00
settings.js
…
stream.js Add eslint-plugin-jsdoc (#24719) 2023-04-30 02:29:54 +02:00
test_setup.js
…
uuid.ts Add stricter ESLint rules for Typescript files (#24926) 2023-05-10 12:59:29 +02:00