Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								6ef0103ca0 
								
							 
						 
						
							
							
								
								added Emoji struct  
							
							
							
						 
						
							2019-08-31 10:14:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								d8098d142a 
								
							 
						 
						
							
							
								
								added Emoji.Formatter  
							
							
							
						 
						
							2019-08-30 22:04:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								d7808b5db4 
								
							 
						 
						
							
							
								
								added  code\path fields without html tags  in ets  
							
							
							
						 
						
							2019-08-30 07:30:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								37dd3867bb 
								
							 
						 
						
							
							
								
								Log admin/moderator actions  
							
							
							
						 
						
							2019-08-25 19:39:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								efb8818e9e 
								
							 
						 
						
							
							
								
								Activity Expiration: Switch to 'expires_in' system.  
							
							
							
						 
						
							2019-08-24 17:22:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cc6c0b4ba6 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration  
							
							
							
						 
						
							2019-08-24 15:48:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a2b98f6d58 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into pleroma-conversations  
							
							
							
						 
						
							2019-08-08 16:04:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								bdc9a7222c 
								
							 
						 
						
							
							
								
								tests for CommonApi/Utils  
							
							
							
						 
						
							2019-08-05 15:37:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b64b6fee2a 
								
							 
						 
						
							
							
								
								CommonAPI: Replies to conversations also get the correct context id.  
							
							
							
						 
						
							2019-08-05 15:33:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								56b1c3af13 
								
							 
						 
						
							
							
								
								CommonAPI: Extend api with conversation replies.  
							
							
							
						 
						
							2019-08-02 15:05:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								6eb33e7303 
								
							 
						 
						
							
							
								
								test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id  
							
							
							
						 
						
							2019-07-31 18:35:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								5835069215 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !1504  
							
						 
						
							2019-07-29 19:42:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								5795a890e9 
								
							 
						 
						
							
							
								
								markdown: clean up html generated by earmark  
							
							
							
						 
						
							2019-07-29 19:09:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								b93498eb52 
								
							 
						 
						
							
							
								
								constants: add as_public constant and use it everywhere  
							
							
							
						 
						
							2019-07-29 02:43:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mike Verdone 
								
							 
						 
						
							
							
							
							
								
							
							
								36012ef6c1 
								
							 
						 
						
							
							
								
								Require that ephemeral posts live for at least one hour  
							
							... 
							
							
							
							If we didn't put some kind of lifetime requirement on these, I guess you
could annoy people by sending large numbers of ephemeral posts that
provoke notifications but then disappear before anyone can read them. 
							
						 
						
							2019-07-24 14:46:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mike Verdone 
								
							 
						 
						
							
							
							
							
								
							
							
								704960b3c1 
								
							 
						 
						
							
							
								
								Add support for activity expiration to common and Masto API  
							
							... 
							
							
							
							The "expires_at" parameter accepts an ISO8601-formatted date which
defines when the activity will expire.
At this point the API will not give you any feedback about if your post
will expire or not. 
							
						 
						
							2019-07-24 14:45:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6a79bb12c3 
								
							 
						 
						
							
							
								
								Fix function  
							
							
							
						 
						
							2019-07-23 13:53:05 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								fd287387a0 
								
							 
						 
						
							
							
								
								Do not notify subscribers for messages from users which are replies to others  
							
							
							
						 
						
							2019-07-23 13:14:26 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								b74300bc7a 
								
							 
						 
						
							
							
								
								Add more tests for MastodonAPIController and CommonAPI  
							
							
							
						 
						
							2019-07-15 19:47:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								ee5250ae56 
								
							 
						 
						
							
							
								
								Merge branch 'sha512-crypt' into 'develop'  
							
							... 
							
							
							
							detect and use sha512-crypt for stored password hash.
