rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								72143dd732 
								
							 
						 
						
							
							
								
								Merge branch 'richmedia-workaround' into 'develop'  
							
							... 
							
							
							
							Workaround for RichMedia preview image breakage edge case
See merge request pleroma/pleroma!3363  
							
						 
						
							2021-03-21 08:19:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d7e51206a2 
								
							 
						 
						
							
							
								
								respect content-type header in finger request  
							
							
							
						 
						
							2021-03-19 18:53:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								a9bc652ab9 
								
							 
						 
						
							
							
								
								Merge branch 'mediaproxy-decode' into 'develop'  
							
							... 
							
							
							
							Simple way to decode mediaproxy URLs
See merge request pleroma/pleroma!3364  
							
						 
						
							2021-03-19 08:52:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f930e83fa2 
								
							 
						 
						
							
							
								
								Merge branch 'fix/remove_auto_nsfw' into 'develop'  
							
							... 
							
							
							
							Remove sensitive setting #nsfw
See merge request pleroma/pleroma!3223  
							
						 
						
							2021-03-19 08:48:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								67bde35e71 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/bridgy-user-icon' into 'develop'  
							
							... 
							
							
							
							Add support for actor icon being a list (Bridgy)
See merge request pleroma/pleroma!3372  
							
						 
						
							2021-03-19 08:36:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								a2aa309496 
								
							 
						 
						
							
							
								
								Merge branch 'update_open_api_spex' into 'develop'  
							
							... 
							
							
							
							Update OpenApiSpex dependency
