Thibaut Girka 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.		2019-04-10 09:16:08 +02:00
..
actions	Fix glitched out "not found" message for non-existing profiles in web UI (#10517)	2019-04-09 05:02:48 +02:00
components	tinyfix 2: unrequired arguments (#10471)	2019-04-06 12:02:03 +09:00
containers	Add a “Block & Report” button to the block confirmation dialog (#10360)	2019-03-26 17:34:02 +01:00
features	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-10 09:16:08 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-10 09:16:08 +02:00
middleware
reducers	squashed identity proof updates (#10375)	2019-03-28 18:01:09 +01:00
selectors	Don't filter own toots (fixes #8289) (#8298)	2018-08-19 18:44:18 +02:00
service_worker	Support pushing and receiving updates to poll tallies (#10209)	2019-03-11 00:49:31 +01:00
storage
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	Do not set CSRF Token when no csrf header (#10383)	2019-03-26 11:13:20 +01:00
base_polyfills.js
common.js	Improve the public hashtag page (#9831)	2019-01-17 14:06:08 +01:00
compare_id.js
extra_polyfills.js
initial_state.js	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
is_mobile.js
load_polyfills.js
main.js
performance.js
ready.js
rtl.js
scroll.js
settings.js
stream.js	Fix public timelines being broken by new toots when they are not mounted (#10131)	2019-03-07 22:17:52 +01:00
test_setup.js
uuid.js