Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								f2134e605b
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
							
							
							
							
							
						 | 
						
							2021-05-31 16:49:46 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								51a9f97e87
								
							
						 | 
						
							
							
								
								Deprecate Pleroma.Web.base_url/0
							
							
							
							
							
							
							
							Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles. 
							
						 | 
						
							2021-05-31 16:48:03 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								a996ab46a5
								
							
						 | 
						
							
							
								
								[#3213] Reorganized hashtags cleanup. Transaction-wrapped Hashtag.get_or_create_by_names/1. Misc. improvements.
							
							
							
							
							
						 | 
						
							2021-02-11 19:30:21 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								9948ff3356
								
							
						 | 
						
							
							
								
								[#3213] Added HashtagsCleanupWorker periodic job.
							
							
							
							
							
						 | 
						
							2021-01-31 18:24:19 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ea4785213a
								
							
						 | 
						
							
							
								
								[#3213] Switched to using embedded hashtags in Object.hashtags/1
							
							
							
							
							
							
							
							(to avoid extra joins / preload in timeline queries). 
							
						 | 
						
							2021-01-25 20:12:09 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ca7f240643
								
							
						 | 
						
							
							
								
								[#3213] Ignoring of blank elements from objects.data->tag.
							
							
							
							
							
						 | 
						
							2021-01-21 20:50:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								e350898828
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
							
							
							
							
							
						 | 
						
							2021-01-13 22:11:16 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c4439c630f
								
							
						 | 
						
							
							
								
								Bump Copyright to 2021
							
							
							
							
							
							
							
							grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;' 
							
						 | 
						
							2021-01-13 07:49:50 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								0d521022fe
								
							
						 | 
						
							
							
								
								[#3213] Removed PK from hashtags_objects table. Improved hashtags_transfer mix task (logging of failed ids).
							
							
							
							
							
						 | 
						
							2021-01-07 12:20:29 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								e1e7e4d379
								
							
						 | 
						
							
							
								
								Object: Rework how Object.normalize works
							
							
							
							
							
							
							
							Now it defaults to not fetching, and the option is named. 
							
						 | 
						
							2021-01-04 13:38:31 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								8d1a0c1afd
								
							
						 | 
						
							
							
								
								[#3213] Made Object.object_data_hashtags/1 handle both AS2 and plain text hashtags.
							
							
							
							
							
						 | 
						
							2020-12-30 15:22:49 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								e0b5edb6d5
								
							
						 | 
						
							
							
								
								[#3213] Fixed Object.object_data_hashtags/1 to process only AS2 elements of data.tag (basing on #2984).
							
							
							
							
							
						 | 
						
							2020-12-30 14:42:35 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								3966add048
								
							
						 | 
						
							
							
								
								Revert "Merge branch 'features/hashtag-column' into 'develop'"
							
							
							
							
							
							
							
							This reverts merge request !2824 
							
						 | 
						
							2020-12-28 12:02:16 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								b122b6ffa3
								
							
						 | 
						
							
							
								
								Merge branch 'features/hashtag-column' into 'develop'
							
							
							
							
							
							
							
							Insert text representation of hashtags into object["hashtags"]
See merge request pleroma/pleroma!2824 
							
						 | 
						
							2020-12-28 10:14:58 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								18b536c176
								
							
						 | 
						
							
							
								
								Pleroma.Object/1: take %Object{} as argument instead
							
							
							
							
							
						 | 
						
							2020-12-28 11:05:24 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								14fae94c0e
								
							
						 | 
						
							
							
								
								[#3213] Made Object.hashtags/1 work with :hashtags assoc. Adjusted tests.
							
							
							
							
							
						 | 
						
							2020-12-28 00:08:09 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								4134abef63
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
							
							
							
							
							
						 | 
						
							2020-12-26 22:23:05 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								e369b1306b
								
							
						 | 
						
							
							
								
								Added Hashtag entity and objects-hashtags association with auto-sync with data.tag on Object update.
							
							
							
							
							
						 | 
						
							2020-12-22 22:04:33 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								87b13c5430
								
							
						 | 
						
							
							
								
								Create Object.hashtags/1 wrapper
							
							
							
							
							
						 | 
						
							2020-12-22 05:15:34 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ee221277b0
								
							
						 | 
						
							
							
								
								Encapsulation of tags / hashtags fetching from objects.
							
							
							
							
							
						 | 
						
							2020-12-21 22:54:26 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								713612c377
								
							
						 | 
						
							
							
								
								Cachex: Make caching provider switchable at runtime.
							
							
							
							
							
							
							
							Defaults to Cachex. 
							
						 | 
						
							2020-12-18 17:44:46 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								5221879c35
								
							
						 | 
						
							
							
								
								Fix linting.
							
							
							
							
							
						 | 
						
							2020-08-05 15:40:32 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								b5f0cef156
								
							
						 | 
						
							
							
								
								Apply 1 suggestion(s) to 1 file(s)
							
							
							
							
							
						 | 
						
							2020-08-05 11:33:21 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								4644a8bd10
								
							
						 | 
						
							
							
								
								Fix multiple-choice poll detection
							
							
							
							
							
						 | 
						
							2020-07-15 11:39:55 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 |