Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								d9f40b05b3 
								
							 
						 
						
							
							
								
								Added get_stripped_html_for_object. Renamed a few things  
							
							
							
						 
						
							2018-12-30 16:51:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								bce152aba0 
								
							 
						 
						
							
							
								
								Tidy up the code. Rename key to signature  
							
							
							
						 
						
							2018-12-30 15:58:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								66d1c31461 
								
							 
						 
						
							
							
								
								Fix some stupid typos  
							
							
							
						 
						
							2018-12-30 13:51:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								a32e23905a 
								
							 
						 
						
							
							
								
								Use Object.change instead of Ecto.Changeset.change  
							
							
							
						 
						
							2018-12-30 11:08:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								9a0163db53 
								
							 
						 
						
							
							
								
								use Kernel.put_in instead of Map.merge  
							
							
							
						 
						
							2018-12-29 21:50:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rin Toshaka 
								
							 
						 
						
							
							
							
							
								
							
							
								19f9889fbe 
								
							 
						 
						
							
							
								
								I am not sure what's going on anymore so I'll just commit and reset all the other files to HEAD  
							
							
							
						 
						
							2018-12-29 17:45:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2791ce9a1f 
								
							 
						 
						
							
							
								
								add license boilerplate to pleroma core  
							
							
							
						 
						
							2018-12-23 20:56:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								baead4ea4b 
								
							 
						 
						
							
							
								
								fix markdown formatting  
							
							
							
						 
						
							2018-12-14 16:03:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								1ca080c862 
								
							 
						 
						
							
							
								
								Prevent accidental double RTs or favorites  
							
							
							
						 
						
							2018-12-14 07:56:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								89b3729afa 
								
							 
						 
						
							
							
								
								fix warnings  
							
							
							
						 
						
							2018-12-12 09:09:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								074fa790ba 
								
							 
						 
						
							
							
								
								fix compile warnings  
							
							
							
						 
						
							2018-12-09 20:50:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0896cf4c0f 
								
							 
						 
						
							
							
								
								Fix most mastodon api bugs.  
							
							
							
						 
						
							2018-11-20 20:12:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6f0b9a5163 
								
							 
						 
						
							
							
								
								Fix Notification tests.  
							
							
							
						 
						
							2018-11-20 19:15:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								4e93d6ae14 
								
							 
						 
						
							
							
								
								common api: utils: flip to/cc for mentions  
							
							
							
						 
						
							2018-11-08 19:17:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5bb88fd174 
								
							 
						 
						
							
							
								
								Runtime configuration  
							
							... 
							
							
							
							Related to #85 
Everything should now be configured at runtime, with the exception of
the `Pleroma.HTML` scrubbers (the scrubbers used can be
changed at runtime, but their configuration is compile-time) because
it's building a module with a macro. 
							
						 
						
							2018-11-06 19:41:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								45ebc8dd9a 
								
							 
						 
						
							
							
								
								Check for empty string in_reply_to ids.  
							
							
							
						 
						
							2018-11-02 17:33:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2bf358d7b4 
								
							 
						 
						
							
							
								
								activitypub: use Object.delete() instead of mutating the database and cache directly  
							
							
							
						 
						
							2018-11-01 07:29:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								558e6a84d6 
								
							 
						 
						
							
							
								
								[Pleroma.Web.CommonAPI]: Delete post cache entry when it’s deleted  
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/issues/346  
							
						 
						
							2018-11-01 06:52:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								47f76bf4b1 
								
							 
						 
						
							
							
								
								common api: allow self-liking objects  
							
							... 
							
							
							
							mastodon allows this, for whatever reason.
closes  #347 . 
							
						 
						
							2018-10-31 22:29:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f407831120 
								
							 
						 
						
							
							
								
								common api: prefer formatting attachments using the attachment's name instead of URI  
							
							
							
						 
						
							2018-10-29 17:59:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								784b3a615d 
								
							 
						 
						
							
							
								
								utils: fix another possible leak with private S3 backends using mediaproxy  
							
							... 
							
							
							
							same rationale as the other mediaproxy changes 
							
						 
						
							2018-10-29 17:26:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								30efa86c05 
								
							 
						 
						
							
							
								
								common api: enable tag linking in markdown mode  
							
							
							
						 
						
							2018-10-14 20:36:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								111841ad34 
								
							 
						 
						
							
							
								
								common api: take the combination of the subject and content for length limit enforcement  
							
							... 
							
							
							
							closes  #315  
						
							2018-10-10 07:53:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								285ac80c36 
								
							 
						 
						
							
							
								
								config: allow for accepted post formats to be configured  
							
							
							
						 
						
							2018-10-05 21:02:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								b1be9415ef 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'revert-a26d5e6b' into 'develop'"  
							
							... 
							
							
							
							This reverts commit d31bbb1cfe340ab3cb90 
							
						 
						
							2018-10-05 20:49:34 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								58539e1357 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'feature/rich-text' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !309  
							
						 
						
							2018-08-31 09:51:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								6aa65b68b8 
								
							 
						 
						
							
							
								
								common api: add support for formatting messages outside of twitter-style plain text  
							
							
							
						 
						
							2018-08-31 03:13:59 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								63094cfd3e 
								
							 
						 
						
							
							
								
								Merge branch 'feature/emoji-in-local-users' into 'develop'  
							
							... 
							
							
							
							Add emoji to local user profiles.
