Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								d53fb55bb7
								
							
						 | 
						
							
							
								
								Return correct response when reply to a direct message is not direct itself
							
							
							
							
							
						 | 
						
							2019-06-26 10:59:27 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								4ad15ad2a9
								
							
						 | 
						
							
							
								
								add ignore hosts and TLDs for rich_media
							
							
							
							
							
						 | 
						
							2019-06-25 22:25:37 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								c7acca2abb
								
							
						 | 
						
							
							
								
								Mastodon API: Sanitize display names
							
							
							
							
							
							
							
							Closes #1000 
							
						 | 
						
							2019-06-18 14:12:11 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								a440cf856d
								
							
						 | 
						
							
							
								
								Mastodon API: Return the token needed for the chat.
							
							
							
							
							
						 | 
						
							2019-06-15 10:59:35 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								62ffc00a5d
								
							
						 | 
						
							
							
								
								Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'
							
							
							
							
							
							
							
							AccountView: Add user background.
See merge request pleroma/pleroma!1280 
							
						 | 
						
							2019-06-14 16:49:28 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								ee4ed87fb4
								
							
						 | 
						
							
							
								
								[#948] /api/v1/account_search added optional parameters (limit, offset, following)
							
							
							
							
							
						 | 
						
							2019-06-14 11:39:57 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								eac298083f
								
							
						 | 
						
							
							
								
								MastodonAPI: Add a way to update the background image.
							
							
							
							
							
						 | 
						
							2019-06-14 11:19:22 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								5965efb216
								
							
						 | 
						
							
							
								
								AccountView: Add user background.
							
							
							
							
							
						 | 
						
							2019-06-13 19:08:05 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								63ab3c30eb
								
							
						 | 
						
							
							
								
								Merge branch 'feature/rate-limiter' into 'develop'
							
							
							
							
							
							
							
							Feature/Rate Limiter
Closes #943
See merge request pleroma/pleroma!1266 
							
						 | 
						
							2019-06-11 11:32:01 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad04d12de6
								
							
						 | 
						
							
							
								
								Replace MastodonAPIController.account_register/2 rate limiter
							
							
							
							
							
						 | 
						
							2019-06-11 16:06:03 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								365268d522
								
							
						 | 
						
							
							
								
								Add more tests for using media_proxy and whitelists
							
							
							
							
							
						 | 
						
							2019-06-10 11:34:11 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								7e9f7ea0c2
								
							
						 | 
						
							
							
								
								MastodonAPI: Add test for user search.
							
							
							
							
							
						 | 
						
							2019-06-06 16:16:22 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								5b04f07a1e
								
							
						 | 
						
							
							
								
								Limit search for unauthenticated users to local users only
							
							
							
							
							
						 | 
						
							2019-06-05 16:51:04 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								4f2e359687
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into issue/941
							
							
							
							
							
						 | 
						
							2019-06-04 09:49:08 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								9d2563a3de
								
							
						 | 
						
							
							
								
								Merge branch 'generic-fe-settings' into 'develop'
							
							
							
							
							
							
							
							Generic settings store for frontend user settings
See merge request pleroma/pleroma!1221 
							
						 | 
						
							2019-06-04 05:43:43 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								64ada7f960
								
							
						 | 
						
							
							
								
								fix tests
							
							
							
							
							
						 | 
						
							2019-06-03 22:51:14 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								f13d6c7f78
								
							
						 | 
						
							
							
								
								update api to set skip_thread_containment
							
							
							
							
							
						 | 
						
							2019-06-03 21:02:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								dc91bcc0af
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/polls-2-electric-boogalo
							
							
							
							
							
						 | 
						
							2019-06-03 13:16:17 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								314758c25b
								
							
						 | 
						
							
							
								
								Merge branch 'align-mastodon-conversations' into 'develop'
							
							
							
							
							
							
							
							Mastodon Conversations API: Align to Mastodon behavior
See merge request pleroma/pleroma!1215 
							
						 | 
						
							2019-06-03 09:48:37 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								026b245dbc
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/polls-2-electric-boogalo
							
							
							
							
							
						 | 
						
							2019-06-03 11:14:52 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								2fe3a20638
								
							
						 | 
						
							
							
								
								Make error message about author's inability to vote more sensible
							
							
							
							
							
						 | 
						
							2019-06-02 23:33:15 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								c47da0e65d
								
							
						 | 
						
							
							
								
								Add tests for poll view
							
							
							
							
							
						 | 
						
							2019-06-02 23:25:33 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								5402d04e3c
								
							
						 | 
						
							
							
								
								Merge branch 'feature/notification-control-part-2' into 'develop'
							
							
							
							
							
							
							
							notification controls, part 2
See merge request pleroma/pleroma!1204 
							
						 | 
						
							2019-06-02 08:25:37 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								cfa588e357
								
							
						 | 
						
							
							
								
								Fix Credo issues
							
							
							
							
							
						 | 
						
							2019-06-01 21:42:29 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								65db5e9f52
								
							
						 | 
						
							
							
								
								Resolve merge conflicts
							
							
							
							
							
						 | 
						
							2019-06-01 16:29:58 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								300d94c628
								
							
						 | 
						
							
							
								
								Add poll votes
							
							
							
							
							
							
							
							Also in this commit by accident:
- Fix query ordering causing exclude_poll_votes to not work
- Do not create notifications for Answer objects 
							
						 | 
						
							2019-06-01 16:17:46 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								5d3ece2861
								
							
						 | 
						
							
							
								
								Remove now useless flavours switching
							
							
							
							
							
						 | 
						
							2019-06-01 01:44:10 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								7861974ab2
								
							
						 | 
						
							
							
								
								MastodonAPI: Add extension to set and get pleroma_settings_store.
							
							
							
							
							
						 | 
						
							2019-05-31 14:50:18 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								aaad85c4d9
								
							
						 | 
						
							
							
								
								AccountView: settings -> settings_store
							
							
							
							
							
						 | 
						
							2019-05-31 14:49:46 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								eb2963bc43
								
							
						 | 
						
							
							
								
								User: Add settings store to Info, AccountView
							
							
							
							
							
							
							
							This is to provide a generic frontend settings storage mechanism for all kinds
of frontends. 
							
						 | 
						
							2019-05-31 14:27:15 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								97fb50d9fa
								
							
						 | 
						
							
							
								
								Mastodon Conversation API: Don't return own account in 'accounts'.
							
							
							
							
							
						 | 
						
							2019-05-31 11:27:14 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								1690be991e
								
							
						 | 
						
							
							
								
								Replace missing non-nullable Card attributes with empty strings
							
							
							
							
							
						 | 
						
							2019-05-30 21:03:31 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								45e4642a58
								
							
						 | 
						
							
							
								
								tests: chase remote/local removal
							
							
							
							
							
						 | 
						
							2019-05-26 00:20:54 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								1542cccbbc
								
							
						 | 
						
							
							
								
								tests: chase notification setting changes
							
							
							
							
							
						 | 
						
							2019-05-25 05:22:13 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								cdac5efd10
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/account_view_source.note' into 'develop'
							
							
							
							
							
							
							
							MastoAPI AccountView: fill source.note with plaintext version of note
Closes #926
See merge request pleroma/pleroma!1189 
							
						 | 
						
							2019-05-22 05:39:01 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								0e2c215a00
								
							
						 | 
						
							
							
								
								MastoAPI AccountView: fill source.note with plaintext version of note
							
							
							
							
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/issues/926 
							
						 | 
						
							2019-05-22 07:22:19 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								63b0b7190c
								
							
						 | 
						
							
							
								
								MastoAPI: Add GET /api/v1/polls/:id
							
							
							
							
							
						 | 
						
							2019-05-21 20:40:35 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								0407ffe75f
								
							
						 | 
						
							
							
								
								Change validation error status codes to be more appropriate
							
							
							
							
							
						 | 
						
							2019-05-21 17:12:38 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								3f96b3e4b8
								
							
						 | 
						
							
							
								
								Enforce poll limits and add error handling for MastodonAPI's post endpoint
							
							
							
							
							
						 | 
						
							2019-05-21 10:54:20 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								76a7429bef
								
							
						 | 
						
							
							
								
								Add poll limits to /api/v1/instance and initial state
							
							
							
							
							
						 | 
						
							2019-05-21 09:13:10 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sadposter
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								dc916ba15f
								
							
						 | 
						
							
							
								
								Format mascot tests
							
							
							
							
							
						 | 
						
							2019-05-20 12:58:17 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sadposter
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e81f0fc6d4
								
							
						 | 
						
							
							
								
								Add mascot get/set tests
							
							
							
							
							
						 | 
						
							2019-05-20 12:58:06 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								5ece901af3
								
							
						 | 
						
							
							
								
								Resolve merge conflicts and remove IO.inspects
							
							
							
							
							
						 | 
						
							2019-05-18 13:37:38 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								fd920c8973
								
							
						 | 
						
							
							
								
								Mastodon API: Add support for posting polls
							
							
							
							
							
						 | 
						
							2019-05-18 13:29:28 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								7ed682213f
								
							
						 | 
						
							
							
								
								Fix/902 random compile failing
							
							
							
							
							
						 | 
						
							2019-05-17 07:25:20 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								e2b3a27204
								
							
						 | 
						
							
							
								
								Add Reports to Admin API
							
							
							
							
							
						 | 
						
							2019-05-16 19:09:18 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Aaron Tinio
								
							 
						 | 
						
							
							
							
							
								
							
							
								70c81b95d0
								
							
						 | 
						
							
							
								
								Pipe requests to public endpoints through EnsurePublicOrAuthenticatedPlug
							
							
							
							
							
						 | 
						
							2019-05-15 05:09:32 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								a2be420f94
								
							
						 | 
						
							
							
								
								differences_in_mastoapi_responses.md: fullname & bio are optionnal
							
							
							
							
							
							
							
							[ci skip] 
							
						 | 
						
							2019-05-13 18:35:45 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sachin Joshi
								
							 
						 | 
						
							
							
							
							
								
							
							
								7701a4c841
								
							
						 | 
						
							
							
								
								Make irreversible field default to false in filters
							
							
							
							
							
						 | 
						
							2019-05-14 00:13:15 +05:45 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								3a7c14645e
								
							
						 | 
						
							
							
								
								- Actually use preloaded bookmarks in views
							
							
							
							
							
							
							
							- Preload bookmarks in bookmark timeline
- Rework bookmark preload tests 
							
						 | 
						
							2019-05-07 19:33:22 +00:00 | 
						
						
							
							
							
								
							
							
						 |