See merge request pleroma/pleroma!1422  
							
						 
						
							2019-07-15 16:13:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								de13c9bb8f 
								
							 
						 
						
							
							
								
								List messages must be visible for mentioned users  
							
							
							
						 
						
							2019-07-15 14:54:40 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								64a946643e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-07-15 14:11:54 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								a87c313309 
								
							 
						 
						
							
							
								
								Support list visibility in StatusView  
							
							
							
						 
						
							2019-07-15 14:00:29 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								dce8ebc9ea 
								
							 
						 
						
							
							
								
								Unfollow should also unsubscribe  
							
							
							
						 
						
							2019-07-14 19:25:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Moonman 
								
							 
						 
						
							
							
							
							
								
							
							
								f98f7ad1b9 
								
							 
						 
						
							
							
								
								detect and use sha512-crypt for stored password hash.  
							
							
							
						 
						
							2019-07-14 09:48:42 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								958fb9aa80 
								
							 
						 
						
							
							
								
								Add "listMessage"  
							
							
							
						 
						
							2019-07-11 16:36:08 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								182f7bbb11 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-07-11 13:26:59 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								5104f65b69 
								
							 
						 
						
							
							
								
								Wrap error messages into gettext helpers  
							
							
							
						 
						
							2019-07-10 18:10:09 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								4c60a562a7 
								
							 
						 
						
							
							
								
								Fix not being able to pin unlisted posts  
							
							... 
							
							
							
							Closes  #1038  
						
							2019-06-29 22:27:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								d53fb55bb7 
								
							 
						 
						
							
							
								
								Return correct response when reply to a direct message is not direct itself  
							
							
							
						 
						
							2019-06-26 10:59:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								c4e4f7d0e4 
								
							 
						 
						
							
							
								
								Add proper error handling for when the post exceeds character limits  
							
							
							
						 
						
							2019-06-18 05:05:05 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e1370ba131 
								
							 
						 
						
							
							
								
								Utils: Use update_follow_state_for_all when appropriate.  
							
							
							
						 
						
							2019-06-05 16:51:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								076c9ae40e 
								
							 
						 
						
							
							
								
								User: Remove superfluous maybe_follow.  
							
							
							
						 
						
							2019-06-05 14:24:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								ddd4a09b72 
								
							 
						 
						
							
							
								
								Fix merge conflict  
							
							
							
						 
						
							2019-06-05 17:55:00 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								cfa5572d28 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-06-05 17:53:15 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								e4babb1c9f 
								
							 
						 
						
							
							
								
								Merge branch 'explicit-addressing' into 'develop'  
							
							... 
							
							
							
							Explicit addressing
See merge request pleroma/pleroma!1239  
							
						 
						
							2019-06-05 08:28:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								6ba9055b51 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-06-05 12:54:30 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								17383861ed 
								
							 
						 
						
							
							
								
								Fix CommonAPI.vote returning tuples inside of the activity array instead of just activities  
							
							
							
						 
						
							2019-06-04 13:38:32 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								9ce928d823 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-06-04 16:28:23 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								80d4d83aac 
								
							 
						 
						
							
							
								
								CommonAPI: Add explicit addressing.  
							
							
							
						 
						
							2019-06-03 18:17:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								2fe3a20638 
								
							 
						 
						
							
							
								
								Make error message about author's inability to vote more sensible  
							
							
							
						 
						
							2019-06-02 23:33:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e3c460353d 
								
							 
						 
						
							
							
								
								Refresh the object in CommonAPI.vote instead of MastoAPI controller  
							
							
							
						 
						
							2019-06-02 23:24:48 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								f333041a0a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists  
							
							
							
						 
						
							2019-05-24 21:05:57 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5f67c26baf 
								
							 
						 
						
							
							
								
								Accept strings in expires_in because sasuga javascript  
							
							
							
						 
						
							2019-05-21 17:30:51 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								a53d062730 
								
							 
						 
						
							
							
								
								Fix posting non-polls from mastofe  
							
							
							
						 
						
							2019-05-21 14:19:03 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								1d90f9b969 
								
							 
						 
						
							
							
								
								Remove tags/mentions/rich text from poll options because Mastodon and  
							
							... 
							
							
							
							add custom emoji 
							
						 
						
							2019-05-19 17:06:44 +03: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