Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								92526e0230
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
							
							
							
							
							
						 | 
						
							2021-03-07 11:34:39 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								7f8785fd9b
								
							
						 | 
						
							
							
								
								[#3213] Performance optimization of filtering by hashtags ("any" condition).
							
							
							
							
							
						 | 
						
							2021-03-07 11:33:21 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								5856f51717
								
							
						 | 
						
							
							
								
								[#3213] ActivityPub hashtags filtering refactoring. Test fix.
							
							
							
							
							
						 | 
						
							2021-03-03 23:09:30 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								8d601d3b23
								
							
						 | 
						
							
							
								
								Make the object reference in both render("show.json", _) functions consistently named
							
							
							
							
							
						 | 
						
							2021-03-02 14:14:38 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								85b2387f66
								
							
						 | 
						
							
							
								
								Fix build_application/1 match
							
							
							
							
							
						 | 
						
							2021-03-02 11:37:37 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								882dd46843
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
							
							
							
							
							
						 | 
						
							2021-03-02 08:26:30 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								b1e1db82bc
								
							
						 | 
						
							
							
								
								Store application details in the object under the generator key, not application key
							
							
							
							
							
						 | 
						
							2021-03-01 11:29:10 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								4a9d3a1f28
								
							
						 | 
						
							
							
								
								Merge branch 'features/reports-enhancements' into 'develop'
							
							
							
							
							
							
							
							Enhance reports in Pleroma API: index, show
See merge request pleroma/pleroma!3280 
							
						 | 
						
							2021-02-28 16:45:15 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								6a71aa535b
								
							
						 | 
						
							
							
								
								Merge branch 'admin-api-versioning' into 'develop'
							
							
							
							
							
							
							
							Pleroma APIs versioning
Closes #2509
See merge request pleroma/pleroma!3335 
							
						 | 
						
							2021-02-28 16:22:22 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								050c4b1f14
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/peertube-mpegURL-object' into 'develop'
							
							
							
							
							
							
							
							Video: Handle peertube videos only stashing attachments in x-mpegURL
Closes #2372 and #2535
See merge request pleroma/pleroma!3336 
							
						 | 
						
							2021-02-28 16:18:23 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								e6a14e1cd1
								
							
						 | 
						
							
							
								
								Merge branch 'feat/client_app_details' into 'develop'
							
							
							
							
							
							
							
							Support application field
See merge request pleroma/pleroma!3311 
							
						 | 
						
							2021-02-28 16:17:34 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								d0823d7f1e
								
							
						 | 
						
							
							
								
								Merge branch 'frontendstatic-ignore-api-calls' into 'develop'
							
							
							
							
							
							
							
							Filter out API calls from FrontendStatic plug
Closes #2261
See merge request pleroma/pleroma!3346 
							
						 | 
						
							2021-02-27 19:40:38 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								d35b6254b4
								
							
						 | 
						
							
							
								
								Store the client application data in ActivityStreams format
							
							
							
							
							
						 | 
						
							2021-02-26 18:14:57 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								1552179792
								
							
						 | 
						
							
							
								
								Improved recursion through the api route list
							
							
							
							
							
						 | 
						
							2021-02-25 10:07:29 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								cea31df6a6
								
							
						 | 
						
							
							
								
								Attempt to filter out API calls from FrontendStatic plug
							
							
							
							
							
						 | 
						
							2021-02-24 15:27:53 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								8f88a90ca3
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/config.ex 
							
						 | 
						
							2021-02-23 13:58:35 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								77f3da0358
								
							
						 | 
						
							
							
								
								[#3213] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.
							
							
							
							
							
						 | 
						
							2021-02-23 13:52:28 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								6531eddf36
								
							
						 | 
						
							
							
								
								[#3213] hashtags: altered name type to text. hashtags_objects: removed unused index. HashtagsTableMigrator: records_per_second calculation fix. ActivityPub: hashtags-related options normalization.
							
							
							
							
							
						 | 
						
							2021-02-22 23:26:07 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								7fc9cd0974
								
							
						 | 
						
							
							
								
								Video: Handle peertube videos only stashing attachments in x-mpegURL
							
							
							
							
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2535 
							
						 | 
						
							2021-02-21 23:41:28 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eugenijm
								
							 
						 | 
						
							
							
							
							
								
							
							
								c1d63bbd9a
								
							
						 | 
						
							
							
								
								Reroute /api/pleroma to /api/v1/pleroma
							
							
							
							
							
						 | 
						
							2021-02-21 13:26:23 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								63739c5a58
								
							
						 | 
						
							
							
								
								Tests to validate client disclosure obeys user setting
							
							
							
							
							
						 | 
						
							2021-02-18 17:23:17 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								d5ef02c7a7
								
							
						 | 
						
							
							
								
								Mastodon makes this field null when posting with MastoFE or if you choose to not disclose it, so it's safe to be null by default
							
							
							
							
							
						 | 
						
							2021-02-18 16:35:03 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								998437d4a4
								
							
						 | 
						
							
							
								
								[#3213] Experimental / debug feature: database: [improved_hashtag_timeline: :preselect_hashtag_ids].
							
							
							
							
							
						 | 
						
							2021-02-18 21:03:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								1e6c27181e
								
							
						 | 
						
							
							
								
								expires_in in scheduled status params
							
							
							
							
							
						 | 
						
							2021-02-18 14:59:22 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								8829a408ec
								
							
						 | 
						
							
							
								
								Merge branch 'fix/chats-no-unread-in-openapi' into 'develop'
							
							
							
							
							
							
							
							ChatMessage schema: Add `unread` property
See merge request pleroma/pleroma!3323 
							
						 | 
						
							2021-02-18 09:54:59 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								2ab9499258
								
							
						 | 
						
							
							
								
								OAuthScopesPlug: remove transform_scopes in favor of explicit admin scope definitions
							
							
							
							
							
							
							
							Transforming scopes is no longer necessary since we are dropping
support for accessing admin api without `admin:` prefix in scopes. 
							
						 | 
						
							2021-02-17 21:37:23 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								95a22c1cc2
								
							
						 | 
						
							
							
								
								OpenAPI: Add admin: scope prefix to admin operations
							
							
							
							
							
							
							
							Also splits "Emoji packs" to two categories: "Emoji pack administration"
and "Emoji packs" 
							
						 | 
						
							2021-02-17 21:10:28 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								ff72ce31ca
								
							
						 | 
						
							
							
								
								Enhance reports in Pleroma API: index, show
							
							
							
							
							
						 | 
						
							2021-02-17 18:46:53 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								e7b1f0f5f4
								
							
						 | 
						
							
							
								
								Merge branch 'feat/chat-list-pagination' into 'develop'
							
							
							
							
							
							
							
							Chats: Introduce /api/v2/pleroma/chats which implements pagination
Closes #2140
See merge request pleroma/pleroma!3325 
							
						 | 
						
							2021-02-17 15:36:59 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								158f9f18ee
								
							
						 | 
						
							
							
								
								Merge branch 'remove-conversation-api' into 'develop'
							
							
							
							
							
							
							
							Add API endpoint to remove a conversation
Closes #2488
See merge request pleroma/pleroma!3321 
							
						 | 
						
							2021-02-17 15:14:27 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								d7ad288c84
								
							
						 | 
						
							
							
								
								Chats: Introduce /api/v2/pleroma/chats which implements pagination
							
							
							
							
							
							
							
							Also removes incorrect claim that /api/v1/pleroma/chats supports
pagination and deprecates it.
Closes #2140 
							
						 | 
						
							2021-02-17 16:03:24 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								98ab2b82a6
								
							
						 | 
						
							
							
								
								ChatMessage schema: Add unread property
							
							
							
							
							
							
							
							It is present in the code, but was not documented. 
							
						 | 
						
							2021-02-16 22:41:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								1dac7d1462
								
							
						 | 
						
							
							
								
								[#3213] Fixed hashtags.name lookup (must use citext type to do index scan). Fixed embedded hashtags lookup (lowercasing), adjusted tests.
							
							
							
							
							
						 | 
						
							2021-02-15 21:13:14 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								cf6d3db58f
								
							
						 | 
						
							
							
								
								Add API endpoint to remove a conversation
							
							
							
							
							
						 | 
						
							2021-02-15 21:48:13 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								9b61df1fb6
								
							
						 | 
						
							
							
								
								App is already preloaded into the token, so avoid an extra query
							
							
							
							
							
						 | 
						
							2021-02-12 12:44:45 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								c1d78328ee
								
							
						 | 
						
							
							
								
								Consistency
							
							
							
							
							
						 | 
						
							2021-02-11 14:27:52 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								6dc0b13cf8
								
							
						 | 
						
							
							
								
								Revert to original formatting for these function defs
							
							
							
							
							
						 | 
						
							2021-02-11 14:24:51 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								7c508319a5
								
							
						 | 
						
							
							
								
								Prefer naming this put_application because we're putting it into the params map
							
							
							
							
							
						 | 
						
							2021-02-11 14:19:53 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								09b8378646
								
							
						 | 
						
							
							
								
								%Token{} may not be in the conn, so avoid breaking the ability to post statuses in that scenario.
							
							
							
							
							
						 | 
						
							2021-02-11 14:15:25 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								5992382cf8
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
							
							
							
							
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	lib/mix/tasks/pleroma/database.ex
#	lib/pleroma/web/templates/feed/feed/_activity.rss.eex 
							
						 | 
						
							2021-02-11 19:31:57 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								df89b5019b
								
							
						 | 
						
							
							
								
								[#2510] Improved support for app-bound OAuth tokens. Auth-related refactoring.
							
							
							
							
							
						 | 
						
							2021-02-11 15:02:50 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								2cf753c502
								
							
						 | 
						
							
							
								
								Merge branch 'fix/no-version-api-pleroma-social' into 'develop'
							
							
							
							
							
							
							
							Fix no version number on api.pleroma.social
See merge request pleroma/pleroma!3310 
							
						 | 
						
							2021-02-10 00:52:59 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								4540e08a6a
								
							
						 | 
						
							
							
								
								Rendering fallback for when we don't have valid data available
							
							
							
							
							
						 | 
						
							2021-02-09 18:52:22 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								981349f21d
								
							
						 | 
						
							
							
								
								Enable rendering of the client application data details
							
							
							
							
							
						 | 
						
							2021-02-09 18:22:41 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								3dc7e89c54
								
							
						 | 
						
							
							
								
								Ensure we capture the application details into the object
							
							
							
							
							
						 | 
						
							2021-02-09 18:07:15 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								de8b8e9cf1
								
							
						 | 
						
							
							
								
								Add a function to lookup client app details by the app_id
							
							
							
							
							
						 | 
						
							2021-02-09 16:59:58 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								a853218701
								
							
						 | 
						
							
							
								
								Merge branch 'features/ap_id-c2s-authentication' into 'develop'
							
							
							
							
							
							
							
							activity_pub_controller: Add authentication to object & activity endpoints
See merge request pleroma/pleroma!3295 
							
						 | 
						
							2021-02-09 19:29:43 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								0d9230aed9
								
							
						 | 
						
							
							
								
								OpenAPI spec: Do not show build enviroment in the spec version
							
							
							
							
							
						 | 
						
							2021-02-09 22:23:11 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								593c0851d9
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into 'new-user-emails'
							
							
							
							
							
						 | 
						
							2021-02-08 16:01:50 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn
								
							 
						 | 
						
							
							
							
							
								
							
							
								a5bee1bf35
								
							
						 | 
						
							
							
								
								Merge branch 'feat/mrf-noemptypolicy' into 'develop'
							
							
							
							
							
							
							
							MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions.
See merge request pleroma/pleroma!3309 
							
						 | 
						
							2021-02-08 21:49:20 +00:00 | 
						
						
							
							
							
								
							
							
						 |