| 
								
								
									 Egor Kislitsyn | d3c404af12 | Add MastoFEController | 2019-10-02 20:36:08 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 1c6e1055c8 | Add CustomEmojiController | 2019-10-02 19:16:34 +07:00 |  | 
				
					
						| 
								
								
									 kaniini | 433f2c0f68 | Merge branch 'split-masto-api/instance' into 'develop' Extract instance actions from `MastodonAPIController` to `InstanceController`
See merge request pleroma/pleroma!1760 | 2019-10-02 10:46:14 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | debd0a3066 | Merge branch 'accept-embedded-announce-object' into 'develop' Inline object when Announcing a self-owned private object
See merge request pleroma/pleroma!1769 | 2019-10-02 10:45:55 +00:00 |  | 
				
					
						| 
								
								
									 Thibaut Girka | 86880b9821 | Inline object when Announcing a self-owned private object | 2019-10-02 12:15:06 +02:00 |  | 
				
					
						| 
								
								
									 Thibaut Girka | 3d61efa7c9 | Rename misleading get_announce_visibilitytopublic_announce? | 2019-10-02 10:48:34 +02:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | c8b01f6667 | Extract instance actions from MastodonAPIControllertoInstanceController | 2019-10-02 14:13:52 +07:00 |  | 
				
					
						| 
								
								
									 kaniini | 89ab673d00 | Merge branch 'feature/send-identifier-on-oauth-error' into 'develop' Send an identifier alongside with error message in OAuthController
See merge request pleroma/pleroma!1765 | 2019-10-02 07:04:33 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 8557176808 | Merge branch 'split-masto-api/auth' into 'develop' Extract auth actions from `MastodonAPIController` to `AuthController`
See merge request pleroma/pleroma!1759 | 2019-10-02 07:02:56 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 9b38bf4af4 | Merge branch 'features/private-reblogs' into 'develop' Allow receiving private self-announces over ActivityPub
See merge request pleroma/pleroma!1766 | 2019-10-02 07:02:24 +00:00 |  | 
				
					
						| 
								
								
									 feld | 1255ec888d | Revert "Add upload limits to /api/v1/instance" This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa. | 2019-10-01 22:16:29 +00:00 |  | 
				
					
						| 
								
								
									 Thibaut Girka | 427d0c2a00 | Store private announcements in object.data["announcements"], filter them on display | 2019-10-01 22:39:25 +02:00 |  | 
				
					
						| 
								
								
									 Thibaut Girka | 43e3db0951 | Fix returned visibility of announces in MastodonAPI | 2019-10-01 20:38:29 +02:00 |  | 
				
					
						| 
								
								
									 Thibaut Girka | 4c1f158f5d | Allow users to announce privately, including own private notes | 2019-10-01 20:00:59 +02:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | b2273c695e | Discard identifier, if empty | 2019-10-01 19:43:22 +03:00 |  | 
				
					
						| 
								
								
									 Thibaut Girka | fe538973dd | Ensure self-announces do not widen the audience of the original post | 2019-10-01 18:38:57 +02:00 |  | 
				
					
						| 
								
								
									 KokaKiwi | 1f0be71ea4 | Make activity announceable by its author. | 2019-10-01 17:47:43 +02:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 0f9c2c8b87 | Send an identifier alongside with error message in OAuthController | 2019-10-01 18:10:04 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | af690d1033 | Extract auth actions from MastodonAPIControllertoAuthController | 2019-10-01 15:54:45 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 2dad6dd020 | Extract apps actions from MastodonAPIControllertoAppController | 2019-10-01 15:21:46 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 39695c4436 | Extract suggestions actions from MastodonAPIControllertoSuggestionController | 2019-10-01 15:07:49 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 585bc57edb | Extract media actions from MastodonAPIControllertoMediaController | 2019-10-01 14:36:35 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 36a34c36fe | Extract poll actions from MastodonAPIControllertoPollController | 2019-10-01 11:44:34 +07:00 |  | 
				
					
						| 
								
								
									 lain | dae744478e | Transmogrifier: Handle compact objects in undos. | 2019-09-30 18:13:05 +02:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 0c6009dd2e | Extract mascot actions from MastodonAPIControllerto MascotController | 2019-09-30 19:32:43 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 987e0b8be8 | Move update_credentials to MastodonAPI.AccountController | 2019-09-30 19:10:56 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | c0ce2d5faf | Move account_register, relationships and verify_credentials to MastodonAPI.AccountController | 2019-09-30 19:10:55 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 3c5ecb70b4 | Add PleromaAPI.AccountController | 2019-09-30 19:10:55 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | e7aef27c00 | Fix merge | 2019-09-30 19:10:54 +07:00 |  | 
				
					
						| 
								
								
									 kaniini | 26f66fb70a | Merge branch 'features/apc2s-media-upload' into 'develop' AP C2S mediaUpload
