Rachel H
								
							 
						 | 
						
							
							
							
							
								
							
							
								fa0c2727d8
								
							
						 | 
						
							
							
								
								Fix users lookup/return type
							
							
							
							
							
							
							
							* Allow viewing user in frontend by id on pageload 
							
						 | 
						
							2018-06-07 23:18:45 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								8073af6e10
								
							
						 | 
						
							
							
								
								Better error handling for OstatusController.
							
							
							
							
							
						 | 
						
							2018-06-03 21:04:44 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								06439f64d0
								
							
						 | 
						
							
							
								
								Better error handling for ActivityPubController
							
							
							
							
							
						 | 
						
							2018-06-03 19:58:59 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								5e76adb07e
								
							
						 | 
						
							
							
								
								Fix url guessing attacks.
							
							
							
							
							
						 | 
						
							2018-05-30 20:00:45 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								d045b96f95
								
							
						 | 
						
							
							
								
								Add tests for incoming unfollow over OStatus
							
							
							
							
							
						 | 
						
							2018-05-21 05:11:13 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								f2d6c3a512
								
							
						 | 
						
							
							
								
								Handle unfollows from OStatus
							
							
							
							
							
						 | 
						
							2018-05-21 04:36:20 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								aeff2d6474
								
							
						 | 
						
							
							
								
								Merge branch 'feature/unrepeats' into 'develop'
							
							
							
							
							
							
							
							Add unrepeats
Closes #69
See merge request pleroma/pleroma!113 
							
						 | 
						
							2018-05-13 09:32:29 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								271fb5ccb1
								
							
						 | 
						
							
							
								
								Probably better way of handling non-follow undos in ostatus
							
							
							
							
							
						 | 
						
							2018-05-11 11:59:53 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								4151cbe6b2
								
							
						 | 
						
							
							
								
								Revert "Do not send non-follow undos over ostatus for now"
							
							
							
							
							
							
							
							This reverts commit 07fdc07238. 
							
						 | 
						
							2018-05-11 11:53:28 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								0b527b5528
								
							
						 | 
						
							
							
								
								Revert "Use [] instead of nil"
							
							
							
							
							
							
							
							This reverts commit 42268b0981. 
							
						 | 
						
							2018-05-11 11:53:06 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								42268b0981
								
							
						 | 
						
							
							
								
								Use [] instead of nil
							
							
							
							
							
						 | 
						
							2018-05-11 01:48:56 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								07fdc07238
								
							
						 | 
						
							
							
								
								Do not send non-follow undos over ostatus for now
							
							
							
							
							
						 | 
						
							2018-05-11 01:45:10 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								4d5ec883b7
								
							
						 | 
						
							
							
								
								Federate correct activity
							
							
							
							
							
						 | 
						
							2018-05-08 21:52:21 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								636f0fa402
								
							
						 | 
						
							
							
								
								Clean up unused aliases and imports
							
							
							
							
							
						 | 
						
							2018-05-04 21:25:31 +00: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
								
							 
						 | 
						
							
							
							
							
								
							
							
								4afbef39f4
								
							
						 | 
						
							
							
								
								Format the code.
							
							
							
							
							
						 | 
						
							2018-03-30 15:01:53 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								46f63ea8af
								
							
						 | 
						
							
							
								
								Fix atom feed pagination.
							
							
							
							
							
						 | 
						
							2018-03-26 09:51:43 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								9b97b023c5
								
							
						 | 
						
							
							
								
								Merge branch 'feld-Logger' into 'develop'
							
							
							
							
							
							
							
							Logging cleanup
