Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								b93498eb52
								
							
						 | 
						
							
							
								
								constants: add as_public constant and use it everywhere
							
							
							
							
							
						 | 
						
							2019-07-29 02:43:19 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								c32384c1ea
								
							
						 | 
						
							
							
								
								tests for Pleroma.Signature
							
							
							
							
							
						 | 
						
							2019-07-15 13:01:22 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								abe2e8881f
								
							
						 | 
						
							
							
								
								Testing: Don't federate in testing.
							
							
							
							
							
						 | 
						
							2019-07-09 15:30:51 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								2c63c67512
								
							
						 | 
						
							
							
								
								Rework user deletion
							
							
							
							
							
						 | 
						
							2019-06-24 18:59:12 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad19bfc7fe
								
							
						 | 
						
							
							
								
								Utils: Split update_follow_state and update_follow_state_for_all.
							
							
							
							
							
						 | 
						
							2019-06-05 16:43:35 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								29b022bb59
								
							
						 | 
						
							
							
								
								Restrict get_existing_votes to only get Create activities
							
							
							
							
							
						 | 
						
							2019-06-04 12:42:10 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								37a4ba0624
								
							
						 | 
						
							
							
								
								utils: access inReplyTo as an explicit string when fetching poll results`
							
							
							
							
							
						 | 
						
							2019-06-04 08:45:03 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								300d94c628
								
							
						 | 
						
							
							
								
								Add poll votes
							
							
							
							
							
							
							
							Also in this commit by accident:
- Fix query ordering causing exclude_poll_votes to not work
- Do not create notifications for Answer objects 
							
						 | 
						
							2019-06-01 16:17:46 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								19c90d47c4
								
							
						 | 
						
							
							
								
								Normalize poll votes to Answer objects
							
							
							
							
							
						 | 
						
							2019-05-22 21:17:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								5ece901af3
								
							
						 | 
						
							
							
								
								Resolve merge conflicts and remove IO.inspects
							
							
							
							
							
						 | 
						
							2019-05-18 13:37:38 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								e2b3a27204
								
							
						 | 
						
							
							
								
								Add Reports to Admin API
							
							
							
							
							
						 | 
						
							2019-05-16 19:09:18 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								62e42b03ab
								
							
						 | 
						
							
							
								
								Handle incoming Question objects
							
							
							
							
							
						 | 
						
							2019-05-15 20:10:16 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								498bfdf403
								
							
						 | 
						
							
							
								
								Switch to Jason over Poison
							
							
							
							
							
						 | 
						
							2019-05-13 15:37:38 -05: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								36c0a10fdf
								
							
						 | 
						
							
							
								
								adding language tag
							
							
							
							
							
						 | 
						
							2019-04-08 11:03:10 +00: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								cd387f8693
								
							
						 | 
						
							
							
								
								Add a fake option to lazy_put_actvity_defaults
							
							
							
							
							
						 | 
						
							2019-03-30 13:57:54 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								e4307cadc8
								
							
						 | 
						
							
							
								
								activitypub: splice in the child object if we have one
							
							
							
							
							
						 | 
						
							2019-03-23 00:40:08 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								379442ad17
								
							
						 | 
						
							
							
								
								activitypub: utils: also match Activity objects
							
							
							
							
							
						 | 
						
							2019-03-14 19:29:04 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								f86f7dbb8f
								
							
						 | 
						
							
							
								
								activitypub: utils: rework make_flag_data to accept either activity payloads or IRIs
							
							
							
							
							
						 | 
						
							2019-03-14 19:05:42 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a3a9cec483
								
							
						 | 
						
							
							
								
								[Credo] fix Credo.Check.Readability.AliasOrder
							
							
							
							
							
						 | 
						
							2019-03-13 04:26:54 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ekaterina Vaartis
								
							 
						 | 
						
							
							
							
							
								
							
							
								5021b7836f
								
							
						 | 
						
							
							
								
								Fetch user's outbox posts on first federation with that user
							
							
							
							
							
						 | 
						
							2019-03-08 16:27:56 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								33c614bce0
								
							
						 | 
						
							
							
								
								Stop adresssing like activities to actor's follower collection on non-public posts
							
							
							
							
							
						 | 
						
							2019-03-04 18:09:58 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor
								
							 
						 | 
						
							
							
							
							
								
							
							
								bff9eb5ef7
								
							
						 | 
						
							
							
								
								Reports
							
							
							
							
							
						 | 
						
							2019-02-20 16:51:25 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								833161b5d2
								
							
						 | 
						
							
							
								
								Merge branch 'feature/jobs' into 'develop'
							
							
							
							
							
							
							
							Job Queue
See merge request pleroma/pleroma!732 
							
						 | 
						
							2019-02-18 19:43:06 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								d53e36bf1e
								
							
						 | 
						
							
							
								
								Revert "Merge branch 'object-creation' into 'develop'"
							
							
							
							
							
							
							
							This reverts merge request !802 
							
						 | 
						
							2019-02-11 08:07:39 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								305d219413
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/web/federator/federator.ex
#	lib/pleroma/web/websub/websub.ex 
							
						 | 
						
							2019-02-11 13:54:21 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								6c8d15da11
								
							
						 | 
						
							
							
								
								Merge branch 'fix/credo-issues' into 'develop'
							
							
							
							
							
							
							
							Fix credo issues
See merge request pleroma/pleroma!786 
							
						 | 
						
							2019-02-10 20:54:21 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								f8388be9c6
								
							
						 | 
						
							
							
								
								Do object insertion through Cachex
							
							
							
							
							
							
							
							So we don't flood our postgres logs with errors. Should also make things
slightly faster. 
							
						 | 
						
							2019-02-09 22:01:08 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6a6a5b3251
								
							
						 | 
						
							
							
								
								de-group alias/es
							
							
							
							
							
						 | 
						
							2019-02-09 16:31:17 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								3a3a3996b7
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/federator/federator.ex 
							
						 | 
						
							2019-02-04 20:50:28 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								505a084058
								
							
						 | 
						
							
							
								
								Still do caching in tests.
							
							
							
							
							
						 | 
						
							2019-02-03 18:28:14 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								d3677d2b4d
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'MAIN/develop' into feature/jobs
							
							
							
							
							
						 | 
						
							2019-01-31 15:07:49 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								57549f6043
								
							
						 | 
						
							
							
								
								activitypub: utils: update the state of *any* pending follow relationship that matches the actor and target
							
							
							
							
							
						 | 
						
							2019-01-29 12:21:02 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								55affbca7f
								
							
						 | 
						
							
							
								
								add a job queue
							
							
							
							
							
						 | 
						
							2019-01-28 22:17:17 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								2de208817c
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into rename/pleroma_activity_consistency
							
							
							
							
							
						 | 
						
							2019-01-23 13:05:58 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f8ab1b7427
								
							
						 | 
						
							
							
								
								Activity: get_all_by_object_ap_id/1 → get_all_create_by_object_ap_id/1
							
							
							
							
							
						 | 
						
							2019-01-21 08:00:38 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b82c6dc536
								
							
						 | 
						
							
							
								
								Activity: all_by_object_ap_id/1 → get_all_by_object_ap_id/1
							
							
							
							
							
						 | 
						
							2019-01-21 07:49:59 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								8d06be35e0
								
							
						 | 
						
							
							
								
								activitypub: utils: add determine_explicit_mentions() and tests
							
							
							
							
							
						 | 
						
							2019-01-20 02:27:48 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								2479e88815
								
							
						 | 
						
							
							
								
								activitypub: announce: add new public parameter
							
							
							
							
							
						 | 
						
							2019-01-17 23:21:31 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sxsdv1
								
							 
						 | 
						
							
							
							
							
								
							
							
								581edd5a91
								
							
						 | 
						
							
							
								
								Add route to get object like activities
							
							
							
							
							
						 | 
						
							2019-01-12 20:24:38 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								980b5288ed
								
							
						 | 
						
							
							
								
								update copyright years to 2019
							
							
							
							
							
						 | 
						
							2018-12-31 15:41:47 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								2791ce9a1f
								
							
						 | 
						
							
							
								
								add license boilerplate to pleroma core
							
							
							
							
							
						 | 
						
							2018-12-23 20:56:42 +00:00 | 
						
						
							
							
							
								
							
							
						 |