See merge request pleroma/pleroma!3362  
							
						 
						
							2021-03-16 01:54:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								55bdfb075c 
								
							 
						 
						
							
							
								
								OpenAPI: TwitterAPI Util Controller  
							
							
							
						 
						
							2021-03-15 06:47:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								65cd9cb638 
								
							 
						 
						
							
							
								
								TwitterAPI: Remove unused read notification function  
							
							
							
						 
						
							2021-03-15 06:47:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a22c53810b 
								
							 
						 
						
							
							
								
								Remove deprecated /api/qvitter/statuses/notifications/read  
							
							
							
						 
						
							2021-03-15 06:47:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e4743847a1 
								
							 
						 
						
							
							
								
								OpenAPI: PleromaAPI UserImport Controller  
							
							
							
						 
						
							2021-03-15 06:47:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3123ecdd6e 
								
							 
						 
						
							
							
								
								OpenAPI: MastodonAPI Media Controller  
							
							
							
						 
						
							2021-03-15 06:47:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7eecc3b61d 
								
							 
						 
						
							
							
								
								OpenAPI: MastodonAPI Timeline Controller  
							
							
							
						 
						
							2021-03-15 06:47:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b1d4b2b81e 
								
							 
						 
						
							
							
								
								Add support for actor icon being a list (Bridgy)  
							
							
							
						 
						
							2021-03-15 06:44:05 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								b80f868c6b 
								
							 
						 
						
							
							
								
								Prefer naming this function build_image_url/2  
							
							
							
						 
						
							2021-03-13 12:27:15 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								cb73456609 
								
							 
						 
						
							
							
								
								[ #3213 ] Code formatting fix.  
							
							
							
						 
						
							2021-03-12 12:25:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3edf45021e 
								
							 
						 
						
							
							
								
								[ #3213 ] Background migration infrastructure refactoring.  
							
							... 
							
							
							
							Extracted BaseMigrator and BaseMigratorState. 
							
						 
						
							2021-03-12 12:18:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								029ff65389 
								
							 
						 
						
							
							
								
								Leverage function pattern matching instead  
							
							
							
						 
						
							2021-03-11 09:20:29 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								8246db2a96 
								
							 
						 
						
							
							
								
								Workaround for URI.merge/2 bug  https://github.com/elixir-lang/elixir/issues/10771  
							
							... 
							
							
							
							If we avoid URI.merge unless we know we need it we reduce the edge cases we could encounter.
The site would need to both have "//" in the %URI{:path} and the image needs to be a relative URL. 
							
						 
						
							2021-03-10 17:15:31 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								946e0aab49 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							
							
						 
						
							2021-03-10 07:48:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								7f413139fb 
								
							 
						 
						
							
							
								
								Merge branch 'openapi/admin/user' into 'develop'  
							
							... 
							
							
							
							Add OpenAPI spec for AdminAPI.UserController
See merge request pleroma/pleroma!3355  
							
						 
						
							2021-03-10 03:24:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								e97b34f65d 
								
							 
						 
						
							
							
								
								Add simple way to decode fully qualified mediaproxy URLs  
							
							
							
						 
						
							2021-03-05 13:18:37 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								92ab72dbbb 
								
							 
						 
						
							
							
								
								Update OpenApiSpex dependency  
							
							
							
						 
						
							2021-03-05 15:51:29 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9876fa8e90 
								
							 
						 
						
							
							
								
								Add UserOperation to Redoc  
							
							
							
						 
						
							2021-03-04 21:13:53 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								5856f51717 
								
							 
						 
						
							
							
								
								[ #3213 ] ActivityPub hashtags filtering refactoring. Test fix.  
							
							
							
						 
						
							2021-03-03 23:09:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								13aa98d689 
								
							 
						 
						
							
							
								
								Merge branch 'mergeback/2.3.0' into 'develop'  
							
							... 
							
							
							
							Mergeback/2.3.0
See merge request pleroma/pleroma!3360  
							
						 
						
							2021-03-03 15:07:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2e296c079f 
								
							 
						 
						
							
							
								
								Revert "StatusController: Deactivate application support for now."  
							
							... 
							
							
							
							This reverts commit 024c11c18d 
							
						 
						
							2021-03-03 15:33:06 +01: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3aae5231b2 
								
							 
						 
						
							
							
								
								Add OpenAPI spec for AdminAPI.UserController  
							
							
							
						 
						
							2021-03-02 20:49:17 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7dac83eb6e 
								
							 
						 
						
							
							
								
								Linting.  
							
							
							
						 
						
							2021-03-02 15:03:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								024c11c18d 
								
							 
						 
						
							
							
								
								StatusController: Deactivate application support for now.  
							
							... 
							
							
							
							Some more things to discuss about, so we'll remove it from 2.3.0 
							
						 
						
							2021-03-02 14:40:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								882dd46843 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							
							
						 
						
							2021-03-02 08:26:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								1dc5794e29 
								
							 
						 
						
							
							
								
								Never forward the client's user-agent through the media proxy  
							
							
							
						 
						
							2021-03-01 21:05:46 +01: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3bc7d12271 
								
							 
						 
						
							
							
								
								Remove sensitive-property setting #nsfw, create HashtagPolicy  
							
							
							
						 
						
							2021-02-27 21:26:17 +01: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								da5d21a1cf 
								
							 
						 
						
							
							
								
								don't use continue in Stats init for test env  
							
							
							
						 
						
							2021-02-27 09:39:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d35b6254b4 
								
							 
						 
						
							
							
								
								Store the client application data in ActivityStreams format  
							
							
							
						 
						
							2021-02-26 18:14:57 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								840686ecd5 
								
							 
						 
						
							
							
								
								Merge branch 'fix/2498-expires_in-scheduled-posts' into 'develop'  
							
							... 
							
							
							
							expires_in in scheduled status params
Closes  #2498 
See merge request pleroma/pleroma!3315  
							
						 
						
							2021-02-26 16:49:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								76b166f040 
								
							 
						 
						
							
							
								
								Note our upgrade path for this functionality  
							
							
							
						 
						
							2021-02-25 13:08:36 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2da71a526f 
								
							 
						 
						
							
							
								
								No need to filter out Mix.env() from the API routes.  
							
							
							
						 
						
							2021-02-25 13:04:08 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								1552179792 
								
							 
						 
						
							
							
								
								Improved recursion through the api route list  
							
							
							
						 
						
							2021-02-25 10:07:29 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6b87dfad5d 
								
							 
						 
						
							
							
								
								Filter out MIX_ENV from route list and add a test  
							
							
							
						 
						
							2021-02-25 09:23:10 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								8ad1613717 
								
							 
						 
						
							
							
								
								Enum instead of Stream  
							
							
							
						 
						
							2021-02-25 09:06:56 -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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								0ef783baa1 
								
							 
						 
						
							
							
								
								[ #2534 ] Earlier init of Pleroma.Web.Endpoint (must be started prior to Pleroma.Web.Streamer).  
							
							
							
						 
						
							2021-02-22 23:09:41 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								73aef0503c 
								
							 
						 
						
							
							
								
								Exiftool also cannot strip from heic files.  
							
							
							
						 
						
							2021-02-20 14:29:35 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								369581db6d 
								
							 
						 
						
							
							
								
								Show a proper error. A failure doesn't always mean the command isn't available, and we check for it on startup  
							
							
							
						 
						
							2021-02-20 14:27:42 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								26b620d676 
								
							 
						 
						
							
							
								
								Permit :disclose_client in changesets  
							
							
							
						 
						
							2021-02-18 17:50:46 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								63739c5a58 
								
							 
						 
						
							
							
								
								Tests to validate client disclosure obeys user setting  
							
							
							
						 
						
							2021-02-18 17:23:17 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								83301fe61a 
								
							 
						 
						
							
							
								
								Add field to user schema for controlling disclosure of client details  
							
							
							
						 
						
							2021-02-18 16:43:41 -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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								b981edad8a 
								
							 
						 
						
							
							
								
								[ #3213 ] HashtagsTableMigrator: fault rate allowance to enable the feature (defaults to 1%), counting of affected objects, misc. tweaks.  
							
							
							
						 
						
							2021-02-18 20:40:10 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								6d66fadea7 
								
							 
						 
						
							
							
								
								Remove :auth, :enforce_oauth_admin_scope_usage  
							
							... 
							
							
							
							`admin` scope has been required by default for more than a year now
and all apps that use the API seems to request a proper scope by now. 
							
						 
						
							2021-02-17 20:47:38 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								264cb2c77f 
								
							 
						 
						
							
							
								
								Merge branch '2510-oauth-app-tokens-further-support' into 'develop'  
							
							... 
							
							
							
							[#2510 ] Improved support for app-bound OAuth tokens
Closes  #2510 
See merge request pleroma/pleroma!3316  
							
						 
						
							2021-02-17 13:08:51 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								854ea1aefb 
								
							 
						 
						
							
							
								
								[ #3213 ] Fixed HashtagsTableMigrator.count/1.  
							
							
							
						 
						
							2021-02-17 09:23:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								111bfdd3a0 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							
							
						 
						
							2021-02-16 23:23:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								938823c730 
								
							 
						 
						
							
							
								
								[ #3213 ] HashtagsTableMigrator state management refactoring & improvements (proper stats serialization etc.).  
							
							
							
						 
						
							2021-02-16 23:14:15 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								284504f689 
								
							 
						 
						
							
							
								
								[ #2053 ] Changed Notification/for_user_query/2 to use join to filter out inactive actors instead of subselect of _all_ inactive AP ids from users.  
							
							
							
						 
						
							2021-02-15 09:08:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								349b8b0f4f 
								
							 
						 
						
							
							
								
								[ #3213 ] rescue around potentially-raising Repo.insert_all/_ calls. Misc. improvements (docs etc.).  
							
							
							
						 
						
							2021-02-13 22:01:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3554a65f45 
								
							 
						 
						
							
							
								
								Inject fake application metadata and validate it is stripped by transmogrifier  
							
							
							
						 
						
							2021-02-12 13:05:12 -06: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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								4cacce4b42 
								
							 
						 
						
							
							
								
								Revert "Add plaintext support for all emails except the digest"  
							
							... 
							
							
							
							This reverts commit 5df9f68392 
							
						 
						
							2021-02-08 16:39:55 -06: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								55a13fc360 
								
							 
						 
						
							
							
								
								MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions.  
							
							... 
							
							
							
							Helps prevent accidental button mashes from submitting incomplete posts 
							
						 
						
							2021-02-08 15:32:47 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								17f41a589f 
								
							 
						 
						
							
							
								
								Merge branch 'fix/rss-link' into 'develop'  
							
							... 
							
							
							
							RSS: Make sure post URL is the first `<link>` element
See merge request pleroma/pleroma!3308  
							
						 
						
							2021-02-08 20:14:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ed8ef80b5e 
								
							 
						 
						
							
							
								
								RSS: Make sure post URL is the first <link> element  
							
							... 
							
							
							
							Otherwise some RSS readers (tested in Miniflux) might pick the context
URL as the external link.
Related to #2425 . 
							
						 
						
							2021-02-08 22:44:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8c7b3b20d8 
								
							 
						 
						
							
							
								
								activity_pub_controller: Add authentication to object & activity endpoints  
							
							
							
						 
						
							2021-02-08 20:00:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								8babd796da 
								
							 
						 
						
							
							
								
								Merge branch 'fix/reports-from-admins' into 'develop'  
							
							... 
							
							
							
							Suppress report notification for admin actors
See merge request pleroma/pleroma!3301  
							
						 
						
							2021-02-08 10:31:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								d1c6dd97aa 
								
							 
						 
						
							
							
								
								[ #3213 ] Partially addressed code review points.  
							
							... 
							
							
							
							migration rollback task changes, hashtags-related config handling tweaks, `hashtags.data` deletion (unused). 
							
						 
						
							2021-02-07 22:24:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								6e68058b63 
								
							 
						 
						
							
							
								
								Merge branch 'feat/allow_alt_text_search_config' into 'develop'  
							
							... 
							
							
							
							allow user defined text search config in database
See merge request pleroma/pleroma!3275  
							
						 
						
							2021-02-06 09:42:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									hyperion 
								
							 
						 
						
							
							
							
							
								
							
							
								8d4e0342e1 
								
							 
						 
						
							
							
								
								Update priv/repo/migrations/20190501125843_add_fts_index_to_objects.exs, priv/repo/optional_migrations/rum_indexing/20190510135645_add_fts_index_to_objects_two.exs files  
							
							
							
						 
						
							2021-02-06 09:42:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								0368419fce 
								
							 
						 
						
							
							
								
								Slightly better formatting  
							
							
							
						 
						
							2021-02-05 09:13:53 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								5df9f68392 
								
							 
						 
						
							
							
								
								Add plaintext support for all emails except the digest  
							
							
							
						 
						
							2021-02-05 09:13:17 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								95930a7aa5 
								
							 
						 
						
							
							
								
								Actually send the mail  
							
							
							
						 
						
							2021-02-04 17:42:09 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								e945ccc91b 
								
							 
						 
						
							
							
								
								Add a registration email that only sends if no other emails (welcome, approval, confirmation) are enabled  
							
							
							
						 
						
							2021-02-04 15:16:50 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2956c21a55 
								
							 
						 
						
							
							
								
								Improve confirmation email language  
							
							
							
						 
						
							2021-02-04 15:10:43 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								af37a5c51a 
								
							 
						 
						
							
							
								
								Also make this maybe_ for consistency  
							
							
							
						 
						
							2021-02-04 14:33:49 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								b22b12f738 
								
							 
						 
						
							
							
								
								These welcome emails are not guaranteed and can be private functions  
							
							
							
						 
						
							2021-02-04 14:01:15 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d047372291 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into fix/reports-from-admins  
							
							
							
						 
						
							2021-02-04 12:37:20 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								bf9cd4a0e2 
								
							 
						 
						
							
							
								
								Standardize the way we capture and use Mix.env()  
							
							
							
						 
						
							2021-02-04 10:13:03 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								7b67bf4e97 
								
							 
						 
						
							
							
								
								Merge branch 'fix/configdb-error' into 'develop'  
							
							... 
							
							
							
							Improve error message for ConfigDB
See merge request pleroma/pleroma!3289  
							
						 
						
							2021-02-04 14:33:59 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								ea5469961a 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/notice-external-redirect' into 'develop'  
							
							... 
							
							
							
							Redirect non-local activities when /notice/:id is used
See merge request pleroma/pleroma!3300  
							
						 
						
							2021-02-04 14:26:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ecff027418 
								
							 
						 
						
							
							
								
								Redirect non-local activities when /notice/:id is used  
							
							... 
							
							
							
							Related-to: https://git.pleroma.social/pleroma/pleroma/-/issues/2496  
							
						 
						
							2021-02-04 15:17:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								887db076b5 
								
							 
						 
						
							
							
								
								Load an emoji.txt specific to the test env  
							
							
							
						 
						
							2021-02-03 16:40:59 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								76f732766b 
								
							 
						 
						
							
							
								
								Exclude reporter from receiving notifications from their own reports.  
							
							... 
							
							
							
							Currently only works if the reporting actor is an admin, but if we include
moderators with those who receive notification reports it will work for them. 
							
						 
						
							2021-02-03 12:32:44 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								74ef1a044d 
								
							 
						 
						
							
							
								
								Account schema: specify that pleroma.relationship is nullable  
							
							
							
						 
						
							2021-02-03 18:10:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								008499f65a 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'fix/2412-filters'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2021-02-03 14:23:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								c3dd860a02 
								
							 
						 
						
							
							
								
								Merge branch 'fix/2449-scheduled-poll-bug' into 'develop'  
							
							... 
							
							
							
							Fix for scheduled post with poll
Closes  #2449 
See merge request pleroma/pleroma!3294  
							
						 
						
							2021-02-03 14:22:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								8d2ea95402 
								
							 
						 
						
							
							
								
								Merge branch 'feature/2438-users-posts-total-count' into 'develop'  
							
							... 
							
							
							
							Feature/2438 users/instances posts total count
Closes  #2438 
See merge request pleroma/pleroma!3270  
							
						 
						
							2021-02-03 14:21:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e2d7c4fd57 
								
							 
						 
						
							
							
								
								Merge branch 'feat/openapi-spec-export' into 'develop'  
							
							... 
							
							
							
							Improve OpenAPI spec and deploy it to api.pleroma.social
See merge request pleroma/pleroma!3296  
							
						 
						
							2021-02-03 13:21:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								9fcff7851f 
								
							 
						 
						
							
							
								
								Improve OpenAPI spec and deploy it to api.pleroma.social  
							
							... 
							
							
							
							Too many changes in OpenAPI spec to describe each one, but
basically it is tag fixes, bringing consitency to operation summaries
and fixing some incorrect information. 
							
						 
						
							2021-02-03 16:07:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								4e14945670 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/activity_pub/activity_pub.ex 
							
						 
						
							2021-02-03 09:31:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								f1f773f2c7 
								
							 
						 
						
							
							
								
								Merge branch 'email-stub-in-verify-credentials' into 'develop'  
							
							... 
							
							
							
							Email-like field in /api/v1/accounts/verify_credentials (for PeerTube OAuth plugin and alike)
See merge request pleroma/pleroma!3286  
							
						 
						
							2021-02-02 18:35:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								d289ad8579 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'fix/2411-mutes-api'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md
#   docs/development/API/differences_in_mastoapi_responses.md 
							
						 
						
							2021-02-02 17:57:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								6a2d3fb9a3 
								
							 
						 
						
							
							
								
								Merge branch 'fix/2473-purge-expired-activities-duplicates' into 'develop'  
							
							... 
							
							
							
							fix and delete purge activities duplicates
Closes  #2473 
See merge request pleroma/pleroma!3285  
							
						 
						
							2021-02-02 17:22:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								cd5ff7a943 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'feature/2164-unify-api-arguments'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2021-02-02 17:11:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								2012800ed1 
								
							 
						 
						
							
							
								
								Merge branch 'fix/attachment-cleanup' into 'develop'  
							
							... 
							
							
							
							Only run attachment cleanup if enabled
See merge request pleroma/pleroma!3288  
							
						 
						
							2021-02-02 17:08:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								69c560cfba 
								
							 
						 
						
							
							
								
								Merge branch 'active-user-count' into 'develop'  
							
							... 
							
							
							
							Monthly Active Users
Closes  #2332 
See merge request pleroma/pleroma!3283  
							
						 
						
							2021-02-02 17:07:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0dc68c157f 
								
							 
						 
						
							
							
								
								fix for scheduled post with poll  
							
							
							
						 
						
							2021-02-01 18:22:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fdf1dfed56 
								
							 
						 
						
							
							
								
								only_remote -> remote renaming  
							
							
							
						 
						
							2021-02-01 14:11:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ba512cbea4 
								
							 
						 
						
							
							
								
								/api/v1/accounts/:id/statuses docs update 
							
							
							
						 
						
							2021-02-01 14:11:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								77f0a0af7d 
								
							 
						 
						
							
							
								
								more tests and update for docs and changelog  
							
							
							
						 
						
							2021-02-01 14:11:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2cb6dc5a3a 
								
							 
						 
						
							
							
								
								list timeline filtration by params  
							
							
							
						 
						
							2021-02-01 14:11:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b6a72680e2 
								
							 
						 
						
							
							
								
								added only_media flag to home timeline  
							
							
							
						 
						
							2021-02-01 14:11:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c3110c46f3 
								
							 
						 
						
							
							
								
								expanding filtration for home timeline  
							
							... 
							
							
							
							added local & remote statuses filtration for home timeline 
							
						 
						
							2021-02-01 14:11:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								cf4765af40 
								
							 
						 
						
							
							
								
								[ #3213 ] ActivityPub: fixed subquery-based hashtags filtering implementation (addressed empty list options issue). Added regression test.  
							
							
							
						 
						
							2021-01-31 23:06:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								10207f840c 
								
							 
						 
						
							
							
								
								[ #3213 ] ActivityPub: temporarily reverted to previous hashtags filtering implementation due to blank results issue.  
							
							
							
						 
						
							2021-01-31 22:36:46 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								1b49b8efe5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 
						
							2021-01-31 20:38:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								6fd4163ab6 
								
							 
						 
						
							
							
								
								[ #3213 ] ActivityPub: implemented subqueries-based hashtags filtering, removed aggregation-based hashtags filtering.  
							
							
							
						 
						
							2021-01-31 20:37:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								9948ff3356 
								
							 
						 
						
							
							
								
								[ #3213 ] Added HashtagsCleanupWorker periodic job.  
							
							
							
						 
						
							2021-01-31 18:24:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b794dae98a 
								
							 
						 
						
							
							
								
								like this  
							
							
							
						 
						
							2021-01-29 15:55:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c369d2b930 
								
							 
						 
						
							
							
								
								support for with_relationships parameter  
							
							... 
							
							
							
							in /api/v1/mutes and /api/v1/accounts/:id endpoints 
							
						 
						
							2021-01-29 08:41:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								380d0cce6b 
								
							 
						 
						
							
							
								
								[ #3213 ] Reinstated DISTINCT clause for hashtag "any" filtering with 2+ terms. Added test.  
							
							
							
						 
						
							2021-01-29 00:17:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								5fcab23aa3 
								
							 
						 
						
							
							
								
								Improve error message for ConfigDB  
							
							
							
						 
						
							2021-01-28 14:59:23 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								13d79c281f 
								
							 
						 
						
							
							
								
								Make attachment cleanup jobs a noop if the setting is disabled.  
							
							
							
						 
						
							2021-01-28 14:42:20 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a51d903e0c 
								
							 
						 
						
							
							
								
								Make sure active_user_count/1 counts only local users  
							
							
							
						 
						
							2021-01-28 22:23:10 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								60b4654038 
								
							 
						 
						
							
							
								
								Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube).  
							
							... 
							
							
							
							Addresses https://git.pleroma.social/pleroma/pleroma-support/-/issues/56 . 
							
						 
						
							2021-01-28 19:49:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6c987c7670 
								
							 
						 
						
							
							
								
								fix and delete purge activities duplicates  
							
							
							
						 
						
							2021-01-28 16:57:41 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								39335d4251 
								
							 
						 
						
							
							
								
								fix for unique oban worker option  
							
							
							
						 
						
							2021-01-28 16:57:03 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								35cad9793d 
								
							 
						 
						
							
							
								
								cache headers for emoji and images  
							
							
							
						 
						
							2021-01-27 18:49:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								793fc77b16 
								
							 
						 
						
							
							
								
								Add active user count  
							
							
							
						 
						
							2021-01-27 18:20:06 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d4158e8bf0 
								
							 
						 
						
							
							
								
								added total  
							
							... 
							
							
							
							to the instance adminAPI endpoint 
							
						 
						
							2021-01-27 07:45:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6806c03e85 
								
							 
						 
						
							
							
								
								added total  
							
							... 
							
							
							
							to the user statuses adminAPI endpoint 
							
						 
						
							2021-01-27 07:45:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								d7af0294e6 
								
							 
						 
						
							
							
								
								Merge branch 'service-worker-allowed-header' into 'develop'  
							
							... 
							
							
							
							Ability to set custom HTTP headers per each frontend
See merge request pleroma/pleroma!3247  
							
						 
						
							2021-01-26 18:14:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								229acae6c3 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into '2435-list-multiple-users'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2021-01-26 14:24:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								875fbaae35 
								
							 
						 
						
							
							
								
								support for expires_in/expires_at in filters  
							
							
							
						 
						
							2021-01-26 08:27:45 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								250e202098 
								
							 
						 
						
							
							
								
								Merge branch 'fix/missing-own_votes' into 'develop'  
							
							... 
							
							
							
							Include own_votes in the poll data
See merge request pleroma/pleroma!3274  
							
						 
						
							2021-01-26 00:55:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2cb5c16723 
								
							 
						 
						
							
							
								
								Credo  
							
							
							
						 
						
							2021-01-25 18:25:53 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								0b19534475 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into docs/apache-config  
							
							
							
						 
						
							2021-01-25 17:00:26 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e7864a32d7 
								
							 
						 
						
							
							
								
								[ #3213 ] Removed DISTINCT clause from ActivityPub.fetch_activities_query/2.  
							
							
							
						 
						
							2021-01-25 22:31:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								694d98be55 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							
							
						 
						
							2021-01-25 21:24:07 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3f3d64acbf 
								
							 
						 
						
							
							
								
								little refactor and tests  
							
							... 
							
							
							
							for voted & own_votes fields in polls 
							
						 
						
							2021-01-25 19:46:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								537ba1c5e0 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/deactivated_user_field  
							
							
							
						 
						
							2021-01-25 09:45:06 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								f264d930cc 
								
							 
						 
						
							
							
								
								[ #3213 ] Speedup of HashtagsTableMigrator (query optimization). State handling fix.  
							
							
							
						 
						
							2021-01-24 23:27:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6bfd497f4a 
								
							 
						 
						
							
							
								
								Include own_votes in the poll data  
							
							
							
						 
						
							2021-01-22 09:47:59 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								218c519606 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							... 
							
							
							
							# Conflicts:
#	test/pleroma/web/mastodon_api/views/status_view_test.exs 
							
						 
						
							2021-01-22 10:05:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								80ccdb56f6 
								
							 
						 
						
							
							
								
								Make tag urls absolute  
							
							
							
						 
						
							2021-01-21 16:49:19 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								e5b32aab92 
								
							 
						 
						
							
							
								
								rename function  
							
							
							
						 
						
							2021-01-21 14:41:28 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								003402df40 
								
							 
						 
						
							
							
								
								Add ability to invalidate cache entries for Apache  
							
							
							
						 
						
							2021-01-21 14:20:13 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								7fcaa188a0 
								
							 
						 
						
							
							
								
								Allow to define custom HTTP headers per each frontend  
							
							
							
						 
						
							2021-01-21 21:55:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								133644dfa2 
								
							 
						 
						
							
							
								
								Ability to set the Service-Worker-Allowed header  
							
							
							
						 
						
							2021-01-21 21:55:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								ca7f240643 
								
							 
						 
						
							
							
								
								[ #3213 ] Ignoring of blank elements from objects.data->tag.  
							
							
							
						 
						
							2021-01-21 20:50:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								c041e9c630 
								
							 
						 
						
							
							
								
								[ #3213 ] HashtagsTableMigrator: failures handling fix, retry function.  
							
							... 
							
							
							
							Changed default hashtags filtering strategy to non-aggregate approach. 
							
						 
						
							2021-01-21 20:23:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								2634a16b4c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 
						
							2021-01-21 20:20:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6d48144a9d 
								
							 
						 
						
							
							
								
								use proper naming  
							
							... 
							
							
							
							for MediaProxyWarmingPolicy in ConcurrentLimiter 
							
						 
						
							2021-01-21 09:50:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b4ff63d020 
								
							 
						 
						
							
							
								
								configurable limits for ConcurrentLimiter  
							
							... 
							
							
							
							Pleroma.Web.RichMedia.Helpers & Pleroma.Web.MediaProxy 
							
						 
						
							2021-01-21 09:47:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								2926713fe5 
								
							 
						 
						
							
							
								
								Merge branch 'deprecate-public_endpoint' into 'develop'  
							
							... 
							
							
							
							Deprecate Uploaders.S3, :public_endpoint
See merge request pleroma/pleroma!3251  
							
						 
						
							2021-01-20 22:48:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								704eef3c2d 
								
							 
						 
						
							
							
								
								Special handling for unconfirmed users based on instance config no longer needed.  
							
							
							
						 
						
							2021-01-20 11:14:15 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								e759579f97 
								
							 
						 
						
							
							
								
								Active users must be confirmed  
							
							
							
						 
						
							2021-01-19 16:39:55 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								b830605577 
								
							 
						 
						
							
							
								
								[ #3213 ] Performance-related stat in HashtagsTableMigrator. Reworked count/_ to indicate approximate total count for current iteration.  
							
							
							
						 
						
							2021-01-19 22:03:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								f0f0f2af00 
								
							 
						 
						
							
							
								
								[ #3213 ] timeout option for HashtagsTableMigrator.count/_.  
							
							
							
						 
						
							2021-01-19 21:17:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								7f07909a7b 
								
							 
						 
						
							
							
								
								[ #3213 ] Added HashtagsTableMigrator.count/1.  
							
							
							
						 
						
							2021-01-19 21:13:32 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								958a7f6ed0 
								
							 
						 
						
							
							
								
								Merge branch 'fix/reblog-api' into 'develop'  
							
							... 
							
							
							
							Fix Reblog API
Closes  #2423 
See merge request pleroma/pleroma!3261  
							
						 
						
							2021-01-18 21:19:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								28581e03ad 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/deactivated_user_field  
							
							
							
						 
						
							2021-01-18 14:58:21 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								44a86951a3 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/approval_pending_user_field  
							
							
							
						 
						
							2021-01-18 12:05:05 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1b79dce7bc 
								
							 
						 
						
							
							
								
								Fix Reblog API  
							
							... 
							
							
							
							Do not set visibility parameter to `public` by default and let CommonAPI to infer it from status. 
							
						 
						
							2021-01-18 20:15:57 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								bdfd72630f 
								
							 
						 
						
							
							
								
								ListController: Fix being unable to add / remove users.  
							
							
							
						 
						
							2021-01-18 16:28:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								9d28a7ebfb 
								
							 
						 
						
							
							
								
								[ #3213 ] Missing copyright header for HashtagsTableMigrator.State.  
							
							
							
						 
						
							2021-01-17 21:58:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								85f7ef4d13 
								
							 
						 
						
							
							
								
								[ #3213 ] Feature lock adjustment for HashtagsTableMigrator.  
							
							
							
						 
						
							2021-01-17 10:57:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3f88e33a71 
								
							 
						 
						
							
							
								
								[ #3251 ] Fixed wrong test-env config setting for [Pleroma.Upload]. Refactoring. Added warning to clear_config/_ to minimize such issues in future.  
							
							
							
						 
						
							2021-01-16 23:05:31 +03:00