Thibaut Girka 1682ac5717 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/following_accounts_controller.rb
  Conflicts were due to glitch-soc's theming system.
- app/javascript/packs/public.js
  Some code has been change upstream, but it has been
  moved to app/javascript/core/settings.js in glitch-soc.
  Applied the changes there.

2019-04-04 14:53:52 +02:00

..

actions

Fix search in web UI not setting a limit, restore limit of 5 (#10421)

2019-03-30 00:43:38 +01:00

components

Update poll remaining time just like with status timestamps (#10466)

2019-04-03 18:16:55 +02:00

containers

Add a “Block & Report” button to the block confirmation dialog (#10360)

2019-03-26 17:34:02 +01:00

features

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

2019-04-01 21:28:31 +02:00

locales

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

2019-04-04 14:53:52 +02:00

middleware

Add missing rejection handling for Promises (#7008)

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

reducers

squashed identity proof updates (#10375)

2019-03-28 18:01:09 +01: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-01-10 21:00:30 +01: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

Fix public timelines being broken by new toots when they are not mounted (#10131)

2019-03-07 22:17:52 +01: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