izaliamae/glitch-soc
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
glitch-soc/app/javascript/mastodon
History
David Yip 1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
 	README.md
 	app/controllers/follower_accounts_controller.rb
 	app/controllers/following_accounts_controller.rb
 	app/serializers/rest/instance_serializer.rb
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/simple_form.ja.yml
2018-03-02 21:46:44 -06:00
..
actions Add "Toots/Toots with replies/Media" tab below profile header (#6572) 2018-03-01 02:48:44 +01:00
components Responsively enforce 16:9 ratio on all media thumbnails in web UI (#6590) 2018-03-02 07:00:04 +01:00
containers Add option to show only local toots in timeline preview (#6292) 2018-02-04 06:00:10 +01:00
features Move "compose" on mobile to floating action button (#6594) 2018-03-02 07:12:40 +01:00
locales Merge remote-tracking branch 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06:00
middleware Audio.prototype.seek is undefined (#5935) 2017-12-09 01:25:00 +01:00
reducers Federated reports (#6570) 2018-02-28 06:54:55 +01:00
selectors Profile redirect notes (#5746) 2017-11-18 19:39:02 +01:00
service_worker Restore vanilla components 2017-11-17 19:29:16 -08:00
store Restore vanilla components 2017-11-17 19:29:16 -08:00
.gitkeep Replace sprockets/browserify with Webpack (#2617) 2017-05-03 02:04:16 +02:00
api.js Refactor /api/web APIs to use the centralized axios instance (#6223) 2018-01-08 20:01:33 +01:00
base_polyfills.js Restore vanilla components 2017-11-17 19:29:16 -08:00
extra_polyfills.js Restore vanilla components 2017-11-17 19:29:16 -08:00
initial_state.js When search enabled, display hint in search popout (#6593) 2018-03-02 06:02:42 +01:00
is_mobile.js Restore vanilla components 2017-11-17 19:29:16 -08:00
link_header.js Restore vanilla components 2017-11-17 19:29:16 -08:00
load_polyfills.js Restore vanilla components 2017-11-17 19:29:16 -08:00
main.js bug fix (WebPush does not work) (#6120) 2017-12-28 16:20:34 +01:00
performance.js Restore vanilla components 2017-11-17 19:29:16 -08:00
ready.js Restore vanilla components 2017-11-17 19:29:16 -08:00
rtl.js Restore vanilla components 2017-11-17 19:29:16 -08:00
scroll.js Restore vanilla components 2017-11-17 19:29:16 -08:00
settings.js Move push notifications settings (regression from #5879) (#5941) 2017-12-09 14:18:45 +01:00
stream.js Use streaming API for standalone timelines on /about and /tag pages (#5998) 2017-12-13 02:12:41 +01:00
test_setup.js Restore vanilla components 2017-11-17 19:29:16 -08:00
uuid.js Restore vanilla components 2017-11-17 19:29:16 -08:00