Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge ... Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.		2018-07-09 07:13:59 +02:00
..
actions	Fix filters not affecting notifications in web UI (#7977)	2018-07-07 19:31:19 +02:00
components	Display full username in tooltip on search and autosuggest #7478 (#7920)	2018-07-01 04:16:13 +02:00
containers	Keyword/phrase filtering (#7905)	2018-06-29 15:34:36 +02:00
features	Merge branch 'master' into glitch-soc/tentative-merge	2018-07-09 07:13:59 +02:00
locales	Merge branch 'master' into glitch-soc/tentative-merge	2018-07-09 07:13:59 +02:00
middleware	Add missing rejection handling for Promises (#7008)	2018-04-02 14:51:02 +02:00
reducers	Refactor privacyPrefence() to use priority list (#7945)	2018-07-04 17:35:35 +02:00
selectors	Add option to not consider word boundaries when processing keyword filtering (#7975)	2018-07-09 02:22:09 +02:00
service_worker	Disable service worker media cache and IndexedDB storage (#7932)	2018-07-03 19:50:18 +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	Add comment, test to unescapeHTML (#7949)	2018-07-05 19:19:38 +09: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