Thibaut Girka 83774367d2 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`
  conflict because of the poll option limit being different than upstream's

2019-11-07 13:43:56 +01:00

..

actions

Fix WebUI allowing to upload more items than the limit (#12300)

2019-11-07 09:07:03 +02:00

components

Use inert polyfill (#12209)

2019-11-04 13:03:44 +01: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-11-07 13:43:56 +01:00

locales

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

2019-11-06 14:38:28 +01:00

middleware

Add missing rejection handling for Promises (#7008)

2018-04-02 14:51:02 +02:00

reducers

Fix WebUI allowing to upload more items than the limit (#12300)

2019-11-07 09:07:03 +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

Cache media only when storage can be freed (#7547)

2018-05-19 19:22:11 +02:00

store

Update dependencies for Node.js (2018-12-31) (#9669)

2018-12-31 18:11:48 +01:00

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

Refactor resizeImage method (#7236)

2018-04-23 09:15:51 +02:00

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

Restore vanilla components

2017-11-17 19:29:16 -08:00

initial_state.js

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

2019-10-27 12:14:01 +01:00

is_mobile.js

Restore vanilla components

2017-11-17 19:29:16 -08:00

load_keyboard_extensions.js

fix: support KaiOS arrow navigation on public pages (#12251)

2019-11-04 13:03:09 +01:00

load_polyfills.js

Refactor resizeImage method (#7236)

2018-04-23 09:15:51 +02:00

main.js

bug fix (WebPush does not work) (#6120)

2017-12-28 16:20:34 +01:00

performance.js

Restore vanilla components

2017-11-17 19:29:16 -08:00

ready.js

Restore vanilla components

2017-11-17 19:29:16 -08:00

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

Implement tag auto-completion by history (#6621)

2018-03-04 20:27:25 +01:00

stream.js

Improve streaming server security (#10818)

2019-05-24 15:21:42 +02:00

test_setup.js

Restore vanilla components

2017-11-17 19:29:16 -08:00

uuid.js

Restore vanilla components

2017-11-17 19:29:16 -08:00