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 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - app/controllers/api/v1/search_controller.rb Conflict because we changed the number of default results to be configurable - app/lib/settings/scoped_settings.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) - spec/controllers/application_controller_spec.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme)		5 years ago
..
actions	Add timeline read markers API (#11762)	5 years ago
components	Fix wrong sum of usage in hashtag component in web UI (#11755)	5 years ago
containers	Fix scroll position resetting when opening media modals in web UI (#11815)	5 years ago
features	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
middleware	…
reducers	Add profile directory to web UI (#11688)	5 years ago
selectors	Add special alert for throttled requests (#11677)	5 years ago
service_worker	…
storage	…
store	…
utils	Add confirmation modal when logging out from the web app (#11671)	5 years ago
api.js	…
base_polyfills.js	…
common.js	…
compare_id.js	…
extra_polyfills.js	…
initial_state.js	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
is_mobile.js	…
load_polyfills.js	…
main.js	…
performance.js	…
ready.js	…
rtl.js	Exclude URLs from text analysis (#11759)	5 years ago
scroll.js	…
settings.js	…
stream.js	…
test_setup.js	…
uuid.js	…