luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-16 03:43:08 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript/mastodon
History
Claire 077183a121 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/settings/preferences_controller.rb`:
  Upstream dropping `digest` from notifications emails while we have more
  notification emails settings.
  Removed `digest` from our list while keeping our extra settings.
- `app/javascript/packs/admin.js`:
  Conflicts caused by glitch-soc's theming system.
  Applied the changes to `app/javascript/core/admin.js`.
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream removed a setting close to a glitch-soc-only setting.
  Applied upstream's change.
2022-08-28 11:31:00 +02:00
..
actions Merge branch 'main' into glitch-soc/merge-upstream 2022-08-25 17:49:14 +02:00
components Add rel="noopener" to links to remote profiles (#19014) 2022-08-26 02:12:46 +02:00
containers Add ability to filter individual posts (#18945) 2022-08-25 04:27:47 +02:00
features Merge branch 'main' into glitch-soc/merge-upstream 2022-08-25 05:07:39 +02:00
locales Merge branch 'main' into glitch-soc/merge-upstream 2022-08-25 17:49:14 +02:00
middleware Fix 404 and 410 API errors being silently discarded in WebUI (#13279) 2020-03-28 17:59:45 +01:00
reducers Fix “Filter this post” potentially listing deleted filters (#19051) 2022-08-25 17:36:35 +02:00
selectors Add ability to filter individual posts (#18945) 2022-08-25 04:27:47 +02:00
service_worker Replace to workbox-webpack-plugin from offline-plugin (#18409) 2022-08-25 20:10:01 +02:00
store Code style improvements in JavaScript (#13159) 2020-03-08 16:02:36 +01:00
utils Add ability to filter individual posts (#18945) 2022-08-25 04:27:47 +02:00
api.js Change routing paths to use usernames in web UI (#16171) 2021-09-26 05:46:13 +02:00
base_polyfills.js Fix old browsers crashing because of missing finally polyfill in web UI (#13115) 2020-02-18 17:22:44 +01:00
blurhash.js Fix not being able to open audio modal in web UI (#15283) 2020-12-07 04:29:37 +01:00
common.js Migrate Rails ujs as required for Rails 6 Upgrade. (#13280) 2020-03-21 03:14:50 +01:00
compare_id.js Add option to disable real-time updates in web UI (#9984) 2019-07-16 16:11:50 +02:00
extra_polyfills.js fix multiple space (#12655) 2019-12-19 07:39:08 +09:00
initial_state.js Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +02:00
is_mobile.js Fix pop-out player appearing on mobile screens in web UI (#15157) 2020-11-16 05:16:39 +01:00
load_keyboard_extensions.js fix: support KaiOS arrow navigation on public pages (#12251) 2019-11-04 13:03:09 +01:00
load_polyfills.js Fix old browsers crashing because of missing finally polyfill in web UI (#13115) 2020-02-18 17:22:44 +01:00
main.js Replace to workbox-webpack-plugin from offline-plugin (#18409) 2022-08-25 20:10:01 +02:00
performance.js
permissions.js Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
ready.js
scroll.js Use ScrollToOptions for smooth scrolling if supported (#11207) 2019-06-29 18:32:06 +02:00
settings.js
stream.js Fixed ESLint error (#15214) 2020-11-23 17:35:14 +01:00
test_setup.js Replace to testing-library from enzyme (#14152) 2020-06-29 13:58:07 +02:00
uuid.js