Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								ef659331b0
								
							
						 | 
						
							
							
								
								implement invisible support for remote users
							
							
							
							
							
						 | 
						
							2019-10-19 23:21:37 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								4b8524f392
								
							
						 | 
						
							
							
								
								ActivityPub / Transmogrifier: Correctly store incoming Update id.
							
							
							
							
							
						 | 
						
							2019-10-05 14:49:45 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								83631752af
								
							
						 | 
						
							
							
								
								removed legacy api: "/objects/:uuid/likes"
							
							
							
							
							
						 | 
						
							2019-10-04 22:35:26 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								568a995d64
								
							
						 | 
						
							
							
								
								ActivityPub: Change addressing of Undo.
							
							
							
							
							
						 | 
						
							2019-10-04 16:32:42 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thibaut Girka
								
							 
						 | 
						
							
							
							
							
								
							
							
								427d0c2a00
								
							
						 | 
						
							
							
								
								Store private announcements in object.data["announcements"], filter them on display
							
							
							
							
							
						 | 
						
							2019-10-01 22:39:25 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								1f9de2a8cd
								
							
						 | 
						
							
							
								
								activitypub: implement IR-level considerations for Listen activities
							
							
							
							
							
						 | 
						
							2019-09-30 10:39:17 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								95a4a19417
								
							
						 | 
						
							
							
								
								Merge branch 'support/tests' into 'develop'
							
							
							
							
							
							
							
							add tests for activity_pub/utils.ex
See merge request pleroma/pleroma!1627 
							
						 | 
						
							2019-09-17 14:47:26 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								8751809e1e
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into support/tests
							
							
							
							
							
						 | 
						
							2019-09-15 14:22:15 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								6bcedb693c
								
							
						 | 
						
							
							
								
								[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
							
							
							
							
							
							
							
							# Conflicts:
#	docs/config.md
#	mix.lock 
							
						 | 
						
							2019-09-14 16:11:44 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								39dc9b470c
								
							
						 | 
						
							
							
								
								Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils
							
							
							
							
							
						 | 
						
							2019-09-13 12:44:59 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ae506ca997
								
							
						 | 
						
							
							
								
								fix formatting
							
							
							
							
							
						 | 
						
							2019-09-04 21:40:53 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								e2011a667c
								
							
						 | 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/utils.ex
							
							
							
							
							
						 | 
						
							2019-09-04 18:35:01 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								8306078de1
								
							
						 | 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/utils.ex
							
							
							
							
							
						 | 
						
							2019-09-04 17:31:14 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								a890451187
								
							
						 | 
						
							
							
								
								fetch_announcements -> take_announcements
							
							
							
							
							
						 | 
						
							2019-09-04 17:42:27 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								8cbad5500c
								
							
						 | 
						
							
							
								
								add tests for activity_pub/utils.ex
							
							
							
							
							
						 | 
						
							2019-09-04 15:25:12 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								e890ea7e82
								
							
						 | 
						
							
							
								
								[#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
							
							
							
							
							
							
							
							# Conflicts:
#	config/config.exs 
							
						 | 
						
							2019-08-31 14:25:43 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								00abe099cd
								
							
						 | 
						
							
							
								
								added tests for ActivityPub.like\unlike
							
							
							
							
							
						 | 
						
							2019-08-27 16:21:03 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								256ff09aa8
								
							
						 | 
						
							
							
								
								[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/scheduled_activity_worker.ex
#	lib/pleroma/web/federator/retry_queue.ex
#	lib/pleroma/web/oauth/token/clean_worker.ex
#	test/user_test.exs
#	test/web/federator_test.exs 
							
						 | 
						
							2019-08-22 20:59:58 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								bd5ad0af78
								
							
						 | 
						
							
							
								
								Cache follow state
							
							
							
							
							
						 | 
						
							2019-08-15 00:47:30 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								267262491e
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
							
							
							
							
							
						 | 
						
							2019-08-09 20:09:56 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								b7fad8d395
								
							
						 | 
						
							
							
								
								[#1149] Oban jobs implementation for :federator_incoming and :federator_outgoing queues.
							
							
							
							
							
						 | 
						
							2019-08-09 20:08:01 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								4f1b9c54b9
								
							
						 | 
						
							
							
								
								Do not rembed the object after updating it
							
							
							
							
							
						 | 
						
							2019-08-07 01:02:29 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 |