mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-24 04:38:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/app/javascript/mastodon/actions
History
Claire ce84d163cc Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.prettierignore`:
  Upstream added a line at the end, glitch-soc had extra entries at the end.
  Added upstream's new line before glitch-soc's.
- `Gemfile.lock`:
  Upstream updated dependencies while glitch-soc has an extra one (hcaptcha).
  Updated dependencies like upstream did.
- `app/controllers/api/v1/statuses_controller.rb`:
  Not a real conflict, upstream added a parameter (`allowed_mentions`) where
  glitch-soc already had an extra one (`content_type`).
  Added upstream's new parameter.
- `app/javascript/styles/fonts/roboto-mono.scss`:
  A lot of lines were changed upstream due to code style changes, and a lot
  of those lines had path changes to accomodate glitch-soc's theming system.
  Applied upstream's style changes.
- `app/javascript/styles/fonts/roboto.scss`:
  A lot of lines were changed upstream due to code style changes, and a lot
  of those lines had path changes to accomodate glitch-soc's theming system.
  Applied upstream's style changes.
2023-02-13 19:35:35 +01:00
..
importer Revamp post filtering system (#18058) 2022-06-28 09:42:13 +02:00
push_notifications Enable ESLint no-useless-escape (#23311) 2023-02-13 15:12:14 +01:00
account_notes.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
accounts.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
alerts.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
announcements.js Fix being unable to react with the keycap number sign emoji (#22231) 2022-12-15 16:18:39 +01:00
app.js Fix pop-out player appearing on mobile screens in web UI (#15157) 2020-11-16 05:16:39 +01:00
blocks.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
bookmarks.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
boosts.js Fix eslint error (#16212) 2021-05-11 14:17:38 +02:00
bundles.js Lazy load components (#3879) 2017-07-08 00:06:02 +02:00
columns.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
compose.js Merge branch 'main' into glitch-soc/merge-upstream 2023-01-18 17:38:11 +01:00
conversations.js Change conversations UI (#11896) 2019-09-21 20:01:16 +02:00
custom_emojis.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
directory.js Add profile directory to web UI (#11688) 2019-08-30 00:14:36 +02:00
domain_blocks.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
dropdown_menu.js Fix dropdown menu positions when scrolling (#22916) 2023-01-11 21:58:46 +01:00
emojis.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
favourites.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
featured_tags.js Add featured tags selector for WebUI (#19358) 2022-10-16 08:43:59 +02:00
filters.js Move V2 Filter methods under /api/v2 prefix (#20622) 2022-11-14 08:34:07 +01:00
height_cache.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
history.js Add edit history to web UI (#17390) 2022-02-09 01:17:07 +01:00
interactions.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
languages.js Add language dropdown to compose in web UI (#18420) 2022-05-16 11:18:35 +02:00
lists.js Add configuration option to filter replies in lists (#9205) 2020-09-01 13:31:28 +02:00
markers.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
modal.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
mutes.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
notifications.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
onboarding.js Change onboarding by replacing tutorial with follow recommendations in web UI (#16060) 2021-04-19 14:45:15 +02:00
picture_in_picture.js Fix WebUI crash when a toot with a playing video gets deleted (#16384) 2021-06-25 04:45:17 +02:00
pin_statuses.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
polls.js Fix poll options not rendering text after vote/refresh (#10189) 2019-03-06 05:35:52 +01:00
reports.js Fix reporting from profile (#17632) 2022-02-23 21:37:02 +01:00
search.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
server.js Change about page to be mounted in the web UI (#19345) 2022-10-13 14:42:37 +02:00
settings.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
statuses.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
store.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
streaming.js Revamp post filtering system (#18058) 2022-06-28 09:42:13 +02:00
suggestions.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
tags.js Separate ESLint CI from Superlinter (#23029) 2023-01-29 23:44:03 +01:00
timelines.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
trends.js Add pagination for trending statuses in web UI (#17976) 2022-04-06 22:53:29 +02:00