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/actions
History
Claire 0aa69487a2 Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `config/routes.rb`:
  Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
  an extra route.
  Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
  This spec got converted to a system spec upstream.
  However, the theme setting works differently in glitch-soc, so the spec had been
  changed.
  Changed the corresponding system spec as well.
 		2024-12-25 18:01:37 +01:00
..
importer Convert polls to Typescript / Immutable Records (#29789) 2024-12-10 22:54:07 +00:00
push_notifications
…
account_notes.ts Fix spurious loading bar middleware usage (#31592) 2024-08-26 16:38:34 +00:00
accounts.js Fix too many requests caused by relationship look-ups in web UI (#32042) 2024-09-24 17:02:36 +00:00
accounts_typed.ts
…
alerts.ts Add ability to search for all accounts when creating a list in web UI (#33036) 2024-12-03 09:42:52 +00:00
announcements.js Remove the access token from Redux & context (#30275) 2024-05-22 14:45:18 +00:00
app.ts
…
blocks.js Remove the access token from Redux & context (#30275) 2024-05-22 14:45:18 +00:00
bookmarks.js Remove the access token from Redux & context (#30275) 2024-05-22 14:45:18 +00:00
bundles.js
…
columns.js
…
compose.js Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream 2024-07-23 19:31:23 +02:00
conversations.js Remove the access token from Redux & context (#30275) 2024-05-22 14:45:18 +00:00
custom_emojis.js Remove the access token from Redux & context (#30275) 2024-05-22 14:45:18 +00:00
directory.ts Convert `<Directory>` to Typescript / function component (#30829) 2024-06-26 18:04:50 +00:00
domain_blocks.js Remove the access token from Redux & context (#30275) 2024-05-22 14:45:18 +00:00
domain_blocks_typed.ts
…
dropdown_menu.ts
…
emojis.js
…
favourites.js Remove the access token from Redux & context (#30275) 2024-05-22 14:45:18 +00:00
featured_tags.js Remove the access token from Redux & context (#30275) 2024-05-22 14:45:18 +00:00
filters.js Remove the access token from Redux & context (#30275) 2024-05-22 14:45:18 +00:00
height_cache.js
…
history.js Remove the access token from Redux & context (#30275) 2024-05-22 14:45:18 +00:00
interactions.js Fix boost dialog visibility selection not being taken into account (#31523) 2024-08-21 13:11:36 +00:00
interactions_typed.ts Fix `createDataLoadingThunk` and related actions (#30408) 2024-05-23 18:22:42 +00:00
lists.js Change design of lists in web UI (#32881) 2024-11-21 16:10:04 +00:00
lists_typed.ts Change design of lists in web UI (#32881) 2024-11-21 16:10:04 +00:00
markers.ts Fix incorrect `'navigator'` check (#32219) 2024-10-02 10:03:04 +00:00
modal.ts
…
mutes.js Remove the access token from Redux & context (#30275) 2024-05-22 14:45:18 +00:00
notification_groups.ts Fix notification polling showing a loading bar in web UI (#32960) 2024-11-19 08:57:12 +00:00
notification_policies.ts Fix multiple bugs in notification requests and notification policies (#32062) 2024-09-24 15:03:38 +00:00
notification_requests.ts Fix multiple bugs in notification requests and notification policies (#32062) 2024-09-24 15:03:38 +00:00
notifications.js Fix too many requests caused by relationship look-ups in web UI (#32042) 2024-09-24 17:02:36 +00:00
notifications_migration.tsx Enable grouped notifications unconditionally (#31929) 2024-09-16 13:12:10 +00:00
notifications_typed.ts Grouped Notifications UI (#30440) 2024-07-18 14:36:09 +00:00
onboarding.js
…
picture_in_picture.ts Rewrite PIP state in Typescript (#27645) 2024-03-27 15:19:33 +00:00
pin_statuses.js Remove the access token from Redux & context (#30275) 2024-05-22 14:45:18 +00:00
polls.ts Convert polls to Typescript / Immutable Records (#29789) 2024-12-10 22:54:07 +00:00
reports.js Remove the access token from Redux & context (#30275) 2024-05-22 14:45:18 +00:00
search.ts Fix clicking on a profile mention while logged out potentially leading to incorrect account (#33324) 2024-12-16 19:29:51 +00:00
server.js Remove the access token from Redux & context (#30275) 2024-05-22 14:45:18 +00:00
settings.js Fix Web UI trying to save user settings when logged out (#30324) 2024-05-16 13:01:01 +00:00
statuses.js Change embedded posts to use web UI (#31766) 2024-09-12 09:41:19 +00:00
store.js
…
streaming.js Enable ESLlint no-case-declarations (#30768) 2024-10-01 16:26:30 +00:00
suggestions.ts Change onboarding flow in web UI (#32998) 2024-11-26 16:10:12 +00:00
tags.js Refactor `<HashtagHeader>` to TypeScript (#33096) 2024-12-06 08:42:24 +00:00
tags_typed.ts Refactor `<HashtagHeader>` to TypeScript (#33096) 2024-12-06 08:42:24 +00:00
timelines.js Refactor some actions to be proper async actions instead of passing a continuation (#31453) 2024-08-19 14:41:32 +00:00
timelines_typed.ts Convert `disconnectTimeline` and `timelineDelete` actions to Typescript (#30777) 2024-06-20 11:56:52 +00:00
trends.js Change `author_account` to be `authors` in REST API (#30846) 2024-06-27 13:17:18 +00:00