William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								ef1f9e8d4e 
								
							 
						 
						
							
							
								
								activitypub: split out outgoing federation into a federation module  
							
							 
							
							
							
						 
						
							2019-05-12 05:04:11 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								14deed7f7d 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/preload-bookmarks-with-activities' into 'develop'  
							
							 
							
							... 
							
							
							
							Optimize bookmarks by preloading them with activities
Closes  #861 
See merge request pleroma/pleroma!1121  
							
						 
						
							2019-05-07 19:37:41 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								6020ff3fb6 
								
							 
						 
						
							
							
								
								activitypub: add optional order constraint to timeline query builder  
							
							 
							
							
							
						 
						
							2019-05-07 19:33:22 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								4c5125dedc 
								
							 
						 
						
							
							
								
								Remove bookmarks assoc and add a fake bookmark assoc instead  
							
							 
							
							
							
						 
						
							2019-05-07 19:33:22 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f841eb7cdb 
								
							 
						 
						
							
							
								
								Preload bookmarks wherever the object is preloaded  
							
							 
							
							
							
						 
						
							2019-05-07 19:33:22 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								a1a0df19c4 
								
							 
						 
						
							
							
								
								Merge branch 'docs/MRF-modules' into 'develop'  
							
							 
							
							... 
							
							
							
							Documentation: MRF Modules
See merge request pleroma/pleroma!1122  
							
						 
						
							2019-05-07 16:15:27 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								238dd72fad 
								
							 
						 
						
							
							
								
								Merge branch 'conversations_three' into 'develop'  
							
							 
							
							... 
							
							
							
							Conversations once more.
See merge request pleroma/pleroma!1119  
							
						 
						
							2019-05-07 14:43:21 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e41a2f98d5 
								
							 
						 
						
							
							
								
								mrf/tag_policy.ex: Add some documentation  
							
							 
							
							... 
							
							
							
							mrf_tag:disable-remote-subscription exact way of working is quite
unclear to me. Is it the requester that is denied if they have a tag,
or is it the requestee if they have one? 
							
						 
						
							2019-05-06 04:53:11 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								af62ace954 
								
							 
						 
						
							
							
								
								Add short documentation on every MRF Policy  
							
							 
							
							
							
						 
						
							2019-05-06 04:49:50 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2f76a40d02 
								
							 
						 
						
							
							
								
								formatter.ex: Add get_emoji_map/1  
							
							 
							
							
							
						 
						
							2019-05-03 16:27:50 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								81d1aa424d 
								
							 
						 
						
							
							
								
								Streamer: Stream out Conversations/Participations.  
							
							 
							
							
							
						 
						
							2019-05-03 13:39:14 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								45f790becc 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into conversations_three  
							
							 
							
							
							
						 
						
							2019-05-01 18:40:41 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								f11e7037c2 
								
							 
						 
						
							
							
								
								test fixes  
							
							 
							
							
							
						 
						
							2019-05-01 16:09:53 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								bdfa3a6fa8 
								
							 
						 
						
							
							
								
								Merging with develop  
							
							 
							
							... 
							
							
							
							Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex 
							
						 
						
							2019-05-01 12:29:33 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ce4825c1dc 
								
							 
						 
						
							
							
								
								Do not normalize objects in stream_out unless the activity type is  
							
							 
							
							... 
							
							
							
							Create
Saves quite a bit of time with delete activities because they would
always query the db 
							
						 
						
							2019-04-30 20:21:28 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								0fd0ffcd76 
								
							 
						 
						
							
							
								
								activitypub: transmogrifier: send reject follow if following does not succeed  
							
							 
							
							
							
						 
						
							2019-04-25 00:48:45 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d21d921def 
								
							 
						 
						
							
							
								
								Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading  
							
							 
							
							
							
						 
						
							2019-04-22 11:27:29 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor 
								
							 
						 
						
							
							
							
							
								
							
							
								b9cdf6d3b9 
								
							 
						 
						
							
							
								
								Use User.get_cached* everywhere  
							
							 
							
							
							
						 
						
							2019-04-22 07:20:43 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roman Chvanikov 
								
							 
						 
						
							
							
							
							
								
							
							
								24073f829f 
								
							 
						 
						
							
							
								
								Refactor query to return only 1 message instead of 20  
							
							 
							
							
							
						 
						
							2019-04-21 00:40:41 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								9da8b287f8 
								
							 
						 
						
							
							
								
								Merge branch 'feature/database-compaction' into 'develop'  
							
							 
							
							... 
							
							
							
							database compaction
