Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								4d5ec883b7
								
							
						 | 
						
							
							
								
								Federate correct activity
							
							
							
							
							
						 | 
						
							2018-05-08 21:52:21 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								2d775bf1be
								
							
						 | 
						
							
							
								
								Merge branch 'feature/unrepeats' of git.pleroma.social:normandy/pleroma into feature/unrepeats
							
							
							
							
							
						 | 
						
							2018-04-25 01:58:50 -04: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								0df1a4efc8
								
							
						 | 
						
							
							
								
								Fix comment grammar
							
							
							
							
							
						 | 
						
							2018-04-25 00:46:06 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								c78e7d8b11
								
							
						 | 
						
							
							
								
								Fix formatting.
							
							
							
							
							
						 | 
						
							2018-04-24 21:25:31 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								7a52c4549c
								
							
						 | 
						
							
							
								
								Merge branch 'feature/message-rewrite-facility' into 'develop'
							
							
							
							
							
							
							
							message rewrite facility
See merge request pleroma/pleroma!112 
							
						 | 
						
							2018-04-24 17:21:28 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Dashie
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								9972678a68
								
							
						 | 
						
							
							
								
								Add User.decrease_note_count and call it from ActivityPub.delete
							
							
							
							
							
						 | 
						
							2018-04-24 11:34:18 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								62a2287bba
								
							
						 | 
						
							
							
								
								Merge branch 'favicon_tag' into 'develop'
							
							
							
							
							
							
							
							Fix endpoint for favicon
See merge request pleroma/pleroma!84 
							
						 | 
						
							2018-04-24 05:54:28 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								8c0806539c
								
							
						 | 
						
							
							
								
								Embed announce activity data instead of linking to it
							
							
							
							
							
						 | 
						
							2018-04-22 21:28:51 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								b1742eca42
								
							
						 | 
						
							
							
								
								Revert "Rename make_unannounce_data helper to make_undo_data"
							
							
							
							
							
							
							
							This reverts commit c649ca8958. 
							
						 | 
						
							2018-04-22 19:42:28 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								0574df273c
								
							
						 | 
						
							
							
								
								Small cleanup.
							
							
							
							
							
						 | 
						
							2018-04-22 10:01:10 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								c649ca8958
								
							
						 | 
						
							
							
								
								Rename make_unannounce_data helper to make_undo_data
							
							
							
							
							
							
							
							This makes it a bit more easier to adapt for unlikes as well in the
future. 
							
						 | 
						
							2018-04-22 01:55:41 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								22bfeac256
								
							
						 | 
						
							
							
								
								Update note count in ActivityPub.create.
							
							
							
							
							
						 | 
						
							2018-04-21 12:58:04 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								9e6ae44729
								
							
						 | 
						
							
							
								
								Formatting fixes.
							
							
							
							
							
						 | 
						
							2018-04-21 09:43:53 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								ff5e957476
								
							
						 | 
						
							
							
								
								Make search use id index too.
							
							
							
							
							
							
							
							Seems to be faster in general, query planner chooses well. 
							
						 | 
						
							2018-04-21 09:22:31 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								f0798440de
								
							
						 | 
						
							
							
								
								Use correct activity for undo
							
							
							
							
							
						 | 
						
							2018-04-20 23:22:16 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								4b9f2ab526
								
							
						 | 
						
							
							
								
								Fix federation of unreblog activity
							
							
							
							
							
						 | 
						
							2018-04-20 23:09:19 -04: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								a61e8ac154
								
							
						 | 
						
							
							
								
								Formatting.
							
							
							
							
							
						 | 
						
							2018-04-20 13:10:57 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								fa37acfcc7
								
							
						 | 
						
							
							
								
								TwitterAPI: Add Qvitter notification endpoint.
							
							
							
							
							
						 | 
						
							2018-04-19 21:46:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nenolod@dereferenced.org
								
							 
						 | 
						
							
							
							
							
								
							
							
								f08f9d4498
								
							
						 | 
						
							
							
								
								ActivityPub MRF: fix nsfw tagging of objects with attachments by looking at the right object (the child in this case)
							
							
							
							
							
						 | 
						
							2018-04-19 07:45:09 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								32a26eb910
								
							
						 | 
						
							
							
								
								Fix TwitterAPI.delete call
							
							
							
							
							
						 | 
						
							2018-04-18 20:43:03 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								ee6f15529d
								
							
						 | 
						
							
							
								
								CommonAPI post: kill \r with fire
							
							
							
							
							
						 | 
						
							2018-04-18 15:46:39 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								947431e9aa
								
							
						 | 
						
							
							
								
								MastoAPI and OAuth: allow login with either email or username.
							
							
							
							
							
						 | 
						
							2018-04-18 13:13:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								7b4f55238e
								
							
						 | 
						
							
							
								
								Handle unrepeats via the TwitterAPI
							
							
							
							
							
						 | 
						
							2018-04-18 06:00:40 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								687db1bc3a
								
							
						 | 
						
							
							
								
								Expose unannounce activity so that it can be tested
							
							
							
							
							
						 | 
						
							2018-04-18 03:39:42 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								0251690e96
								
							
						 | 
						
							
							
								
								Add federation for unrepeats
							
							
							
							
							
						 | 
						
							2018-04-17 20:35:07 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								c9e7b984d5
								
							
						 | 
						
							
							
								
								Add make_unannounce_data helper function
							
							
							
							
							
						 | 
						
							2018-04-17 04:13:08 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								85bd191291
								
							
						 | 
						
							
							
								
								Remove unretweet function for now
							
							
							
							
							
						 | 
						
							2018-04-17 04:12:16 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								42279f54cf
								
							
						 | 
						
							
							
								
								Return target status in MastoAPI endpoint instead of reblog activity
							
							
							
							
							
						 | 
						
							2018-04-16 23:30:52 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								d16877251a
								
							
						 | 
						
							
							
								
								doc fixes
							
							
							
							
							
						 | 
						
							2018-04-16 10:59:32 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								b949577472
								
							
						 | 
						
							
							
								
								Add unrepeat functionality
							
							
							
							
							
						 | 
						
							2018-04-14 20:19:48 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								d24ddd9fb9
								
							
						 | 
						
							
							
								
								ActivityPub MRF: implement the SimplePolicy policy
							
							
							
							
							
						 | 
						
							2018-04-14 06:32:45 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								4a178b3d65
								
							
						 | 
						
							
							
								
								ActivityPub: implement MRF core hook and baseline noop policy object
							
							
							
							
							
						 | 
						
							2018-04-14 06:32:44 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Gian Sass
								
							 
						 | 
						
							
							
							
							
								
							
							
								907df9b8ed
								
							
						 | 
						
							
							
								
								Fix issue #124
							
							
							
							
							
						 | 
						
							2018-04-11 14:55:49 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								1dd2c8163f
								
							
						 | 
						
							
							
								
								Order masto searches by date.
							
							
							
							
							
						 | 
						
							2018-04-10 18:38:52 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								9998b4519d
								
							
						 | 
						
							
							
								
								Merge branch 'feature/mastodon-api-for-tootstream' into 'develop'
							
							
							
							
							
							
							
							mastodon api emulation improvements for tootstream
