1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-04 17:58:49 +09:00
YuruToot/app/javascript/mastodon/features
Thibaut Girka a2a64ecd3e Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- .eslintrc.yml
  Removed, as upstream removed it.
- app/controllers/admin/statuses_controller.rb
  Minor code cleanup when porting one of our features.
- app/models/account.rb
  Note length validation has changed upstream.
  We now use upstream's validation (dropped legacy glitch-soc
  account metadata stuff) but with configurable limit.
- app/services/post_status_service.rb
  Upstream has added support for scheduled toots, refactoring
  the code a bit. Adapted our changes to this refactoring.
- app/views/stream_entries/_detailed_status.html.haml
  Not a real conflict, changes too close.
- app/views/stream_entries/_simple_status.html.haml
  Not a real conflict, changes too close.
2019-01-10 21:00:30 +01:00
..
account/components Add quick links to the admin interface in the WebUI (#8545) 2019-01-04 13:10:43 +01:00
account_gallery Minor scrollable list fixes (#9551) 2018-12-17 17:02:59 +01:00
account_timeline Use local instead of global loading indicator for timelines, account timelines (#9224) 2018-11-08 21:35:06 +01:00
blocks Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
community_timeline Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
compose Merge branch 'master' into glitch-soc/merge-upstream 2018-12-18 16:55:15 +01:00
direct_timeline Fix direct messages column not loading more items on scroll (#9102) 2018-10-26 01:55:08 +02:00
domain_blocks Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
emoji Update emoji codepoint mappings to v11.0 (#9618) 2018-12-24 19:12:00 +01:00
favourited_statuses Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
favourites Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
follow_requests Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
followers Various fixes to scrollable lists and media gallery (#9501) 2018-12-12 22:32:44 +01:00
following Various fixes to scrollable lists and media gallery (#9501) 2018-12-12 22:32:44 +01:00
generic_not_found Replace sprockets/browserify with Webpack (#2617) 2017-05-03 02:04:16 +02:00
getting_started Changed not to display DISCOVER subheader via single column layout. (#9759) 2019-01-08 14:32:36 +01:00
hashtag_timeline Fix that translation is not applied to "joining hashtags" (#9397) 2018-11-30 19:36:09 +01:00
home_timeline Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
introduction Update dependencies for Node.js (2018-12-31) (#9669) 2018-12-31 18:11:48 +01:00
keyboard_shortcuts Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
list_adder Implement adding a user to a list from their profile (#9062) 2018-11-05 18:52:38 +01:00
list_editor Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
list_timeline Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
lists Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
mutes Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
notifications Remove visible timestamps for notifications (#9675) 2018-12-31 18:12:07 +01:00
pinned_statuses Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
public_timeline Clean up dead code in public timeline code (#9565) 2018-12-18 22:00:18 +01:00
reblogs Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
report Add missing video descriptions (#8416) 2018-08-24 23:55:41 +02:00
standalone Allow joining several hashtags in a single column (#8904) 2018-11-05 18:53:25 +01:00
status Add quick links to the admin interface in the WebUI (#8545) 2019-01-04 13:10:43 +01:00
ui Update dependencies for Node.js (2018-12-31) (#9669) 2018-12-31 18:11:48 +01:00
video Volume sliders for videos #7429 (#9366) 2018-11-27 12:25:38 +01:00