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/flavours/glitch
History
Claire eee36267d6 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/locales/ja.json`:
  Upstream change too close to a glitch-soc-specific string.
  The glitch-soc-specific string should not have been in this file, so it
  has been moved to `app/javascript/flavours/glitch/locales/ja.js`.
- `app/javascript/packs/public.js`:
  Upstream refactored a part, that as usual is split and duplicated in various
  pack files. Updated those pack files accordingly.
- `app/views/layouts/application.html.haml`:
  Upstream fixed custom.css path in a different way than we did, went with
  upstream's change.
 		2022-10-30 18:15:28 +01:00
..
actions [Glitch] Add featured tags selector for WebUI 2022-10-28 19:24:02 +02:00
components [Glitch] Fix number of uses being shown again on trending hashtags in web UI 2022-10-28 19:49:45 +02:00
containers [Glitch] Change public accounts pages to mount the web UI 2022-10-28 19:24:02 +02:00
features [Glitch] Fix closed registrations message not appearing in web UI 2022-10-28 19:49:45 +02:00
images
…
locales Merge branch 'main' into glitch-soc/merge-upstream 2022-10-30 18:15:28 +01:00
middleware
…
packs Merge branch 'main' into glitch-soc/merge-upstream 2022-10-30 18:15:28 +01:00
reducers [Glitch] Add featured tags selector for WebUI 2022-10-28 19:24:02 +02:00
selectors [Glitch] Change public accounts pages to mount the web UI 2022-10-28 19:24:02 +02:00
store
…
styles [Glitch] Fix number of uses being shown again on trending hashtags in web UI 2022-10-28 19:49:45 +02:00
utils [Glitch] Add ability to view previous edits of a status in admin UI 2022-10-28 19:24:02 +02:00
api.js [Glitch] Replace `CancelToken` to `AbortSignal` 2022-10-28 19:24:02 +02:00
base_polyfills.js Move more modules from flavours/glitch/utils to flavours/glitch 2022-10-11 12:25:45 +02:00
blurhash.js
…
compare_id.js Move more modules from flavours/glitch/utils to flavours/glitch 2022-10-11 12:25:45 +02:00
extra_polyfills.js [Glitch] Replace `CancelToken` to `AbortSignal` 2022-10-28 19:24:02 +02:00
initial_state.js [Glitch] Redirect non-logged-in user to owner statuses on single user mode 2022-10-28 19:24:02 +02:00
is_mobile.js [Glitch] Hide list panel from nav bar in mobile layout 2022-10-28 19:24:02 +02:00
load_keyboard_extensions.js Move more modules from flavours/glitch/utils to flavours/glitch 2022-10-11 12:25:45 +02:00
load_polyfills.js [Glitch] Replace `CancelToken` to `AbortSignal` 2022-10-28 19:24:02 +02:00
main.js [Glitch] Change public accounts pages to mount the web UI 2022-10-28 19:24:02 +02:00
names.yml
…
performance.js Move more modules from flavours/glitch/utils to flavours/glitch 2022-10-11 12:25:45 +02:00
permissions.js
…
ready.js
…
scroll.js Move more modules from flavours/glitch/utils to flavours/glitch 2022-10-11 12:25:45 +02:00
settings.js [Glitch] Add dismissable hints to various timelines in web UI 2022-10-28 19:24:02 +02:00
stream.js Move more modules from flavours/glitch/utils to flavours/glitch 2022-10-11 12:25:45 +02:00
theme.yml [Glitch] Remove code for rendering public and hashtag timelines outside the web UI 2022-10-28 19:24:02 +02:00
uuid.js Move more modules from flavours/glitch/utils to flavours/glitch 2022-10-11 12:25:45 +02:00