Closes #101
See merge request pleroma/pleroma!100 
							
						 | 
						
							2018-04-08 06:02:11 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								9a2d3705c6
								
							
						 | 
						
							
							
								
								Merge branch 'fix/persisted-mastofe-settings' into 'develop'
							
							
							
							
							
							
							
							MastoAPI: Persist frontend timelines and settings.
Closes #113
See merge request pleroma/pleroma!98 
							
						 | 
						
							2018-04-08 06:01:06 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								1857f403be
								
							
						 | 
						
							
							
								
								mastodon api: report version as the Mastodon API version supported with the real version in parenthesis
							
							
							
							
							
						 | 
						
							2018-04-07 17:29:28 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								52a1a40d7d
								
							
						 | 
						
							
							
								
								mastodon api: implement /api/v1/lists stub
							
							
							
							
							
						 | 
						
							2018-04-07 17:29:27 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								8f9bcc4ab0
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
							
							
							
							
							
						 | 
						
							2018-04-07 16:41:47 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								70bcdf32bd
								
							
						 | 
						
							
							
								
								Only search in public data for now.
							
							
							
							
							
							
							
							This should be the data the user is allowed to see later, but this
will stop accidental private message leaks. 
							
						 | 
						
							2018-04-07 16:40:45 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								7c47534970
								
							
						 | 
						
							
							
								
								MastoAPI: Persist frontend timelines and settings.
							
							
							
							
							
						 | 
						
							2018-04-07 17:26:56 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								d41bfd1d47
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/html-webfinger-host-meta' into 'develop'
							
							
							
							
							
							
							
							webfinger: handle situations where the well-known endpoint returns HTML
See merge request pleroma/pleroma!94 
							
						 | 
						
							2018-04-07 12:19:49 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								e7ddda44c0
								
							
						 | 
						
							
							
								
								Follow import: allow URI in addition to screen_name.
							
							
							
							
							
						 | 
						
							2018-04-07 15:00:23 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								bf9d3d4aba
								
							
						 | 
						
							
							
								
								XML: use try/catch with XPath functions
							
							
							
							
							
						 | 
						
							2018-04-06 22:56:09 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								303289d7da
								
							
						 | 
						
							
							
								
								MastodonAPI search: return only create activities.
							
							
							
							
							
						 | 
						
							2018-04-05 13:59:53 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									RX14
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								033771d9f1
								
							
						 | 
						
							
							
								
								Fix failure to serve media from custom upload path
							
							
							
							
							
						 | 
						
							2018-04-05 11:46:33 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								d70d1c427a
								
							
						 | 
						
							
							
								
								TwitterAPI: Don't put follows into the public tls.
							
							
							
							
							
						 | 
						
							2018-04-04 15:23:27 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								b3b7ab5d9a
								
							
						 | 
						
							
							
								
								Load all users at once in timelines.
							
							
							
							
							
						 | 
						
							2018-04-02 16:35:41 +02:00 | 
						
						
							
							
							
								
							
							
						 |