tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
cbd75fe1284f67c941967f20ab9fef508ed70e1c
Mastodon/app/controllers/api/v1
History
Thibaut Girka 24968d20a0 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock
2019-07-30 12:22:33 +02:00
..
accounts
Improve blocked view of profiles (#10491)
2019-04-07 04:59:13 +02:00
admin
Add moderation API (#9387)
2019-06-20 02:52:34 +02:00
apps
Add vapid_key to the application entity in the REST API (#10058)
2019-02-16 05:27:05 +01:00
instances
Add whitelist mode (#11291)
2019-07-30 11:10:46 +02:00
lists
…
polls
Add polls (#10111)
2019-03-03 22:18:23 +01:00
push
Fix web push notifications for polls (#10864)
2019-05-28 00:26:08 +02:00
statuses
Merge branch 'master' into glitch-soc/merge-upstream
2019-04-08 15:57:56 +02:00
timelines
Remove deprecated REST API GET /api/v1/timelines/direct (#11212)
2019-07-05 02:14:56 +02:00
accounts_controller.rb
Add whitelist mode (#11291)
2019-07-30 11:10:46 +02:00
apps_controller.rb
Add whitelist mode (#11291)
2019-07-30 11:10:46 +02:00
blocks_controller.rb
…
bookmarks_controller.rb
…
conversations_controller.rb
…
custom_emojis_controller.rb
Add (back) rails-level JSON caching (#11333)
2019-07-21 22:32:16 +02:00
domain_blocks_controller.rb
…
endorsements_controller.rb
…
favourites_controller.rb
…
filters_controller.rb
…
follow_requests_controller.rb
…
instances_controller.rb
Add whitelist mode (#11291)
2019-07-30 11:10:46 +02:00
lists_controller.rb
…
media_controller.rb
…
mutes_controller.rb
…
notifications_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-23 19:01:30 +02:00
polls_controller.rb
Fix poll API not requiring authentication on non-public polls (#10960)
2019-06-04 20:10:26 +02:00
preferences_controller.rb
Add a preferences API so apps can share basic behaviours (#10109)
2019-03-15 02:39:20 +01:00
reports_controller.rb
…
scheduled_statuses_controller.rb
Add scheduled statuses (#9706)
2019-01-05 12:43:28 +01:00
search_controller.rb
Add env variable to control search limit
2019-07-20 16:39:48 +02:00
statuses_controller.rb
Merge commit 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream
2019-07-07 13:49:31 +02:00
streaming_controller.rb
…
suggestions_controller.rb
…