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

..

admin

Fix broken admin audit log in whitelist mode (#12303)

2019-11-11 00:05:15 +02:00

settings

…

accounts_helper.rb

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

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

application_helper.rb

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

2019-09-13 18:13:43 +02:00

domain_control_helper.rb

Add whitelist mode (#11291)

2019-07-30 11:10:46 +02:00

flashes_helper.rb

…

home_helper.rb

Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)

2019-07-07 16:16:51 +02:00

instance_helper.rb

Change OpenGraph description on sign-up page to reflect invite (#11744)

2019-09-03 04:56:54 +02:00

jsonld_helper.rb

Bump json-ld-preloaded from 3.0.2 to 3.0.3 (#11316)

2019-07-28 13:48:43 +02:00

routing_helper.rb

…

settings_helper.rb

Add kn, mr, ur to available locales (#12379)

2019-11-13 23:36:41 +01:00

statuses_helper.rb

Split AccountsHelper from StatusesHelper (#12078)

2019-10-24 22:50:09 +02:00