Thibaut Girka 444796b69b Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb

2019-07-23 10:51:07 +02:00

..

actions

Display custom emoji in bio field names (#11350)

2019-07-21 03:40:27 +02:00

components

Play animated custom emoji on hover (#11348)

2019-07-21 18:10:40 +02:00

containers

Fix boost to original audience not working on mobile (#11371)

2019-07-21 18:11:09 +02:00

features

Merge branch 'master' into glitch-soc/merge-upstream

2019-07-23 10:51:07 +02:00

locales

Merge branch 'master' into glitch-soc/merge-upstream

2019-07-19 18:26:49 +02:00

middleware

…

reducers

Add option to disable real-time updates in web UI (#9984)

2019-07-16 16:11:50 +02:00

selectors

Optimize makeGetStatus (#11211)

2019-06-30 00:12:38 +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

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

Add option to disable real-time updates in web UI (#9984)

2019-07-16 16:11:50 +02:00

is_mobile.js

…

load_polyfills.js

…

main.js

…

performance.js

…

ready.js

…

rtl.js

…

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

…