me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/app/javascript/mastodon/features
History
Thibaut Girka 720cb01715 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/admin/base_controller.rb
  Some refactoring made upstream, no real conflict.
- app/javascript/mastodon/features/compose/components/compose_form.js
  Updated using upstream's code but using maxChars instead of the
  hardcoded length of 500 characters per toot.
- app/javascript/styles/mastodon/components.scss
  Upstream redesigned the onboarding modal. Not sure why we had a
  conflict there.
2018-12-18 16:55:15 +01:00
..
account/components Make avatar and headers respect auto_play_gif (#9515) 2018-12-14 20:34:18 +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 When searching for an emoji with multiple separators, consider the full input (#9124) 2018-10-27 22:32:54 +02: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 Change documentation URL (#8898) 2018-10-06 14:33:36 +09: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 Add new first-time tutorial (#9531) 2018-12-17 11:07:17 +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 Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
list_timeline Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +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 Add notification quick-filter bar in the frontend app (#9399) 2018-12-16 05:56:41 +01:00
pinned_statuses Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
public_timeline Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02: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 Fix null error introduced in #9270 (#9275) 2018-11-12 22:07:31 +01:00
ui Add new first-time tutorial (#9531) 2018-12-17 11:07:17 +01:00
video Volume sliders for videos #7429 (#9366) 2018-11-27 12:25:38 +01:00