rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f60d072bbb 
								
							 
						 
						
							
							
								
								Add pleroma.in_reply_to_account_acct to MastoAPI status entity  
							
							
							
						 
						
							2019-04-22 11:54:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								88f0be9693 
								
							 
						 
						
							
							
								
								Feature/826 healthcheck endpoint  
							
							
							
						 
						
							2019-04-22 07:19:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								e8c2f9a73a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/disable-account  
							
							
							
						 
						
							2019-04-22 13:08:30 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d086319733 
								
							 
						 
						
							
							
								
								differences_in_mastoapi_responses.md: content_type parameter of post submission  
							
							
							
						 
						
							2019-04-21 12:48:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								1aa4994f6d 
								
							 
						 
						
							
							
								
								Do not require authentication for user search in MastoAPI  
							
							
							
						 
						
							2019-04-18 12:44:25 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								38926a063a 
								
							 
						 
						
							
							
								
								add /api/pleroma/disable_account to docs/api/pleroma_api.md  
							
							
							
						 
						
							2019-04-15 16:39:42 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								e5d553aa45 
								
							 
						 
						
							
							
								
								Merge branch 'feature/767-multiple-use-invite-token' into 'develop'  
							
							... 
							
							
							
							Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032  
							
						 
						
							2019-04-10 10:10:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sadposter 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								be8350baa2 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/user-status-subscriptions  
							
							
							
						 
						
							2019-04-10 10:44:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								c8440b5e0c 
								
							 
						 
						
							
							
								
								Merge branch 'fix/emoji-api-nonsense' into 'develop'  
							
							... 
							
							
							
							Change response format of /api/pleroma/emoji so it makes sense
See merge request pleroma/pleroma!1038  
							
						 
						
							2019-04-10 06:22:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								97395e013e 
								
							 
						 
						
							
							
								
								Merge branch 'notification-pleroma-settings' into 'develop'  
							
							... 
							
							
							
							Notification controls
Closes  #738 
See merge request pleroma/pleroma!988  
							
						 
						
							2019-04-10 02:10:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								b57b43027c 
								
							 
						 
						
							
							
								
								Change response format of /api/pleroma/emoji to the one that actually makes sense  
							
							
							
						 
						
							2019-04-09 23:20:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								012bb5dcc9 
								
							 
						 
						
							
							
								
								renaming expire_at -> expires_at  
							
							... 
							
							
							
							keyword style change 
							
						 
						
							2019-04-08 16:01:28 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								b810aac117 
								
							 
						 
						
							
							
								
								added docs to docs/api/admin_api.md  
							
							... 
							
							
							
							code style and little renamings 
							
						 
						
							2019-04-07 19:48:52 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sadposter 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e6778003ab 
								
							 
						 
						
							
							
								
								JSON need quotes!  
							
							
							
						 
						
							2019-04-06 16:24:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sadposter 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c05fe4da0a 
								
							 
						 
						
							
							
								
								Document subscription endpoints, fix typos  
							
							... 
							
							
							
							Also adds a quick error case on the subscription endpoints
to avoid 500s 
							
						 
						
							2019-04-06 16:20:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								da64a5aece 
								
							 
						 
						
							
							
								
								Document the admin API endpoints for controlling follow/unfollow  
							
							
							
						 
						
							2019-04-05 11:29:34 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								79cb34a4b0 
								
							 
						 
						
							
							
								
								Fix preview not being usable in form data  
							
							
							
						 
						
							2019-04-02 23:07:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								fdb4357e9b 
								
							 
						 
						
							
							
								
								Rename fake param to preview and make the tests check that the object was not inserted to the db  
							
							
							
						 
						
							2019-04-02 14:31:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								42b779527c 
								
							 
						 
						
							
							
								
								document fake option  
							
							
							
						 
						
							2019-03-29 22:15:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								749d53e2b2 
								
							 
						 
						
							
							
								
								Merge branch 'sayonara-gitlab-wiki' into 'develop'  
							
							... 
							
							
							
							Move out of Gitlab Wiki
See merge request pleroma/pleroma!990  
							
						 
						
							2019-03-29 10:24:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								9bd80e6044 
								
							 
						 
						
							
							
								
								did it really take me 4 commits to fix this?  
							
							
							
						 
						
							2019-03-28 20:27:01 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d16e2a2e04 
								
							 
						 
						
							
							
								
								Remove duplicated header from admin_api.md  
							
							
							
						 
						
							2019-03-28 20:16:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								dfae0050af 
								
							 
						 
						
							
							
								
								Move out of Gitlab Wiki  
							
							... 
							
							
							
							I understand that this change is quite unreadable and hard to review, sorry for forgetting to do atomic commits. This patch does not change too much content wise, it just
* Gets everything from gitlab wiki
* Removes some specific gitlab hacks
* Formats all documentation file names to be in snake case so they look the same way as our code does 
							
						 
						
							2019-03-28 19:46:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								4a6855d9ee 
								
							 
						 
						
							
							
								
								Provide plaintext representations of content/cw in MastoAPI  
							
							
							
						 
						
							2017-01-01 03:10:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								23067908de 
								
							 
						 
						
							
							
								
								Merge branch 'feature/770-add-emoji-tags' into 'develop'  
							
							... 
							
							
							
							Feature/770 add emoji tags
See merge request pleroma/pleroma!998  
							
						 
						
							2019-04-08 09:50:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								9aeac7dcca 
								
							 
						 
						
							
							
								
								Merge branch 'feature/prometheus' into 'develop'  
							
							... 
							
							
							
							Upstream: Metrics and debugging
See merge request pleroma/pleroma!1020  
							
						 
						
							2019-04-06 14:51:46 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								7410aee886 
								
							 
						 
						
							
							
								
								Merge develop to 770-add-emoji-tags  
							
							... 
							
							
							
							Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs 
							
						 
						
							2019-04-06 20:34:00 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								5564cd421d 
								
							 
						 
						
							
							
								
								Document Prometheus  
							
							
							
						 
						
							2019-04-04 12:19:31 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								3601f03147 
								
							 
						 
						
							
							
								
								Adding tag to emoji ets table  
							
							... 
							
							
							
							changes in apis 
							
						 
						
							2019-04-01 17:17:57 +07:00