Thibaut Girka ab5f450700 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields		2018-06-21 20:49:57 +02:00
..
accounts	Allow selecting default posting language instead of auto-detect (#7828)	2018-06-17 18:57:31 +02:00
apps
instances
lists	Fix unpermitted parameters warning when generating pagination URLs (#6995)	2018-04-02 02:09:50 +02:00
push	Fix 404 for GET /api/v1/push/subscription (#7472)	2018-05-13 21:45:18 +02:00
statuses	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
timelines	optimize direct timeline (#7614)	2018-05-28 11:04:06 +02:00
accounts_controller.rb	Return HTTP 410 for suspended accounts in GET /api/v1/accounts/:id (#7287)	2018-04-30 09:12:36 +02:00
apps_controller.rb
blocks_controller.rb	Fix unpermitted parameters warning when generating pagination URLs (#6995)	2018-04-02 02:09:50 +02:00
bookmarks_controller.rb	Add backend support for bookmarks	2018-04-11 20:40:29 +02:00
custom_emojis_controller.rb
domain_blocks_controller.rb	Fix domain hiding logic (#7765)	2018-06-09 22:46:54 +02:00
favourites_controller.rb	Fix unpermitted parameters warning when generating pagination URLs (#6995)	2018-04-02 02:09:50 +02:00
follow_requests_controller.rb	Fix unpermitted parameters warning when generating pagination URLs (#6995)	2018-04-02 02:09:50 +02:00
follows_controller.rb
instances_controller.rb
lists_controller.rb
media_controller.rb
mutes_controller.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-01 20:24:50 -05:00
notifications_controller.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-01 20:24:50 -05:00
reports_controller.rb
search_controller.rb
statuses_controller.rb	Remove small pagination limit from context API (#7564)	2018-05-21 12:43:05 +02:00
streaming_controller.rb