See merge request pleroma/pleroma!76 
							
						 | 
						
							2018-03-20 05:57:47 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								7430ff9173
								
							
						 | 
						
							
							
								
								Capitalize Atom
							
							
							
							
							
						 | 
						
							2018-03-19 17:44:25 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								4d5161b16d
								
							
						 | 
						
							
							
								
								Only fetch if it's http.
							
							
							
							
							
						 | 
						
							2018-03-19 10:28:28 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								fcf1937a40
								
							
						 | 
						
							
							
								
								Correctly handle unlisted messages coming in through Ostatus.
							
							
							
							
							
						 | 
						
							2018-03-07 15:45:13 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								b82637f32d
								
							
						 | 
						
							
							
								
								Don't use special query for feed.
							
							
							
							
							
						 | 
						
							2018-03-06 16:04:29 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								0e9bd6d148
								
							
						 | 
						
							
							
								
								Hotfix for tag problems.
							
							
							
							
							
						 | 
						
							2018-02-24 22:28:22 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								fa3aa59248
								
							
						 | 
						
							
							
								
								Add missing alias.
							
							
							
							
							
						 | 
						
							2018-02-24 13:11:39 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								fb02300234
								
							
						 | 
						
							
							
								
								Pleroma AP detection mechanism.
							
							
							
							
							
						 | 
						
							2018-02-24 13:06:53 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								2583a9f6e8
								
							
						 | 
						
							
							
								
								More logging.
							
							
							
							
							
						 | 
						
							2018-02-23 15:00:19 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								313f186a66
								
							
						 | 
						
							
							
								
								Ostatus: Use all recipients as mentions.
							
							
							
							
							
						 | 
						
							2018-02-19 08:34:55 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								ae26604378
								
							
						 | 
						
							
							
								
								ActivityPub: Refactor create function.
							
							
							
							
							
						 | 
						
							2018-02-15 19:59:35 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								b331cb449a
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/activitypub
							
							
							
							
							
						 | 
						
							2018-02-12 10:24:15 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								ae1ec858f4
								
							
						 | 
						
							
							
								
								Basic AP user building.
							
							
							
							
							
						 | 
						
							2018-02-11 17:20:43 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								52200998c9
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/activitypub
							
							
							
							
							
						 | 
						
							2018-02-11 09:50:55 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									hakabahitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								a61f21ff4f
								
							
						 | 
						
							
							
								
								print <link rel="next"> element in atom.feed
							
							
							
							
							
						 | 
						
							2018-02-09 23:10:32 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hakaba Hitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								7124f12a94
								
							
						 | 
						
							
							
								
								introduce max_id parameter in feed.atom (debug)
							
							
							
							
							
						 | 
						
							2018-02-09 21:46:05 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hakaba Hitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								9c61f60558
								
							
						 | 
						
							
							
								
								introduce max_id parameter in feed.atom
							
							
							
							
							
						 | 
						
							2018-02-09 21:41:30 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad0ab3a57b
								
							
						 | 
						
							
							
								
								Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop
							
							
							
							
							
						 | 
						
							2018-01-30 12:20:39 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hakaba Hitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								cefb6cfea1
								
							
						 | 
						
							
							
								
								provide logo at feed.atom (debug)
							
							
							
							
							
						 | 
						
							2018-01-30 19:37:04 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hakaba Hitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								b713b28dfd
								
							
						 | 
						
							
							
								
								provide logo at feed.atom
							
							
							
							
							
						 | 
						
							2018-01-30 19:26:07 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								64e51c2cfa
								
							
						 | 
						
							
							
								
								Fix incoming Pleroma CWs. Closes #96.
							
							
							
							
							
						 | 
						
							2018-01-29 17:44:35 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								57d413e655
								
							
						 | 
						
							
							
								
								Revert "Revert "Add remote follow path to webfinger.""
							
							
							
							
							
							
							
							This reverts commit fb5aa34092. 
							
						 | 
						
							2018-01-18 18:42:32 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								fb5aa34092
								
							
						 | 
						
							
							
								
								Revert "Add remote follow path to webfinger."
							
							
							
							
							
							
							
							This reverts commit bc689740f0. 
							
						 | 
						
							2018-01-18 03:42:09 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								bc689740f0
								
							
						 | 
						
							
							
								
								Add remote follow path to webfinger.
							
							
							
							
							
						 | 
						
							2018-01-18 02:38:02 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lain Iwakura
								
							 
						 | 
						
							
							
							
							
								
							
							
								64330d9455
								
							
						 | 
						
							
							
								
								ActivityPub: Add object routes / controller.
							
							
							
							
							
						 | 
						
							2017-12-11 18:21:33 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								5599c5920c
								
							
						 | 
						
							
							
								
								Basic incoming AP support.
							
							
							
							
							
						 | 
						
							2017-12-11 10:37:22 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								d08a34e88b
								
							
						 | 
						
							
							
								
								OStatus: Add user bio as summary field
							
							
							
							
							
							
							
							Fixes problem with bio federation. 
							
						 | 
						
							2017-12-03 13:34:17 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lain Iwakura
								
							 
						 | 
						
							
							
							
							
								
							
							
								c680ae581d
								
							
						 | 
						
							
							
								
								Return xml notice at /notice path.
							
							
							
							
							
						 | 
						
							2017-11-27 17:24:52 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								747a68a075
								
							
						 | 
						
							
							
								
								Treat internal emoji like external.
							
							
							
							
							
						 | 
						
							2017-11-20 17:53:21 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thog
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								59770c3f5c
								
							
						 | 
						
							
							
								
								Fix all compilation warnings
							
							
							
							
							
						 | 
						
							2017-11-19 02:22:07 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								41b8a76e96
								
							
						 | 
						
							
							
								
								Re-fetch user data on salmon decode error.
							
							
							
							
							
						 | 
						
							2017-11-09 08:32:54 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								9be286a900
								
							
						 | 
						
							
							
								
								Handle empty terms / tags.
							
							
							
							
							
						 | 
						
							2017-11-01 09:33:29 +01:00 | 
						
						
							
							
							
								
							
							
						 |