djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-25 01:24:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
e2a2bc9021
tootlab-mastodon/app/javascript/mastodon/actions
History
Claire e2a2bc9021 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream updated copyright year, we don't mention it so kept our version.
- `app/controllers/admin/dashboard_controller.rb`:
  Not really a conflict, upstream change (removing the spam checker) too close
  to glitch-soc changes. Ported upstream changes.
- `app/models/form/admin_settings.rb`:
  Same.
- `app/services/remove_status_service.rb`:
  Same.
- `app/views/admin/settings/edit.html.haml`:
  Same.
- `config/settings.yml`:
  Same.
- `config/environments/production.rb`:
  Not a real conflict, upstream added a default HTTP header, but we have
  extra headers in glitch-soc.
  Added the header.
2021-04-20 12:17:14 +02:00
..
importer Change onboarding by replacing tutorial with follow recommendations in web UI (#16060) 2021-04-19 14:45:15 +02:00
push_notifications Do not override the default push notification settings (#6037) 2018-05-19 14:45:58 +02:00
account_notes.js Change design of account notes in web UI (#14208) 2020-07-07 01:24:03 +02:00
accounts.js Add duration parameter to muting. (#13831) 2020-10-13 01:01:14 +02:00
alerts.js Fix 404 and 410 API errors being silently discarded in WebUI (#13279) 2020-03-28 17:59:45 +01:00
announcements.js Change how unread announcements are handled (#13020) 2020-02-03 01:53:09 +01:00
app.js Fix pop-out player appearing on mobile screens in web UI (#15157) 2020-11-16 05:16:39 +01:00
blocks.js Add explanation to mute dialog, refactor and clean up mute/block UI (#11992) 2019-09-29 21:46:05 +02:00
bookmarks.js Add bookmarks (#7107) 2019-11-13 23:02:10 +01:00
boosts.js Add dropdown for boost privacy in boost confirmation modal (#15704) 2021-02-11 00:53:12 +01:00
bundles.js Lazy load components (#3879) 2017-07-08 00:06:02 +02:00
columns.js Put "Media Only" option in column settings instead of content area headline (#7801) 2018-06-15 11:15:15 +02:00
compose.js Merge branch 'master' into glitch-soc/merge-upstream 2020-11-12 22:13:57 +01:00
conversations.js Change conversations UI (#11896) 2019-09-21 20:01:16 +02:00
custom_emojis.js Fix loading indicator inconsistency (#9252) 2018-11-10 15:04:13 +01:00
directory.js Add profile directory to web UI (#11688) 2019-08-30 00:14:36 +02:00
domain_blocks.js Change account domain block to clear out notifications and follows (#11393) 2019-07-25 04:17:35 +02:00
dropdown_menu.js Freeze scroll position when a dropdown menu is open in the TL (#14271) 2020-07-09 15:09:19 +02:00
emojis.js Track frequently used emojis in web UI (#5275) 2017-10-08 21:47:15 +02:00
favourites.js Fix loading indicator inconsistency (#9252) 2018-11-10 15:04:13 +01:00
filters.js Keyword/phrase filtering (#7905) 2018-06-29 15:34:36 +02:00
height_cache.js Fix height cache (#4909) 2017-09-13 10:24:33 +02:00
identity_proofs.js Fix 404 and 410 API errors being silently discarded in WebUI (#13279) 2020-03-28 17:59:45 +01:00
interactions.js Add dropdown for boost privacy in boost confirmation modal (#15704) 2021-02-11 00:53:12 +01:00
lists.js Add configuration option to filter replies in lists (#9205) 2020-09-01 13:31:28 +02:00
markers.js Fix alert when failing to save timeline markers in web UI (#15285) 2020-12-07 03:23:43 +01:00
modal.js Improve dropdown menu keyboard navigation (#11491) 2019-08-06 11:59:46 +02:00
mutes.js Add duration parameter to muting. (#13831) 2020-10-13 01:01:14 +02:00
notifications.js Change notification permission handling (#15176) 2020-12-15 18:43:54 +01: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 pop-out player for audio/video in web UI (#14870) 2020-09-28 13:29:43 +02:00
pin_statuses.js Store objects to IndexedDB (#6826) 2018-03-24 13:06:27 +01:00
polls.js Fix poll options not rendering text after vote/refresh (#10189) 2019-03-06 05:35:52 +01:00
reports.js Federated reports (#6570) 2018-02-28 06:54:55 +01:00
search.js Add search results pagination to web UI (#11409) 2019-07-27 05:49:50 +02:00
settings.js Improve web api protect (#6343) 2018-04-17 15:23:46 +02:00
statuses.js Remove obsolete IndexedDB operations from web UI (#14730) 2020-09-04 20:22:40 +02:00
store.js Store objects to IndexedDB (#6826) 2018-03-24 13:06:27 +01:00
streaming.js Add support for managing multiple stream subscriptions in a single connection (#14524) 2020-08-11 18:24:59 +02:00
suggestions.js Change onboarding by replacing tutorial with follow recommendations in web UI (#16060) 2021-04-19 14:45:15 +02:00
timelines.js Fix timeline markers not working on Chrome (#13887) 2020-05-29 16:14:16 +02:00
trends.js Add trends UI with admin and user settings (#11502) 2019-08-06 17:57:52 +02:00