djsundog
/
tootlab-mastodon
mirror of https://github.com/glitch-soc/mastodon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/app/javascript/mastodon
History
Thibaut Girka db200226b8 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/javascript/mastodon/initial_state.js
	db/schema.rb

Upstream added a new field to initial_state.
Not too sure about what happened with db/schema.rb though…
 		2018-06-15 20:51:39 +02:00
..
actions Put "Media Only" option in column settings instead of content area headline (#7801) 2018-06-15 11:15:15 +02:00
components Add redraft function (#7735) 2018-06-05 00:17:38 +02:00
containers Add redraft function (#7735) 2018-06-05 00:17:38 +02:00
features Merge branch 'master' into glitch-soc/merge-upstream 2018-06-15 20:51:39 +02:00
locales Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-06-12 13:17:21 +00:00
middleware Add missing rejection handling for Promises (#7008) 2018-04-02 14:51:02 +02:00
reducers Put "Media Only" option in column settings instead of content area headline (#7801) 2018-06-15 11:15:15 +02:00
selectors Profile redirect notes (#5746) 2017-11-18 19:39:02 +01:00
service_worker Update ESLint for Code Climate (#7696) 2018-06-01 14:03:19 +02:00
storage Cache media only when storage can be freed (#7547) 2018-05-19 19:22:11 +02:00
store Restore vanilla components 2017-11-17 19:29:16 -08:00
utils Preserve newlines in delete & redraft and desktop notifications (#7750) 2018-06-06 20:49:53 +02: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 Refactor resizeImage method (#7236) 2018-04-23 09:15:51 +02:00
compare_id.js Fix comparing id (#7180) 2018-04-18 16:50:19 +02:00
extra_polyfills.js Restore vanilla components 2017-11-17 19:29:16 -08:00
initial_state.js Merge branch 'master' into glitch-soc/merge-upstream 2018-06-15 20:51:39 +02: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 Refactor resizeImage method (#7236) 2018-04-23 09:15:51 +02: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 Implement tag auto-completion by history (#6621) 2018-03-04 20:27:25 +01:00
stream.js Use randomized setTimeout when fallback-polling and re-add since_id (#7522) 2018-05-18 02:32:35 +02: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