Closes  #202 
See merge request pleroma/pleroma!271  
							
						 
						
							2018-08-26 23:24:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								741c6ad671 
								
							 
						 
						
							
							
								
								common api: handle replying to orphaned threads  
							
							
							
						 
						
							2018-08-26 22:37:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ensra 
								
							 
						 
						
							
							
							
							
								
							
							
								1495d04789 
								
							 
						 
						
							
							
								
								fix test for converting bio \r\n to <br>.  
							
							
							
						 
						
							2018-08-21 14:51:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c033d2004b 
								
							 
						 
						
							
							
								
								formatting  
							
							
							
						 
						
							2018-08-20 18:40:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								145546e52a 
								
							 
						 
						
							
							
								
								common api: format hashtags in the same way as we format mentions  
							
							
							
						 
						
							2018-08-20 18:39:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								92caa2632b 
								
							 
						 
						
							
							
								
								Use Image type for emoji icons.  
							
							
							
						 
						
							2018-08-13 16:21:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								f9d13558c8 
								
							 
						 
						
							
							
								
								CommonAPI: add emoji to user source data on update  
							
							
							
						 
						
							2018-08-13 15:27:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								49da04c509 
								
							 
						 
						
							
							
								
								common api: use Object.normalize() instead of Object.get_by_ap_id() directly.  
							
							
							
						 
						
							2018-06-27 13:07:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0f70e83e8c 
								
							 
						 
						
							
							
								
								Better error handling in TwitterApiController.  
							
							
							
						 
						
							2018-06-03 19:11:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								c41012053a 
								
							 
						 
						
							
							
								
								Merge branch 'feature/change-password' into 'develop'  
							
							... 
							
							
							
							Feature/change password
See merge request pleroma/pleroma!166  
							
						 
						
							2018-05-24 17:16:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0b5bc62b33 
								
							 
						 
						
							
							
								
								Don't save double tags in AP objects we create  
							
							... 
							
							
							
							This crashed Mastodon workers. 
							
						 
						
							2018-05-23 17:25:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Syldexia 
								
							 
						 
						
							
							
							
							
								
							
							
								d0690622cd 
								
							 
						 
						
							
							
								
								Added endpoint for changing passwords  
							
							
							
						 
						
							2018-05-21 23:06:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Syldexia 
								
							 
						 
						
							
							
							
							
								
							
							
								98b36d359a 
								
							 
						 
						
							
							
								
								Fixed formatting and test  
							
							
							
						 
						
							2018-05-13 15:43:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Syldexia 
								
							 
						 
						
							
							
							
							
								
							
							
								5bfb7b4ce6 
								
							 
						 
						
							
							
								
								Moved account deletion stuff to somewhere that hopefully makes more sense  
							
							
							
						 
						
							2018-05-13 14:36:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Syldexia 
								
							 
						 
						
							
							
							
							
								
							
							
								a16117225f 
								
							 
						 
						
							
							
								
								Added endpoint for user account deletion  
							
							
							
						 
						
							2018-05-13 14:35:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								aeff2d6474 
								
							 
						 
						
							
							
								
								Merge branch 'feature/unrepeats' into 'develop'  
							
							... 
							
							
							
							Add unrepeats
Closes  #69 
See merge request pleroma/pleroma!113  
							
						 
						
							2018-05-13 09:32:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								636f0fa402 
								
							 
						 
						
							
							
								
								Clean up unused aliases and imports  
							
							
							
						 
						
							2018-05-04 21:25:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ab4aa5720a 
								
							 
						 
						
							
							
								
								Fix a bunch of unused variable warnings  
							
							
							
						 
						
							2018-05-04 20:59:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								9e0dd21ed6 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of  https://git.pleroma.social/pleroma/pleroma  into feature/unrepeats  
							
							
							
						 
						
							2018-04-25 00:46:28 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0574df273c 
								
							 
						 
						
							
							
								
								Small cleanup.  
							
							
							
						 
						
							2018-04-22 10:01:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								c5dc7e6e31 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of  https://git.pleroma.social/pleroma/pleroma  into feature/unrepeats  
							
							
							
						 
						
							2018-04-20 16:48:18 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ee6f15529d 
								
							 
						 
						
							
							
								
								CommonAPI post: kill \r with fire  
							
							
							
						 
						
							2018-04-18 15:46:39 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								b949577472 
								
							 
						 
						
							
							
								
								Add unrepeat functionality  
							
							
							
						 
						
							2018-04-14 20:19:48 -04:00