1
0
puyopuyotetr.is/app/javascript/mastodon/actions
Claire d77fbbed73 Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes, but we had removed it.
  Discarded upstream changes.
- `.rubocop_todo.yml`:
  Upstream regenerated the file, we had some glitch-soc-specific ignores.
- `app/models/account_statuses_filter.rb`:
  Minor upstream code style change where glitch-soc had slightly different code
  due to handling of local-only posts.
  Updated to match upstream's code style.
- `app/models/status.rb`:
  Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one.
  Moved the definitions as upstream did.
- `app/services/backup_service.rb`:
  Upstream rewrote a lot of the backup service, glitch-soc had changes because
  of exporting local-only posts.
  Took upstream changes and added back code to deal with local-only posts.
- `config/routes.rb`:
  Upstream split the file into different files, while glitch-soc had a few
  extra routes.
  Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb`
  and `config/routes/admin.rb`
- `db/schema.rb`:
  Upstream has new migrations, while glitch-soc had an extra migration.
  Updated the expected serial number to match upstream's.
- `lib/mastodon/version.rb`:
  Upstream added support to set version tags from environment variables, while
  glitch-soc has an extra `+glitch` tag.
  Changed the code to support upstream's feature but prepending a `+glitch`.
- `spec/lib/activitypub/activity/create_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests due to
  `directMessage` handling.
  Applied upstream's changes while keeping glitch-soc's extra tests.
- `spec/models/concerns/account_interactions_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests.
  Applied upstream's changes while keeping glitch-soc's extra tests.
2023-05-08 19:28:21 +02: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.ts Rewrite actions/app.ts and reducers/missed_updates.ts with createAction (#24801) 2023-05-03 15:28:39 +02: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 commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream 2023-05-08 15:28:36 +02: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 SUBMIT doesn't exist on XMLHttpRequest (#24423) 2023-04-05 10:56:55 +02: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 Add eslint-plugin-jsdoc (#24719) 2023-04-30 02:29:54 +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 Change hashtags and mentions in bios to open in-app in web UI (#24643) 2023-04-25 06:33:21 +02:00
server.js Replace Status#translatable? with language matrix in separate endpoint (#24037) 2023-03-16 11:07:24 +01: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 Add eslint-plugin-jsdoc (#24719) 2023-04-30 02:29:54 +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