Closes #1171
See merge request pleroma/pleroma!1706 | 2019-09-30 11:21:49 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 0e356cc800 | Merge branch 'split-masto-api/reports' into 'develop' Extract report actions from `MastodonAPIController` to `ReportController`
See merge request pleroma/pleroma!1744 | 2019-09-30 11:17:30 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 74d8fadf37 | Merge branch 'split-masto-api/conversations' into 'develop' Extract conversation actions from `MastodonAPIController` to ConversationController
See merge request pleroma/pleroma!1743 | 2019-09-30 10:49:40 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | b7f27a4f58 | Extract report actions from MastodonAPIControllertoReportControllerUpdate MastodonAPI.ReportView | 2019-09-30 17:44:10 +07:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | 1d7cbdaf7b | change new scrobble endpoint | 2019-09-30 10:39:48 +00:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | e653edd182 | split scrobble functions into their own controller | 2019-09-30 10:39:48 +00:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | a6e1469767 | router: change scrobble timeline route from now-playing to scrobbles | 2019-09-30 10:39:48 +00:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | 8b34b221cb | common api: add some missing IR bits for listen activities' children | 2019-09-30 10:39:48 +00:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | 84712c35f9 | activitypub: object view: include child object for Listen activities | 2019-09-30 10:39:48 +00:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | 71eff09e56 | common api: make sure the generated IR is actually federatable | 2019-09-30 10:39:48 +00:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | 7cad6ea67a | pleroma api: hook up scrobbler controller | 2019-09-30 10:39:17 +00:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | 2c82d8603b | common api: implement scrobbling | 2019-09-30 10:39:17 +00:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | 172c74a77b | activitypub: transmogrifier: implement support for Listen activities | 2019-09-30 10:39:17 +00:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | 1f9de2a8cd | activitypub: implement IR-level considerations for Listen activities | 2019-09-30 10:39:17 +00:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | b7877e9b1c | mastodon api: implement rendering of listen activities | 2019-09-30 10:39:17 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | d4d88b3361 | Extract conversation actions from MastodonAPIControllerto ConversationController | 2019-09-30 16:52:07 +07:00 |  | 
				
					
						| 
								
								
									 rinpatch | e9d1aa75d5 | Revert subscription refactoring. As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10, reversing
changes made toc4fbb56984. | 2019-09-29 18:43:27 +03:00 |  | 
				
					
						| 
								
								
									 kaniini | 6d74a7528c | Merge branch 'feature/follow-requests-count' into 'develop' Mastodon API: add follow_requests_count
See merge request pleroma/pleroma!1726 | 2019-09-29 11:44:31 +00:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 1053319cd6 | Merge branch 'develop' into tests/mastodon_api_controller.ex | 2019-09-28 10:36:04 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 9202904da9 | status_controller.ex: Posting media status without content defined | 2019-09-28 01:53:41 +02:00 |  | 
				
					
						| 
								
								
									 rinpatch | 374f83d29b | Fix not being able to post empty statuses with attachments Attachment field was filled in after the empty status check | 2019-09-28 01:58:06 +03:00 |  |