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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kPherox
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								1915b23e72
								
							
						 | 
						
							
							
								
								test missing first field
							
							
							
							
							
						 | 
						
							2019-11-30 15:43:12 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								3c0abfca53
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/move-activity
							
							
							
							
							
						 | 
						
							2019-11-14 16:39:45 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								b22ee9d966
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into reactions
							
							
							
							
							
						 | 
						
							2019-11-08 13:27:11 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b777083f3f
								
							
						 | 
						
							
							
								
								Add also_known_as field to Pleroma.User
							
							
							
							
							
						 | 
						
							2019-10-25 19:14:18 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								c9280b9730
								
							
						 | 
						
							
							
								
								rework to use properties instead of compound typing, per SocialCG
							
							
							
							
							
						 | 
						
							2019-10-19 23:21:37 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								ef659331b0
								
							
						 | 
						
							
							
								
								implement invisible support for remote users
							
							
							
							
							
						 | 
						
							2019-10-19 23:21:37 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								dbfdb1f6e3
								
							
						 | 
						
							
							
								
								add some missing tesla fixtures
							
							
							
							
							
						 | 
						
							2019-10-18 14:50:10 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								d7f9679ff2
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into 'reactions'
							
							
							
							
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 | 
						
							2019-10-10 12:38:51 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steven Fuchs
								
							 
						 | 
						
							
							
							
							
								
							
							
								dc6d20b68d
								
							
						 | 
						
							
							
								
								provide mocks for webfinger endpoints
							
							
							
							
							
						 | 
						
							2019-10-09 16:32:28 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								91e90aa807
								
							
						 | 
						
							
							
								
								Merge branch 'misskey-compat' into 'reactions'
							
							
							
							
							
							
							
							Transmogrifier: Handle misskey likes with reactions like EmojiReactions.
See merge request pleroma/pleroma!1783 
							
						 | 
						
							2019-10-07 07:25:27 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								61097ba6ab
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into 'reactions'
							
							
							
							
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 | 
						
							2019-10-06 08:11:47 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thibaut Girka
								
							 
						 | 
						
							
							
							
							
								
							
							
								b1ff66dc5f
								
							
						 | 
						
							
							
								
								Add test for handling Announces with inlined object from different origin
							
							
							
							
							
						 | 
						
							2019-10-05 13:56:40 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thibaut Girka
								
							 
						 | 
						
							
							
							
							
								
							
							
								977e711e22
								
							
						 | 
						
							
							
								
								Import object from self-Announce whenever possible
							
							
							
							
							
						 | 
						
							2019-10-05 13:56:40 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								43a211bcb1
								
							
						 | 
						
							
							
								
								Transmogrifier: Handle misskey likes with reactions like EmojiReactions.
							
							
							
							
							
						 | 
						
							2019-10-04 17:01:04 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								557223b2b5
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into reactions
							
							
							
							
							
						 | 
						
							2019-10-02 13:27:55 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								dae744478e
								
							
						 | 
						
							
							
								
								Transmogrifier: Handle compact objects in undos.
							
							
							
							
							
						 | 
						
							2019-09-30 18:13:05 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								b923842e96
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into reactions
							
							
							
							
							
						 | 
						
							2019-09-30 13:57:54 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								7ef575d11e
								
							
						 | 
						
							
							
								
								Initial poll refresh support
							
							
							
							
							
							
							
							Implement refreshing the object with an interval and call the function
