vt-social/app/javascript/mastodon
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)
2019-09-13 18:13:43 +02:00
..
actions Add timeline read markers API (#11762) 2019-09-06 13:55:51 +02:00
components Fix wrong sum of usage in hashtag component in web UI (#11755) 2019-09-04 10:10:18 +02:00
containers Fix scroll position resetting when opening media modals in web UI (#11815) 2019-09-12 20:14:59 +02:00
features Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
middleware
reducers Add profile directory to web UI (#11688) 2019-08-30 00:14:36 +02:00
selectors Add special alert for throttled requests (#11677) 2019-08-27 16:50:39 +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 confirmation modal when logging out from the web app (#11671) 2019-08-26 18:24:10 +02: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 Add option to disable real-time updates in web UI (#9984) 2019-07-16 16:11:50 +02:00
extra_polyfills.js
initial_state.js Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
is_mobile.js
load_polyfills.js
main.js
performance.js
ready.js
rtl.js Exclude URLs from text analysis (#11759) 2019-09-04 22:30:49 +02:00
scroll.js Use ScrollToOptions for smooth scrolling if supported (#11207) 2019-06-29 18:32:06 +02:00
settings.js
stream.js Improve streaming server security (#10818) 2019-05-24 15:21:42 +02:00
test_setup.js
uuid.js