glitchier-soc/app/javascript/mastodon
Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/status.rb
- db/schema.rb

Both conflicts are caused by us having extra database columns.
2019-03-05 19:23:16 +01:00
..
actions Insert polls in redux stores before statuses so it avoids crashes (#10140) 2019-03-03 23:44:52 +01:00
components Fix various issues in polls (#10165) 2019-03-05 03:51:18 +01:00
containers Add polls (#10111) 2019-03-03 22:18:23 +01:00
features Merge branch 'master' into glitch-soc/merge-upstream 2019-03-05 19:23:16 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2019-02-26 17:04:44 +01:00
middleware Add missing rejection handling for Promises (#7008) 2018-04-02 14:51:02 +02:00
reducers Add polls (#10111) 2019-03-03 22:18:23 +01:00
selectors Don't filter own toots (fixes #8289) (#8298) 2018-08-19 18:44:18 +02:00
service_worker Hide CWed content in notifications and fix sensitive images without CWs (#9778) 2019-01-11 07:29:17 +00:00
storage Cache media only when storage can be freed (#7547) 2018-05-19 19:22:11 +02:00
store Update dependencies for Node.js (2018-12-31) (#9669) 2018-12-31 18:11:48 +01:00
utils Add WebP support (#9879) 2019-02-02 12:25:04 +01:00
api.js Update dependencies for Node.js (2018-12-31) (#9669) 2018-12-31 18:11:48 +01:00
base_polyfills.js Refactor resizeImage method (#7236) 2018-04-23 09:15:51 +02:00
common.js Improve the public hashtag page (#9831) 2019-01-17 14:06:08 +01: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 2019-01-10 21:00:30 +01:00
is_mobile.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