You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml		6 years ago
..
actions	Fix search in web UI not setting a limit, restore limit of 5 (#10421)	6 years ago
components	Add a “Block & Report” button to the block confirmation dialog (#10360)	6 years ago
containers	Add a “Block & Report” button to the block confirmation dialog (#10360)	6 years ago
features	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
middleware	…
reducers	squashed identity proof updates (#10375)	6 years ago
selectors	…
service_worker	Support pushing and receiving updates to poll tallies (#10209)	6 years ago
storage	…
store	…
utils	…
api.js	Do not set CSRF Token when no csrf header (#10383)	6 years ago
base_polyfills.js	…
common.js	…
compare_id.js	…
extra_polyfills.js	…
initial_state.js	…
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)	6 years ago
test_setup.js	…
uuid.js	…