rubiline
/
Glitch-Shrike
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Glitch-Shrike/app/javascript/mastodon
History
Claire 941a9df28a Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream changed how the nightly builds are versioned, the conflict
  is because glitch-soc modified adjacent lines relative to the docker
  repositories the images are pushed to.
  Applied upstream's changes.
- `app/views/settings/preferences/notifications/show.html.haml`:
  Upstream moved some settings around. Glitch-soc had more settings.
  Applied upstream's changes, moving glitch-soc's extra settings
  accordingly.
 		2023-08-24 21:56:00 +02:00
..
actions Merge commit '496eb6f7a4fa7de54f26da9642a76e6884648102' into glitch-soc/merge-upstream 2023-08-13 19:23:22 +02:00
components Fix clicking “Explore” or “Live feeds” column headers to scroll in advanced mode (#26633) 2023-08-24 14:10:48 +02:00
containers Change interaction modal in web UI (#26075) 2023-07-27 16:11:17 +02:00
features Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream 2023-08-24 21:56:00 +02:00
locales Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream 2023-08-22 18:50:14 +02:00
polyfills Upgrade to `typescript-eslint` v6 (#25904) 2023-07-13 11:49:16 +02:00
reducers Wrong count in response when removing favourite/reblog (#24365) 2023-07-19 09:02:30 +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 `typescript-eslint` v6 (#25904) 2023-07-13 11:49:16 +02:00
utils Upgrade to `typescript-eslint` v6 (#25904) 2023-07-13 11:49:16 +02:00
api.js Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +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 '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main 2023-08-13 18:47:15 +02: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 Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
performance.js
…
permissions.ts
…
ready.js
…
scroll.ts Upgrade to `typescript-eslint` v6 (#25904) 2023-07-13 11:49:16 +02:00
settings.js
…
stream.js
…
test_setup.js
…
uuid.ts Upgrade to `typescript-eslint` v6 (#25904) 2023-07-13 11:49:16 +02:00