Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb

2019-06-10 18:59:53 +02:00

..

actions

Improvements to the single column layout (#10835)

2019-05-26 02:55:37 +02:00

components

Put poll options behind content warnings (#10983)

2019-06-08 17:40:59 +02:00

containers

Add confirm modal for unboosting toots (#10287)

2019-05-09 22:39:26 +02:00

features

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

2019-06-10 18:59:53 +02:00

locales

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

2019-06-10 18:59:53 +02:00

middleware

Add missing rejection handling for Promises (#7008)

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

reducers

Fix “mark as sensitive” not being used in delete & redraft (#10980)

2019-06-06 13:04:34 +02:00

selectors

Don't filter own toots (fixes #8289) (#8298)

2018-08-19 18:44:18 +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

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

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

Fix comparing id (#7180)

2018-04-18 16:50:19 +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-05-26 15:41:40 +02:00

is_mobile.js

Restore vanilla components

2017-11-17 19:29:16 -08: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

Restore vanilla components

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

scroll.js

Restore vanilla components

2017-11-17 19:29:16 -08: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