See merge request pleroma/pleroma!473  
							
						 
						
							2019-04-19 16:55:33 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f9865cf943 
								
							 
						 
						
							
							
								
								Stream out deletes, mistakingly removed when resolving merge conflicts  
							
							 
							
							
							
						 
						
							2019-04-19 00:47:02 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								83589ca6a5 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/database-compaction  
							
							 
							
							
							
						 
						
							2019-04-18 12:56:38 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								6069d0fd36 
								
							 
						 
						
							
							
								
								Fix object search depending on embeded object  
							
							 
							
							
							
						 
						
							2019-04-18 09:28:20 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e31a22043b 
								
							 
						 
						
							
							
								
								Fix media timeline depending on embeded object and add some guards  
							
							 
							
							
							
						 
						
							2019-04-18 08:31:08 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								2abc09570f 
								
							 
						 
						
							
							
								
								Use the preloaded object in tag queries  
							
							 
							
							
							
						 
						
							2019-04-18 01:37:04 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								36f78c6dcd 
								
							 
						 
						
							
							
								
								activitypub: fix filtering of boosts from blocked users  
							
							 
							
							
							
						 
						
							2019-04-17 22:27:59 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2140e164d7 
								
							 
						 
						
							
							
								
								activitypub: properly filter out transitive activities concerning blocked users  
							
							 
							
							
							
						 
						
							2019-04-17 20:05:09 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								35ac672b8d 
								
							 
						 
						
							
							
								
								Remove containment tests from transmogrifier and fix thread visibility solver  
							
							 
							
							
							
						 
						
							2019-04-17 17:59:15 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								8e4d950f31 
								
							 
						 
						
							
							
								
								Remove updating reply count for embeded objects  
							
							 
							
							
							
						 
						
							2019-04-17 15:54:09 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ad681877df 
								
							 
						 
						
							
							
								
								Make credo happy  
							
							 
							
							
							
						 
						
							2019-04-17 14:52:01 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								627e5a0a49 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/database-compaction  
							
							 
							
							
							
						 
						
							2019-04-17 12:22:32 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								750b369d04 
								
							 
						 
						
							
							
								
								activitypub: allow indirect messages from users being followed at a personal inbox  
							
							 
							
							
							
						 
						
							2019-04-16 18:31:12 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5d73dca064 
								
							 
						 
						
							
							
								
								Remove inReplyToStatusId  
							
							 
							
							
							
						 
						
							2019-04-15 11:50:36 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								184ae60b21 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/pleroma-email-naming' into 'develop'  
							
							 
							
							... 
							
							
							
							Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029  
							
						 
						
							2019-04-12 10:41:09 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								0a09692c7d 
								
							 
						 
						
							
							
								
								Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'  
							
							 
							
							... 
							
							
							
							Features: mastoapi-2.6.0 `min_id` pagination
Closes  #351 
See merge request pleroma/pleroma!976  
							
						 
						
							2019-04-12 09:34:12 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								280172f6f6 
								
							 
						 
						
							
							
								
								Conversations: Create or bump on inserting a dm.  
							
							 
							
							
							
						 
						
							2019-04-10 16:33:45 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cae0231731 
								
							 
						 
						
							
							
								
								s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/  
							
							 
							
							
							
						 
						
							2019-04-10 06:33:20 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1791ee8ec4 
								
							 
						 
						
							
							
								
								s/Pleroma.Mailer/Pleroma.Emails.Mailer/  
							
							 
							
							
							
						 
						
							2019-04-10 06:33:19 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								0ab563d334 
								
							 
						 
						
							
							
								
								Merge branch 'hotfix/fix_undefined_summary' into 'develop'  
							
							 
							
							... 
							
							
							
							transmogrifier.ex: Add fix_summary/1
See merge request pleroma/pleroma!1039  
							
						 
						
							2019-04-10 02:10:47 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cf9ba8fe1b 
								
							 
						 
						
							
							
								
								transmogrifier.ex: Add fix_summary/1  
							
							 
							
							... 
							
							
							
							MRF.KeywordPolicy assumes that summary is present in a activity,
and this would probably simplify code elsewhere too anyway. 
							
						 
						
							2019-04-10 02:32:04 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								e19590c93f 
								
							 
						 
						
							
							
								
								Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'  
							
							 
							
							... 
							
							
							
							Improve Transmogrifier.upgrade_user_from_ap_id/2
See merge request pleroma/pleroma!1019  
							
						 
						
							2019-04-08 11:42:20 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								36c0a10fdf 
								
							 
						 
						
							
							
								
								adding language tag  
							
							 
							
							
							
						 
						
							2019-04-08 11:03:10 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								cfa6e7289f 
								
							 
						 
						
							
							
								
								Improve Transmogrifier.upgrade_user_from_ap_id/2  
							
							 
							
							
							
						 
						
							2019-04-04 16:10:43 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								0cb94cfa94 
								
							 
						 
						
							
							
								
								Merge branch 'fix-slow-relationships' into 'develop'  
							
							 
							
							... 
							
							
							
							ActivityPub Utils: Greatly speed up the follow / block activity fetching.
See merge request pleroma/pleroma!1011  
							
						 
						
							2019-04-02 18:43:48 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								a79ce94dd4 
								
							 
						 
						
							
							
								
								Merge branch 'feature/fake-statuses' into 'develop'  
							
							 
							
							... 
							
							
							
							Add fake status submit
See merge request pleroma/pleroma!995  
							
						 
						
							2019-04-02 14:17:43 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								39bcf93007 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into fix-slow-relationships  
							
							 
							
							
							
						 
						
							2019-04-02 16:10:38 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fd07745d1b 
								
							 
						 
						
							
							
								
								ActivityPub Utils: Greatly speed up the follow / block activity fetching.  
							
							 
							
							
							
						 
						
							2019-04-02 16:08:55 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								4212527928 
								
							 
						 
						
							
							
								
								change Repo.get(Activity, id) => Activity.get_by_id(id)  
							
							 
							
							
							
						 
						
							2019-04-02 16:50:31 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								fe5145eeaa 
								
							 
						 
						
							
							
								
								Move putting fake attribute to lib/pleroma/web/activity_pub/utils.ex  
							
							 
							
							
							
						 
						
							2019-04-01 12:25:53 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								975482f091 
								
							 
						 
						
							
							
								
								insert object defaults for fake activities and make credo happy  
							
							 
							
							
							
						 
						
							2019-04-01 12:16:51 +03:00