Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								5af798f246 
								
							 
						 
						
							
							
								
								Fix enforcement of character limits  
							
							
							
						 
						
							2020-03-10 13:08:00 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4bce13fa2f 
								
							 
						 
						
							
							
								
								MastodonController: Return 404 errors correctly.  
							
							
							
						 
						
							2020-03-04 18:09:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								05da5f5cca 
								
							 
						 
						
							
							
								
								Update Copyrights  
							
							
							
						 
						
							2020-03-03 16:44:49 -06: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								50f5a92021 
								
							 
						 
						
							
							
								
								fix not being able to pin polls  
							
							
							
						 
						
							2020-02-02 14:55:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								510776ba31 
								
							 
						 
						
							
							
								
								CommonAPI: Don't error out on double favs/repeats  
							
							
							
						 
						
							2020-01-20 14:27:59 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7722e5a67a 
								
							 
						 
						
							
							
								
								Merge branch 'feature/move-activity' into 'develop'  
							
							... 
							
							
							
							Support "Move" activity
Closes  #1316 
See merge request pleroma/pleroma!1883  
							
						 
						
							2019-12-02 16:26:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								de892d2fe1 
								
							 
						 
						
							
							
								
								[ #1335 ] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.  
							
							
							
						 
						
							2019-11-20 15:46:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								ba5cc30165 
								
							 
						 
						
							
							
								
								[ #1335 ] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.  
							
							
							
						 
						
							2019-11-19 23:22:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								1afeaf82fa 
								
							 
						 
						
							
							
								
								Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'  
							
							... 
							
							
							
							Admin API: Grouped reports, update multiple reports in one query
Closes admin-fe#43
See merge request pleroma/pleroma!1815  
							
						 
						
							2019-11-14 13:35:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3c0abfca53 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/move-activity  
							
							
							
						 
						
							2019-11-14 16:39:45 +07: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b22ee9d966 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into reactions  
							
							
							
						 
						
							2019-11-08 13:27:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								43ea16870f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/reports-groups-and-multiple-state-update  
							
							
							
						 
						
							2019-11-05 02:12:48 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								4c1dd55c48 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships  
							
							
							
						 
						
							2019-10-24 14:55:36 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e8843974cb 
								
							 
						 
						
							
							
								
								[ #1304 ] Moved remaining fields from User.Info to User.  
							
							... 
							
							
							
							Misc. fixes / improvements. 
							
						 
						
							2019-10-20 13:42:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								10ff01acd9 
								
							 
						 
						
							
							
								
								[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.  
							
							
							
						 
						
							2019-10-16 21:59:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								059005ff82 
								
							 
						 
						
							
							
								
								Replace user.following with Pleroma.FollowingRelationship  
							
							
							
						 
						
							2019-10-11 02:35:32 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								35068baf65 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/reports-groups-and-multiple-state-update  
							
							
							
						 
						
							2019-10-07 15:41:41 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								61097ba6ab 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'reactions'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2019-10-06 08:11:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								276a520163 
								
							 
						 
						
							
							
								
								CommonAPI: Create profile updates as public.  
							
							... 
							
							
							
							This saves us lots of sending out because we can use sharedInbox. 
							
						 
						
							2019-10-05 14:53:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								8dcc2f9f5e 
								
							 
						 
						
							
							
								
								Admin API: Allow changing the state of multiple reports at once  
							
							
							
						 
						
							2019-10-04 19:00:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9cfe9a57c5 
								
							 
						 
						
							
							
								
								CommonAPI: Add unreactions.  
							
							
							
						 
						
							2019-10-02 15:38:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								557223b2b5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into reactions  
							
							
							
						 
						
							2019-10-02 13:27:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								3d61efa7c9 
								
							 
						 
						
							
							
								
								Rename misleading get_announce_visibility to public_announce?  
							
							
							
						 
						
							2019-10-02 10:48:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								4c1f158f5d 
								
							 
						 
						
							
							
								
								Allow users to announce privately, including own private notes  
							
							
							
						 
						
							2019-10-01 20:00:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b923842e96 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into reactions  
							
							
							
						 
						
							2019-09-30 13:57:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								8b34b221cb 
								
							 
						 
						
							
							
								
								common api: add some missing IR bits for listen activities' children  
							
							
							
						 
						
							2019-09-30 10:39:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								71eff09e56 
								
							 
						 
						
							
							
								
								common api: make sure the generated IR is actually federatable  
							
							
							
						 
						
							2019-09-30 10:39:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								2c82d8603b 
								
							 
						 
						
							
							
								
								common api: implement scrobbling  
							
							
							
						 
						
							2019-09-30 10:39:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								374f83d29b 
								
							 
						 
						
							
							
								
								Fix not being able to post empty statuses with attachments  
							
							... 
							
							
							
							Attachment field was filled in after the empty status check 
							
						 
						
							2019-09-28 01:58:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								c57ad0a402 
								
							 
						 
						
							
							
								
								Cleanup CommonAPI  
							
							
							
						 
						
							2019-09-26 10:33:13 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								de3e90e536 
								
							 
						 
						
							
							
								
								Add ActivityDraft.with_valid/2  
							
							
							
						 
						
							2019-09-26 10:29:34 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								eed774d058 
								
							 
						 
						
							
							
								
								Add CommonAPI.ActivityDraft  
							
							
							
						 
						
							2019-09-26 10:29:34 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								48a82c4609 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/user' into 'develop'  
							
							... 
							
							
							
							Simplify updating user's `info`
See merge request pleroma/pleroma!1712  
							
						 
						
							2019-09-26 03:00:38 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								1bea67cb5e 
								
							 
						 
						
							
							
								
								Cleanup Pleroma.User  
							
							
							
						 
						
							2019-09-24 19:50:09 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								209395c7e6 
								
							 
						 
						
							
							
								
								Add User.change_info/2 and User.update_info/2  
							
							
							
						 
						
							2019-09-24 19:50:07 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b770ed1d99 
								
							 
						 
						
							
							
								
								CommonAPI: Support emoji reactions.  
							
							
							
						 
						
							2019-08-27 17:56:28 -05: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