when getting the poll. 
							
						 | 
						
							2019-09-18 18:13:21 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								a7f31bf06c
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into reactions
							
							
							
							
							
						 | 
						
							2019-09-13 16:31:27 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								b312ca3d52
								
							
						 | 
						
							
							
								
								Mastodon API Poll view: Fix handling of polls without an end date
							
							
							
							
							
						 | 
						
							2019-09-05 12:03:39 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								a0b21c8928
								
							
						 | 
						
							
							
								
								Transmogrifier: Handle incoming emoji reactions.
							
							
							
							
							
						 | 
						
							2019-08-26 16:47:31 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								3da65292b3
								
							
						 | 
						
							
							
								
								Transmogrifier: Fix follow handling when the actor is an object.
							
							
							
							
							
						 | 
						
							2019-08-26 14:34:52 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								5178f960c3
								
							
						 | 
						
							
							
								
								Support user attachment update in Transmogrifier
							
							
							
							
							
						 | 
						
							2019-08-14 14:52:54 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								139b196bc0
								
							
						 | 
						
							
							
								
								[#1150] fixed parser TwitterCard
							
							
							
							
							
						 | 
						
							2019-08-06 20:19:28 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								301ea0dc04
								
							
						 | 
						
							
							
								
								Add tests for counters being updated on follow
							
							
							
							
							
						 | 
						
							2019-07-31 21:09:13 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								19835be067
								
							
						 | 
						
							
							
								
								Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'
							
							
							
							
							
							
							
							Fix remote follow from /ostatus_subscribe
Closes #1103
See merge request pleroma/pleroma!1472 
							
						 | 
						
							2019-07-24 19:29:01 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								b20020da16
								
							
						 | 
						
							
							
								
								Show the url advertised in the Activity in the Status JSON response
							
							
							
							
							
						 | 
						
							2019-07-24 19:28:21 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kPherox
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								8d9f43e1d1
								
							
						 | 
						
							
							
								
								Add WebFinger test for AP-only account
							
							
							
							
							
						 | 
						
							2019-07-25 01:27:34 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sachin Joshi
								
							 
						 | 
						
							
							
							
							
								
							
							
								18234cc44e
								
							
						 | 
						
							
							
								
								add the rich media ttl based on image exp time
							
							
							
							
							
						 | 
						
							2019-07-17 00:20:34 +05:45 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								a237c6a2d4
								
							
						 | 
						
							
							
								
								support for idna domains
							
							
							
							
							
						 | 
						
							2019-07-10 15:23:25 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								2d2b50ccca
								
							
						 | 
						
							
							
								
								Send and handle "Delete" activity for deleted users
							
							
							
							
							
						 | 
						
							2019-07-10 05:16:08 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								d6b0fce6e9
								
							
						 | 
						
							
							
								
								Fix/1019 correct count remote users
							
							
							
							
							
						 | 
						
							2019-07-09 17:36:35 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								11143c542a
								
							
						 | 
						
							
							
								
								Remove httpoison from dependencies
							
							
							
							
							
						 | 
						
							2019-07-03 14:42:24 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								0e415921cd
								
							
						 | 
						
							
							
								
								Rich Media Parser: Do not return just a title if nothing else is there.
							
							
							
							
							
						 | 
						
							2019-06-22 16:22:59 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								58c4d5312b
								
							
						 | 
						
							
							
								
								Revert "Revert "Merge branch 'fix/ogp-title' into 'develop'""
							
							
							
							
							
							
							
							This reverts commit b6af80f769. 
							
						 | 
						
							2019-06-22 15:12:57 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								b6af80f769
								
							
						 | 
						
							
							
								
								Revert "Merge branch 'fix/ogp-title' into 'develop'"
							
							
							
							
							
							
							
							This reverts merge request !1277 
							
						 | 
						
							2019-06-21 11:36:32 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								a12f8e13c8
								
							
						 | 
						
							
							
								
								Improve <title> fallback; Add a test
							
							
							
							
							
						 | 
						
							2019-06-13 15:02:46 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								026b245dbc
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/polls-2-electric-boogalo
							
							
							
							
							
						 | 
						
							2019-06-03 11:14:52 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								65db5e9f52
								
							
						 | 
						
							
							
								
								Resolve merge conflicts
							
							
							
							
							
						 | 
						
							2019-06-01 16:29:58 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sachin Joshi
								
							 
						 | 
						
							
							
							
							
								
							
							
								d4304a3945
								
							
						 | 
						
							
							
								
								add the missing mock file
							
							
							
							
							
						 | 
						
							2019-06-01 08:37:10 +05:45 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								1690be991e
								
							
						 | 
						
							
							
								
								Replace missing non-nullable Card attributes with empty strings
							
							
							
							
							
						 | 
						
							2019-05-30 21:03:31 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								aafe30d94e
								
							
						 | 
						
							
							
								
								Handle poll votes
							
							
							
							
							
						 | 
						
							2019-05-21 14:12:10 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sadposter
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e81f0fc6d4
								
							
						 | 
						
							
							
								
								Add mascot get/set tests
							
							
							
							
							
						 | 
						
							2019-05-20 12:58:06 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								62e42b03ab
								
							
						 | 
						
							
							
								
								Handle incoming Question objects
							
							
							
							
							
						 | 
						
							2019-05-15 20:10:16 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								be54e40890
								
							
						 | 
						
							
							
								
								twitter api registration
							
							
							
							
							
							
							
							fix for twitter api tests 
							
						 | 
						
							2019-04-06 17:18:59 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sachin Joshi
								
							 
						 | 
						
							
							
							
							
								
							
							
								6386c1c9c1
								
							
						 | 
						
							
							
								
								fetch url for OStatus to know if it is a/c or status
							
							
							
							
							
						 | 
						
							2019-04-02 10:26:09 +05:45 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sachin Joshi
								
							 
						 | 
						
							
							
							
							
								
							
							
								1d01e8e656
								
							
						 | 
						
							
							
								
								[OStatus] adds status to pleroma instance if the url given is a status
							
							
							
							
							
						 | 
						
							2019-04-01 22:26:58 +05:45 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									optikfluffel
								
							 
						 | 
						
							
							
							
							
								
							
							
								a907522690
								
							
						 | 
						
							
							
								
								used imageOptim to reduce size of image files
							
							
							
							
							
						 | 
						
							2019-03-19 10:10:48 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								788a354ce0
								
							
						 | 
						
							
							
								
								Web.RelMe: Fix having other values in rel attr
							
							
							
							
							
							
							
							One example of this is Github which puts a rel="nofollow me" on the
profile link. 
							
						 | 
						
							2019-03-05 02:13:22 +01:00 | 
						
						
							
							
							
								
							
							
						 |