1
0
puyopuyotetr.is/app/javascript/mastodon
Thibaut Girka 41a98b6543 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- README.md
- app/helpers/statuses_helper.rb
  Upstream moved account helpers to their own file, we had extra
  helpers there, moved too.
- app/lib/sanitize_config.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- config/locales/simple_form.en.yml
- spec/lib/sanitize_config_spec.rb
2019-10-27 12:14:01 +01:00
..
actions Fix performance of home feed regeneration (#12084) 2019-10-06 22:11:17 +02:00
components Add setting for whether to crop images in unexpanded toots (#12126) 2019-10-24 22:51:41 +02:00
containers Add explanation to mute dialog, refactor and clean up mute/block UI (#11992) 2019-09-29 21:46:05 +02:00
features Merge branch 'master' into glitch-soc/merge-upstream 2019-10-27 12:14:01 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2019-10-27 12:14:01 +01:00
middleware
reducers Unliking a post updates like count on front end (#12140) 2019-10-24 22:49:45 +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
utils Do not add margin light when opening modal on mobile (#11830) 2019-09-29 14:30:58 +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
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-10-27 12:14:01 +01: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