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
3fefb7909b
tootlab-mastodon/app/javascript/mastodon/actions
History
Thibaut Girka 3fefb7909b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `config/webpack/shared.js`:
  Upstream has changed how Tesseract.js gets included and dropped a dependency.
  The conflict is caused by glitch-soc having different code due to its
  theming system.
  Ported upstream changes.
- `lib/mastodon/version.rb`:
  Upstream refactor/code style change in a place we replaced upstream's
  repo URL with ours.
  Ported upstram changes, keeping our repo URL.
- `yarn.lock`:
  Upstream dropped dependencies, one of which was textually too close to
  a glitch-soc-specific dependency. Not a real conflict.
2020-09-01 17:02:18 +02:00
..
importer FIX: filters ignore media descriptions (#13837) 2020-06-09 00:11:42 +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 Fix 404 and 410 API errors being silently discarded in WebUI (#13279) 2020-03-28 17:59:45 +01: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 Add indicator of unread content to window title when web UI is out of focus (#11560) 2019-08-13 12:22:16 +02: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
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-07-22 13:38:17 +02: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 bookmarks (#7107) 2019-11-13 23:02:10 +01:00
lists.js Add configuration option to filter replies in lists (#9205) 2020-09-01 13:31:28 +02:00
markers.js Fix timeline markers in Firefox (regression from #13887) (#13889) 2020-05-29 19:25:57 +02:00
modal.js Improve dropdown menu keyboard navigation (#11491) 2019-08-06 11:59:46 +02:00
mutes.js Store objects to IndexedDB (#6826) 2018-03-24 13:06:27 +01:00
notifications.js Fix timeline markers not working on Chrome (#13887) 2020-05-29 16:14:16 +02:00
onboarding.js Add new first-time tutorial (#9531) 2018-12-17 11:07:17 +01: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 Fix/14021 behaviour on add or remove toots (#14212) 2020-07-19 17:04:02 +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 Show suggested follows on search screen in mobile layout (#9010) 2018-10-23 00:08:39 +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