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

Conflicts:
- README.md
  discarded upstream changes
- app/controllers/api/v1/bookmarks_controller.rb
  finally merged upstream, some code style fixes
  and slightly changed pagination code
- app/controllers/application_controller.rb
  changed upstream to always return HTML error pages
  slight conflict caused by theming code
- app/models/bookmark.rb
  finally merged upstream, no real conflict
- spec/controllers/api/v1/bookmarks_controller_spec.rb
  finally merged upstream, slightly changed pagination code

2019-11-20 15:36:09 +01:00

..

actions

Add bookmarks (#7107)

2019-11-13 23:02:10 +01:00

components

Add relationship-based options to status dropdowns (#12377)

2019-11-19 21:24:16 +01:00

containers

Fix account dropdown not opening due to regression from #12377 (#12430)

2019-11-20 00:56:22 +01:00

features

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

2019-11-20 15:36:09 +01:00

locales

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

2019-11-20 15:36:09 +01:00

middleware

…

reducers

Add bookmarks (#7107)

2019-11-13 23:02:10 +01:00

selectors

Add special alert for throttled requests (#11677)

2019-08-27 16:50:39 +02:00

service_worker

…

storage

…

store

…

utils

Do not add margin light when opening modal on mobile (#11830)

2019-09-29 14:30:58 +02:00

api.js

…

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_keyboard_extensions.js

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

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

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

…