lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								6dd1575c64
								
							
						 | 
						
							
							
								
								Merge branch 'issue/1509' into 'develop'
							
							
							
							
							
							
							
							[#1509]  purge media from cache after delete
See merge request pleroma/pleroma!2539 
							
						 | 
						
							2020-05-20 10:35:36 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								9b76565264
								
							
						 | 
						
							
							
								
								MediaController: enforced owner-only access in :show action.
							
							
							
							
							
							
							
							Improved error response on denied access (now 403). Adjusted tests. 
							
						 | 
						
							2020-05-18 09:51:53 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								cb40602a16
								
							
						 | 
						
							
							
								
								added media proxy invalidation
							
							
							
							
							
						 | 
						
							2020-05-15 21:39:42 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								5102468d0f
								
							
						 | 
						
							
							
								
								Polls: Persist and show voters' count
							
							
							
							
							
						 | 
						
							2020-04-22 14:06:39 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								764a50f8a6
								
							
						 | 
						
							
							
								
								Merge branch 'feature/1482-activity_pub_transactions' into 'develop'
							
							
							
							
							
							
							
							ActivityPub actions & side-effects in transaction
Closes #1482
See merge request pleroma/pleroma!2089 
							
						 | 
						
							2020-03-02 07:58:01 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6da6540036
								
							
						 | 
						
							
							
								
								Bump copyright years of files changed after 2020-01-07
							
							
							
							
							
							
							
							Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>' 
							
						 | 
						
							2020-03-02 06:08:45 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								ba87ed7335
								
							
						 | 
						
							
							
								
								fix for compiling
							
							
							
							
							
						 | 
						
							2020-03-01 12:01:39 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								32d1e04817
								
							
						 | 
						
							
							
								
								ActivityPub actions & side-effects in transaction
							
							
							
							
							
						 | 
						
							2020-03-01 12:01:39 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								7c3991f59e
								
							
						 | 
						
							
							
								
								[#1505] Fixed replies serialization (included objects' ids instead of activities' ids).
							
							
							
							
							
						 | 
						
							2020-02-09 10:17:21 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roman Chvanikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								8057157ee3
								
							
						 | 
						
							
							
								
								Make attachments cleanup optional
							
							
							
							
							
						 | 
						
							2020-01-31 01:20:37 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roman Chvanikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								d6a532bf0f
								
							
						 | 
						
							
							
								
								Delete attachments asynchronously
							
							
							
							
							
						 | 
						
							2020-01-19 19:45:20 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roman Chvanikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								81133702d4
								
							
						 | 
						
							
							
								
								Delete attachments after object and cache cleanup
							
							
							
							
							
						 | 
						
							2020-01-17 20:20:37 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roman Chvanikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								0709757e47
								
							
						 | 
						
							
							
								
								Check if object->data is array when looking up attachment objects to delete
							
							
							
							
							
						 | 
						
							2020-01-14 19:53:28 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roman Chvanikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								88f0eed0f2
								
							
						 | 
						
							
							
								
								Delete attachments when status is deleted
							
							
							
							
							
						 | 
						
							2020-01-12 18:48:58 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								9ef912aecf
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into issue/1411
							
							
							
							
							
						 | 
						
							2019-12-11 15:02:53 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								9f99640cfc
								
							
						 | 
						
							
							
								
								ActivityPub: Fix deletes being exempt from MRF
							
							
							
							
							
							
							
							Closes #1461 
							
						 | 
						
							2019-12-05 21:45:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								88f7cf51d4
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into issue/1411
							
							
							
							
							
						 | 
						
							2019-12-01 16:18:16 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								9f29930440
								
							
						 | 
						
							
							
								
								fetcher: move local object checking into a reusable function
							
							
							
							
							
						 | 
						
							2019-11-23 22:55:41 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								320690f7a5
								
							
						 | 
						
							
							
								
								Object: Use inspect to log missing preload.
							
							
							
							
							
						 | 
						
							2019-11-21 14:03:01 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								0937895182
								
							
						 | 
						
							
							
								
								updated fetch_favorites
							
							
							
							
							
						 | 
						
							2019-11-18 16:56:47 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								39e996528c
								
							
						 | 
						
							
							
								
								Fix a migration wiping user info of users that don't have any mutes
							
							
							
							
							
							
							
							And introduce safe_jsonb_set 
							
						 | 
						
							2019-10-18 15:22:07 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								179fa32dd5
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into tests/mastodon_api_controller.ex
							
							
							
							
							
						 | 
						
							2019-09-23 21:41:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								a9c700ff15
								
							
						 | 
						
							
							
								
								Fix wrong argument order when calling NaiveDateTime.diff
							
							
							
							
							
						 | 
						
							2019-09-18 18:52:33 +03: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									minibikini
								
							 
						 | 
						
							
							
							
							
								
							
							
								11e12b5761
								
							
						 | 
						
							
							
								
								Add Pleroma.Plugs.Cache
							
							
							
							
							
						 | 
						
							2019-09-09 18:53:08 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ab2f21e470
								
							
						 | 
						
							
							
								
								tests for mastodon_api_controller.ex
							
							
							
							
							
						 | 
						
							2019-09-06 21:50:00 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								00abe099cd
								
							
						 | 
						
							
							
								
								added tests for ActivityPub.like\unlike
							
							
							
							
							
						 | 
						
							2019-08-27 16:21:03 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								829e997223
								
							
						 | 
						
							
							
								
								[#878] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/object.ex
#	test/web/activity_pub/transmogrifier_test.exs
#	test/web/ostatus/ostatus_test.exs 
							
						 | 
						
							2019-07-09 21:46:16 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								daff85a985
								
							
						 | 
						
							
							
								
								[#878] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity.
							
							
							
							
							
						 | 
						
							2019-07-08 19:53:02 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								5b7b1040b3
								
							
						 | 
						
							
							
								
								[#161] Limited replies depth on incoming federation in order to prevent memory leaks on recursive replies fetching.
							
							
							
							
							
						 | 
						
							2019-06-29 20:04:50 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								65db5e9f52
								
							
						 | 
						
							
							
								
								Resolve merge conflicts
							
							
							
							
							
						 | 
						
							2019-06-01 16:29:58 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								c2b0b82e6a
								
							
						 | 
						
							
							
								
								object: add Object.prune()
							
							
							
							
							
						 | 
						
							2019-05-21 21:38:56 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								63b0b7190c
								
							
						 | 
						
							
							
								
								MastoAPI: Add GET /api/v1/polls/:id
							
							
							
							
							
						 | 
						
							2019-05-21 20:40:35 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								aafe30d94e
								
							
						 | 
						
							
							
								
								Handle poll votes
							
							
							
							
							
						 | 
						
							2019-05-21 14:12:10 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								c3a2052806
								
							
						 | 
						
							
							
								
								If it's an object struct it is already normalized
							
							
							
							
							
						 | 
						
							2019-04-17 15:11:22 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								627e5a0a49
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/database-compaction
							
							
							
							
							
						 | 
						
							2019-04-17 12:22:32 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								45ba10bf47
								
							
						 | 
						
							
							
								
								Fix the issue with HTML scrubber
							
							
							
							
							
						 | 
						
							2019-04-01 11:55:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								568e348588
								
							
						 | 
						
							
							
								
								Increment replies_count on replies (MastoAPI)
							
							
							
							
							
						 | 
						
							2019-03-26 15:27:04 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								3c2350cbee
								
							
						 | 
						
							
							
								
								object: downgrade normalize warning to debug severity
							
							
							
							
							
						 | 
						
							2019-03-23 03:05:15 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								62bccddde0
								
							
						 | 
						
							
							
								
								object: add support for preloading objects when walking an activity graph in normal form
							
							
							
							
							
						 | 
						
							2019-03-22 23:51:12 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a3a9cec483
								
							
						 | 
						
							
							
								
								[Credo] fix Credo.Check.Readability.AliasOrder
							
							
							
							
							
						 | 
						
							2019-03-13 04:26:54 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								6038c8a753
								
							
						 | 
						
							
							
								
								Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec
							
							
							
							
							
						 | 
						
							2019-03-11 09:02:03 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								d53e36bf1e
								
							
						 | 
						
							
							
								
								Revert "Merge branch 'object-creation' into 'develop'"
							
							
							
							
							
							
							
							This reverts merge request !802 
							
						 | 
						
							2019-02-11 08:07:39 +00: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								505a084058
								
							
						 | 
						
							
							
								
								Still do caching in tests.
							
							
							
							
							
						 | 
						
							2019-02-03 18:28:14 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								af10ef8d4e
								
							
						 | 
						
							
							
								
								object: use cached accesses when possible in Object.normalize()
							
							
							
							
							
						 | 
						
							2019-02-01 19:38:57 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								75e4c8f0b2
								
							
						 | 
						
							
							
								
								Activity: all_non_create_by_object_ap_id_q → by_object_ap_id
							
							
							
							
							
						 | 
						
							2019-01-21 07:50:57 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								980b5288ed
								
							
						 | 
						
							
							
								
								update copyright years to 2019
							
							
							
							
							
						 | 
						
							2018-12-31 15:41:47 +00:00 | 
						
						
							
							
							
								
							
							
						 |