fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-15 03:15:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/controllers/api/v1
History
Thibaut Girka e5a603206d Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/controllers/accounts_controller.rb
	app/javascript/mastodon/locales/pl.json
	app/views/about/more.html.haml

Conflicts in `accounts_controller.rb` resolved by taking upstream's
version + our `use_pack`.

Conflicts in `pl.json` resolved by taking upstream's changes.

Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.
2018-08-10 16:22:31 +02:00
..
accounts Public profile endorsements (accounts picked by profile owner) (#8146) 2018-08-09 09:56:53 +02:00
apps Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112) 2017-09-30 22:05:42 +02:00
instances Represent numbers by strings in instance activity API (#6198) 2018-01-05 22:38:33 +01:00
lists Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
push Fix 404 for GET /api/v1/push/subscription (#7472) 2018-05-13 21:45:18 +02:00
statuses Introduce OAuth scopes for bookmarks 2018-08-10 15:26:52 +02:00
timelines Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
accounts_controller.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
apps_controller.rb Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112) 2017-09-30 22:05:42 +02:00
blocks_controller.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
bookmarks_controller.rb Introduce OAuth scopes for bookmarks 2018-08-10 15:26:52 +02:00
custom_emojis_controller.rb Improve admin UI for custom emojis, add copy/disable/enable (#5231) 2017-10-05 23:42:05 +02:00
domain_blocks_controller.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
favourites_controller.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
filters_controller.rb Add option to not consider word boundaries when processing keyword filtering (#7975) 2018-07-09 02:22:09 +02:00
follow_requests_controller.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
follows_controller.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
instances_controller.rb Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090) 2017-07-07 04:02:06 +02:00
lists_controller.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
media_controller.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
mutes_controller.rb Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
notifications_controller.rb Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
reports_controller.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
search_controller.rb Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
statuses_controller.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
streaming_controller.rb Clean up for api/base controller (#3629) 2017-06-07 20:09:25 +02:00
suggestions_controller.rb Add API method to remove a suggestion (#7978) 2018-07-07 21:09:54 +02:00