Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								82895a4012 
								
							 
						 
						
							
							
								
								SideEffects: port ones from ActivityPub.do_create and ActivityPub.insert  
							
							
							
						 
						
							2020-07-15 11:40:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d23804f191 
								
							 
						 
						
							
							
								
								Use the Pleroma.Config alias  
							
							
							
						 
						
							2020-07-09 10:53:51 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ee35bb5ac2 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-25 13:57:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								7bc2ec0aa2 
								
							 
						 
						
							
							
								
								Merge branch 'mastodon-migration-compat' into 'develop'  
							
							... 
							
							
							
							Add compatibility routes for converted mastodon instances
Closes  #1797 
See merge request pleroma/pleroma!2572  
							
						 
						
							2020-05-24 19:05:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								5d60b25e69 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/common_api/utils.ex  
							
							
							
						 
						
							2020-05-22 15:44:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								cc82229ba7 
								
							 
						 
						
							
							
								
								Add filename_display_max_length config  
							
							
							
						 
						
							2020-05-22 18:19:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								355aa3bdc7 
								
							 
						 
						
							
							
								
								ActivityPubController: Add Mastodon activity compat route.  
							
							
							
						 
						
							2020-05-22 17:06:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								eb5f428565 
								
							 
						 
						
							
							
								
								CommonAPI: Change public->private implicit addressing.  
							
							... 
							
							
							
							This will not add the OP to the `to` field anymore when going from
public to private. 
							
						 
						
							2020-05-20 13:38:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3cff4e24cd 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-13 12:44:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7803a85d2c 
								
							 
						 
						
							
							
								
								Add OpenAPI spec for StatusController  
							
							
							
						 
						
							2020-05-13 00:25:21 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fb2d284d28 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-07 15:05:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								3d0c567fbc 
								
							 
						 
						
							
							
								
								Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController  
							
							
							
						 
						
							2020-05-07 08:14:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c40afe5ba0 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-04 10:43:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6aa116eca7 
								
							 
						 
						
							
							
								
								Create activity handling: Flip it and reverse it  
							
							... 
							
							
							
							Both objects and create activities will now go through the common
pipeline and will be validated. Objects are now created as a side
effect of the Create activity, rolling back a transaction if it's
not possible to insert the object. 
							
						 
						
							2020-04-28 16:26:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								560f2c1979 
								
							 
						 
						
							
							
								
								Add OpenAPI spec for ReportController  
							
							
							
						 
						
							2020-04-28 16:50:37 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7d38197894 
								
							 
						 
						
							
							
								
								CommonAPI: Don't make repeating announces possible  
							
							
							
						 
						
							2020-04-23 13:33:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9172d719cc 
								
							 
						 
						
							
							
								
								profile emojis in User.emoji instead of source_data  
							
							
							
						 
						
							2020-04-10 06:20:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d1379c4de8 
								
							 
						 
						
							
							
								
								Formatting: Do not use \n and prefer <br> instead  
							
							... 
							
							
							
							It moves bbcode to bbcode_pleroma as the former is owned by kaniini
and transfering ownership wasn't done in a timely manner.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374 
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375  
							
						 
						
							2020-03-13 16:07:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								5af798f246 
								
							 
						 
						
							
							
								
								Fix enforcement of character limits  
							
							
							
						 
						
							2020-03-10 13:08:00 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6da6540036 
								
							 
						 
						
							
							
								
								Bump copyright years of files changed after 2020-01-07  
							
							... 
							
							
							
							Done via the following command:
git diff fcd5dd259a 
							
						 
						
							2020-03-02 06:08:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ff9fd4ca89 
								
							 
						 
						
							
							
								
								Fix the confusingly named and inverted logic of "no_attachment_links"  
							
							... 
							
							
							
							The setting is now simply "attachment_links" and the boolean value does
what you expect. A double negative is never possible and describing the
functionality is no longer a philospher's worst nightmare. 
							
						 
						
							2020-02-11 15:39:19 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								d85bcc8627 
								
							 
						 
						
							
							
								
								Questions: Add timezone to closed property  
							
							
							
						 
						
							2020-02-07 16:57:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								30caf3e51e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/user.ex 
							
						 
						
							2019-12-04 18:56:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								de892d2fe1 
								
							 
						 
						
							
							
								
								[ #1335 ] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.  
							
							
							
						 
						
							2019-11-20 15:46:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								768c1a5de1 
								
							 
						 
						
							
							
								
								Fix tests  
							
							
							
						 
						
							2019-11-12 19:13:19 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								27cd1374e3 
								
							 
						 
						
							
							
								
								Add a notification for Move activities  
							
							
							
						 
						
							2019-11-12 18:48:14 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								c57ad0a402 
								
							 
						 
						
							
							
								
								Cleanup CommonAPI  
							
							
							
						 
						
							2019-09-26 10:33:13 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								eed774d058 
								
							 
						 
						
							
							
								
								Add CommonAPI.ActivityDraft  
							
							
							
						 
						
							2019-09-26 10:29:34 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								3ff57f1fd3 
								
							 
						 
						
							
							
								
								Merge branch 'hex-flake-id' into 'develop'  
							
							... 
							
							
							
							Replace `Pleroma.FlakeId` with `flake_id` hex package
See merge request pleroma/pleroma!1692  
							
						 
						
							2019-09-26 02:51:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								b5dfe83433 
								
							 
						 
						
							
							
								
								Replace Pleroma.FlakeId with flake_id hex package  
							
							
							
						 
						
							2019-09-25 17:14:31 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								a87c313309 
								
							 
						 
						
							
							
								
								Support list visibility in StatusView  
							
							
							
						 
						
							2019-07-15 14:00:29 +07: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