Alibek Omarov 
								
							 
						 
						
							
							
							
							
								
							
							
								1c223331fc 
								
							 
						 
						
							
							
								
								API: show info about privileged staff in instance metadata  
							
							
							
						 
						
							2021-12-27 02:28:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								de006443f0 
								
							 
						 
						
							
							
								
								MastoAPI: Profile directory  
							
							
							
						 
						
							2021-12-26 02:35:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								73609211a4 
								
							 
						 
						
							
							
								
								Merge branch 'account-notes' into 'develop'  
							
							... 
							
							
							
							MastoAPI: Add user notes on accounts
See merge request pleroma/pleroma!3540  
							
						 
						
							2021-12-25 01:41:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								b96a58ff28 
								
							 
						 
						
							
							
								
								Merge branch 'account-subscriptions' into 'develop'  
							
							... 
							
							
							
							MastoAPI: accept notify param in follow request
See merge request pleroma/pleroma!3555  
							
						 
						
							2021-12-25 01:34:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								50892a198d 
								
							 
						 
						
							
							
								
								Merge branch 'mkljczk-develop-patch-64464' into 'develop'  
							
							... 
							
							
							
							Add "exposable_reactions" to features, if showing reactions
See merge request pleroma/pleroma!3523  
							
						 
						
							2021-12-19 18:51:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								bd853199d9 
								
							 
						 
						
							
							
								
								Merge branch 'v2-suggestions' into 'develop'  
							
							... 
							
							
							
							V2 suggestions
See merge request pleroma/pleroma!3547  
							
						 
						
							2021-12-19 17:31:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								7c1d804554 
								
							 
						 
						
							
							
								
								Merge branch 'fix-search-dos' into 'develop'  
							
							... 
							
							
							
							Search: limit number of results (prevent DoS)
See merge request pleroma/pleroma!3563  
							
						 
						
							2021-12-19 17:30:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								108dfd1f87 
								
							 
						 
						
							
							
								
								Search: limit number of results  
							
							
							
						 
						
							2021-12-12 22:50:07 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								de60b1f3c1 
								
							 
						 
						
							
							
								
								make search provider configurable  
							
							
							
						 
						
							2021-12-12 17:35:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								fce13cce46 
								
							 
						 
						
							
							
								
								add extra filters  
							
							
							
						 
						
							2021-12-12 17:35:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								449d8ff165 
								
							 
						 
						
							
							
								
								integrate search endpoint with ES  
							
							
							
						 
						
							2021-12-12 17:35:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								c96e52b88c 
								
							 
						 
						
							
							
								
								Add 'notifying' to relationship for compatibility with Mastodon  
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-12-06 21:24:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								64a4c147b1 
								
							 
						 
						
							
							
								
								MastoAPI: accept notify param in follow request  
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-12-06 19:36:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6519f59d91 
								
							 
						 
						
							
							
								
								v2 Suggestions: return is_suggested through the API  
							
							
							
						 
						
							2021-11-26 23:10:01 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8dc1d2201a 
								
							 
						 
						
							
							
								
								Instance: add v2_suggestions feature  
							
							
							
						 
						
							2021-11-26 22:45:49 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e5a7547fbe 
								
							 
						 
						
							
							
								
								v2 Suggestions: also filter out users you follow  
							
							
							
						 
						
							2021-11-26 21:46:08 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								437c1a5a52 
								
							 
						 
						
							
							
								
								v2 Suggestions: actually flter out dismissed suggestions  
							
							
							
						 
						
							2021-11-26 21:09:37 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								aee55b9a8b 
								
							 
						 
						
							
							
								
								v2 Suggestions: dismiss a suggestion  
							
							
							
						 
						
							2021-11-26 20:19:29 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e28d990ecb 
								
							 
						 
						
							
							
								
								v2 Suggestions: don't skip visibility check  
							
							
							
						 
						
							2021-11-26 14:46:29 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b17360cd7c 
								
							 
						 
						
							
							
								
								v2 Suggestions: rudimentary API response  
							
							
							
						 
						
							2021-11-26 14:34:10 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7e1caddc58 
								
							 
						 
						
							
							
								
								v2 Suggestions: return empty array  
							
							
							
						 
						
							2021-11-25 14:57:36 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								588bcbac55 
								
							 
						 
						
							
							
								
								Apply 2 suggestion(s) to 2 file(s)  
							
							
							
						 
						
							2021-11-22 10:54:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								8e040e098b 
								
							 
						 
						
							
							
								
								Lint  
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-11-21 18:17:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								40414bf177 
								
							 
						 
						
							
							
								
								MastoAPI: Add user notes on accounts  
							
							... 
							
							
							
							Signed-off-by: marcin mikołajczak <git@mkljczk.pl> 
							
						 
						
							2021-11-21 16:56:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a17910a6c6 
								
							 
						 
						
							
							
								
								CI: Bump lint stage to elixir-1.12  
							
							... 
							
							
							
							Elixir 1.12 changed formatting rules, this allows to avoid having to rollback to run `mix format` 
							
						 
						
							2021-10-06 08:11:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								555d7d57c9 
								
							 
						 
						
							
							
								
								Add "exposable_reactions" to features, if showing reactions  
							
							
							
						 
						
							2021-09-09 18:35:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								6b3842cf50 
								
							 
						 
						
							
							
								
								Merge branch 'remove/mastofe' into 'develop'  
							
							... 
							
							
							
							Remove MastoFE from Pleroma, fixes  #2625 
Closes  #2625 
See merge request pleroma/pleroma!3392  
							
						 
						
							2021-09-07 16:41:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2e59cdd80f 
								
							 
						 
						
							
							
								
								Fix aliases sorting  
							
							
							
						 
						
							2021-08-29 07:22:03 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								33f063204e 
								
							 
						 
						
							
							
								
								Add unit test for Pleroma API app controller  
							
							
							
						 
						
							2021-08-28 23:18:12 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a14e1c0003 
								
							 
						 
						
							
							
								
								Move GET /api/v1/apps to GET /api/v1/pleroma/apps  
							
							
							
						 
						
							2021-08-28 18:02:36 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								eab6291094 
								
							 
						 
						
							
							
								
								Require follow and read OAuth scopes for GET /api/v1/apps  
							
							
							
						 
						
							2021-08-28 11:13:25 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6519732045 
								
							 
						 
						
							
							
								
								GET /api/v1/apps endpoint  
							
							
							
						 
						
							2021-08-25 21:01:04 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								01175ef498 
								
							 
						 
						
							
							
								
								Streamer: fix crash in MastodonAPI.StatusView  
							
							... 
							
							
							
							Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3508  
							
						 
						
							2021-08-13 17:58:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								61ba54897e 
								
							 
						 
						
							
							
								
								Merge branch 'streamer-crash-fix' into 'develop'  
							
							... 
							
							
							
							Streamer crash fix
See merge request pleroma/pleroma!3508  
							
						 
						
							2021-08-13 15:42:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b7bbf42acd 
								
							 
						 
						
							
							
								
								Streamer: fix crash in MastodonAPI.StatusView  
							
							
							
						 
						
							2021-08-13 10:25:42 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								901204df22 
								
							 
						 
						
							
							
								
								Merge branch 'poll-notification' into 'develop'  
							
							... 
							
							
							
							MastodonAPI: Support poll notification
See merge request pleroma/pleroma!3484  
							
						 
						
							2021-08-09 10:02:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
							
							
								
							
							
								1841bd8383 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe  
							
							
							
						 
						
							2021-08-06 08:08:20 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ad09bdb376 
								
							 
						 
						
							
							
								
								Improve readability  
							
							
							
						 
						
							2021-08-06 07:59:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f4028c908c 
								
							 
						 
						
							
							
								
								Add key- and valuePlaceholders for quarantined_instances and mrf_simple  
							
							... 
							
							
							
							* I also added for keywordpolicy as well now. It was done in the admin-fe, but is better to be done here
* I also added comments to explain why we did the _info keys (backwards compatibility) 
							
						 
						
							2021-08-06 07:59:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								03030b47c2 
								
							 
						 
						
							
							
								
								quarantine instances info  
							
							... 
							
							
							
							Added a new field in the nodeinfo called quarantined_instances_info
This holds an object like `"quarantined_instances_info":{"quarantined_instances":{"quar.inst":{"reason":"whatever reason"}}}}` 
							
						 
						
							2021-08-06 07:59:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7fdc3cde06 
								
							 
						 
						
							
							
								
								Return maps in node_info  
							
							... 
							
							
							
							It's easiest (and imo most proper) to use tuples {"instance, "reason"} in BE,
but for FE maps like %{"instance": "instance", "reason", "reason"} are better.
I changed it so that node_info returns maps now for simple_policy and quarantined instances. 
							
						 
						
							2021-08-06 07:59:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								62bf6d67e3 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes  
							
							
							
						 
						
							2021-07-18 11:49:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0114754db2 
								
							 
						 
						
							
							
								
								MastodonAPI: Support poll notification  
							
							
							
						 
						
							2021-07-17 22:19:38 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
							
							
								
							
							
								5d279a22b1 
								
							 
						 
						
							
							
								
								Merge develop branch upstream  
							
							
							
						 
						
							2021-07-10 11:04:16 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									marcin mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								6ef8e1776d 
								
							 
						 
						
							
							
								
								fix the fucking list timelines on mastofe/soapbox-fe  
							
							
							
						 
						
							2021-07-02 13:03:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								45b7325b9e 
								
							 
						 
						
							
							
								
								Refactor skipped plugs into Pleroma.Web functions  
							
							... 
							
							
							
							Speeds up recompilation by reducing compile cycles 
							
						 
						
							2021-06-08 19:15:04 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								b99f60615c 
								
							 
						 
						
							
							
								
								Fix order of Pleroma.Web.Utils.Params aliases  
							
							
							
						 
						
							2021-06-08 12:50:47 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								ec65b7ae29 
								
							 
						 
						
							
							
								
								Pleroma.Web.Params --> Pleroma.Web.Utils.Params  
							
							
							
						 
						
							2021-06-08 12:50:47 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								0877b120c3 
								
							 
						 
						
							
							
								
								Pleroma.Web.ControllerHelper.truthy_param?/1 --> Pleroma.Web.Params.truthy_param?/1  
							
							... 
							
							
							
							Breaks cycle in lib/pleroma/web/api_spec/operations/status_operation.ex 
							
						 
						
							2021-06-08 12:50:47 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2e310b3ec8 
								
							 
						 
						
							
							
								
								Fix more build errors  
							
							
							
						 
						
							2021-06-04 15:06:55 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dc4814f0cd 
								
							 
						 
						
							
							
								
								Fix merge conflicts with upstream  
							
							
							
						 
						
							2021-06-04 14:42:44 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2743c66693 
								
							 
						 
						
							
							
								
								Add "chat" back as a feature for backwards compat.  
							
							... 
							
							
							
							Legacy PleromaFE uses this to identify if ShoutBox is available. 
							
						 
						
							2021-06-01 13:17:50 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d6432a65da 
								
							 
						 
						
							
							
								
								Move shout configuration from :instance, update docs and changelog  
							
							
							
						 
						
							2021-06-01 11:49:46 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ff00b354fa 
								
							 
						 
						
							
							
								
								Rename the non-federating Chat feature to Shout  
							
							
							
						 
						
							2021-06-01 11:49:14 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f2134e605b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into cycles-base-url  
							
							
							
						 
						
							2021-05-31 16:49:46 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								51a9f97e87 
								
							 
						 
						
							
							
								
								Deprecate Pleroma.Web.base_url/0  
							
							... 
							
							
							
							Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles. 
							
						 
						
							2021-05-31 16:48:03 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2e682788a3 
								
							 
						 
						
							
							
								
								Merge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f'; commit 'e3173a279dad89dfce6eae89368ad3ba180c0490'; commit '21787546c01069d1d1d8261f0bc37d13a73122a9'; commit 'fda34591cefad94277385311c6391d1ca2adb36c'; commit '0ada3fe823a3c2e6c5835431bdacfbdb8b3d02a7'; commit '32d263cb905dd7fffd43a4955295af0b2b378537'; commit 'c9e4200ed2167772294fceb4f282979b5ea04981'; commit '3ff9c5e2a67ab83c2abdb14cd246dea059079e75'; commit 'fa543a936124abee524f9a103c17d2601176dcd4'; commit 'c23b81e399d5be6fc30f4acb1d757d5eb291d8e1' into cycles-phase-1  
							
							
							
						 
						
							2021-05-30 12:58:24 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								5d40ffe429 
								
							 
						 
						
							
							
								
								Merge branch 'cycles-views' into 'develop'  
							
							... 
							
							
							
							Recompilation speedup: Create real Views for all Controllers
See merge request pleroma/pleroma!3425  
							
						 
						
							2021-05-29 21:50:07 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1a69f59221 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into cycles-html  
							
							
							
						 
						
							2021-05-29 12:29:58 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3ff9c5e2a6 
								
							 
						 
						
							
							
								
								Break out activity-specific HTML functions into Pleroma.Activity.HTML  
							
							... 
							
							
							
							Fixes cycles in lib/pleroma/ecto_type/activity_pub/object_validators/safe_text.ex 
							
						 
						
							2021-05-29 12:29:11 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7c96c82b5b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into cycles-views  
							
							
							
						 
						
							2021-05-29 12:17:24 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c9e4200ed2 
								
							 
						 
						
							
							
								
								Create real Views for all Controllers  
							
							... 
							
							
							
							This makes views depend on each other at runtime instead of compile-time 
							
						 
						
							2021-05-29 12:15:57 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								edcdd15e01 
								
							 
						 
						
							
							
								
								Merge branch 'alias-router-helpers' into 'develop'  
							
							... 
							
							
							
							Switch to aliasing `Router.Helpers` instead of importing
See merge request pleroma/pleroma!3409  
							
						 
						
							2021-05-28 19:01:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								05d678c070 
								
							 
						 
						
							
							
								
								Expose user email address to user/owner; not publicly.  
							
							
							
						 
						
							2021-05-20 12:50:43 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ad7d4ff8bc 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into alias-router-helpers  
							
							
							
						 
						
							2021-05-19 12:49:00 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								07fed0fda2 
								
							 
						 
						
							
							
								
								Switch to aliasing Router.Helpers instead of importing  
							
							
							
						 
						
							2021-05-18 17:45:30 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ff02511057 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into attachment-meta  
							
							
							
						 
						
							2021-05-12 20:10:52 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								02b9436494 
								
							 
						 
						
							
							
								
								Don't render media meta if nil  
							
							
							
						 
						
							2021-05-12 16:16:10 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ab9eabdf20 
								
							 
						 
						
							
							
								
								Add SetMeta filter to store uploaded image sizes  
							
							
							
						 
						
							2021-05-12 15:07:31 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								79376b4afb 
								
							 
						 
						
							
							
								
								Merge branch 'feature/521-pinned-post-federation' into 'develop'  
							
							... 
							
							
							
							Pinned posts federation
Closes  #521 
See merge request pleroma/pleroma!3312  
							
						 
						
							2021-04-16 09:53:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8afa3f2d1b 
								
							 
						 
						
							
							
								
								Remove no longer necessary unit tests for MastoFE  
							
							
							
						 
						
							2021-04-15 23:12:42 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4f55d5123b 
								
							 
						 
						
							
							
								
								Remove MastoFE-related backend code and frontend pieces  
							
							
							
						 
						
							2021-04-15 22:56:21 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								0feafcc20c 
								
							 
						 
						
							
							
								
								Use URI.merge to prevent concatenating two canonical URLs when a custom instance thumbnail was uploaded via AdminFE  
							
							
							
						 
						
							2021-04-09 10:30:27 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3adb43cc20 
								
							 
						 
						
							
							
								
								refetch user on incoming add/remove activity  
							
							... 
							
							
							
							if featured_address is nil 
							
						 
						
							2021-03-25 13:03:41 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3ec1dbd922 
								
							 
						 
						
							
							
								
								Let pins federate  
							
							... 
							
							
							
							- save object ids on pin, instead of activity ids
- pins federation
- removed pinned_activities field from the users table
- activityPub endpoint for user pins
- pulling remote users pins 
							
						 
						
							2021-03-25 13:03:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								b80f868c6b 
								
							 
						 
						
							
							
								
								Prefer naming this function build_image_url/2  
							
							
							
						 
						
							2021-03-13 12:27:15 -06: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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								92ab72dbbb 
								
							 
						 
						
							
							
								
								Update OpenApiSpex dependency  
							
							
							
						 
						
							2021-03-05 15:51:29 +04: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d35b6254b4 
								
							 
						 
						
							
							
								
								Store the client application data in ActivityStreams format  
							
							
							
						 
						
							2021-02-26 18:14:57 -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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								63739c5a58 
								
							 
						 
						
							
							
								
								Tests to validate client disclosure obeys user setting  
							
							
							
						 
						
							2021-02-18 17:23:17 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d5ef02c7a7 
								
							 
						 
						
							
							
								
								Mastodon makes this field null when posting with MastoFE or if you choose to not disclose it, so it's safe to be null by default  
							
							
							
						 
						
							2021-02-18 16:35:03 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1e6c27181e 
								
							 
						 
						
							
							
								
								expires_in in scheduled status params  
							
							
							
						 
						
							2021-02-18 14:59:22 +03: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cf6d3db58f 
								
							 
						 
						
							
							
								
								Add API endpoint to remove a conversation  
							
							
							
						 
						
							2021-02-15 21:48:13 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								9b61df1fb6 
								
							 
						 
						
							
							
								
								App is already preloaded into the token, so avoid an extra query  
							
							
							
						 
						
							2021-02-12 12:44:45 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								c1d78328ee 
								
							 
						 
						
							
							
								
								Consistency  
							
							
							
						 
						
							2021-02-11 14:27:52 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6dc0b13cf8 
								
							 
						 
						
							
							
								
								Revert to original formatting for these function defs  
							
							
							
						 
						
							2021-02-11 14:24:51 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								7c508319a5 
								
							 
						 
						
							
							
								
								Prefer naming this put_application because we're putting it into the params map  
							
							
							
						 
						
							2021-02-11 14:19:53 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								09b8378646 
								
							 
						 
						
							
							
								
								%Token{} may not be in the conn, so avoid breaking the ability to post statuses in that scenario.  
							
							
							
						 
						
							2021-02-11 14:15:25 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								5992382cf8 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	lib/mix/tasks/pleroma/database.ex
#	lib/pleroma/web/templates/feed/feed/_activity.rss.eex 
							
						 
						
							2021-02-11 19:31:57 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								df89b5019b 
								
							 
						 
						
							
							
								
								[ #2510 ] Improved support for app-bound OAuth tokens. Auth-related refactoring.  
							
							
							
						 
						
							2021-02-11 15:02:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								008499f65a 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'fix/2412-filters'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2021-02-03 14:23:23 +00: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 
								
							 
						 
						
							
							
							
							
								
							
							
								cd5ff7a943 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'feature/2164-unify-api-arguments'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2021-02-02 17:11:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2cb6dc5a3a 
								
							 
						 
						
							
							
								
								list timeline filtration by params  
							
							
							
						 
						
							2021-02-01 14:11:12 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								1b49b8efe5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 
						
							2021-01-31 20:38:58 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								793fc77b16 
								
							 
						 
						
							
							
								
								Add active user count  
							
							
							
						 
						
							2021-01-27 18:20:06 +04: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								694d98be55 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							
							
						 
						
							2021-01-25 21:24:07 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								28581e03ad 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/deactivated_user_field  
							
							
							
						 
						
							2021-01-18 14:58:21 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d36182c088 
								
							 
						 
						
							
							
								
								Change user.confirmation_pending field to user.is_confirmed  
							
							
							
						 
						
							2021-01-15 12:44:41 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								860b5c7804 
								
							 
						 
						
							
							
								
								Change user.deactivated field to user.is_active  
							
							
							
						 
						
							2021-01-15 11:24:46 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e350898828 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							
							
						 
						
							2021-01-13 22:11:16 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c4439c630f 
								
							 
						 
						
							
							
								
								Bump Copyright to 2021  
							
							... 
							
							
							
							grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/ >;' 
							
						 
						
							2021-01-13 07:49:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cf0eb0c1c5 
								
							 
						 
						
							
							
								
								Merge branch 'object-normalize-refactor' into 'develop'  
							
							... 
							
							
							
							Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229  
							
						 
						
							2021-01-07 11:09:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e1e7e4d379 
								
							 
						 
						
							
							
								
								Object: Rework how Object.normalize works  
							
							... 
							
							
							
							Now it defaults to not fetching, and the option is named. 
							
						 
						
							2021-01-04 13:38:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cbce880076 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into aliases  
							
							
							
						 
						
							2020-12-30 17:10:02 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								3966add048 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'features/hashtag-column' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !2824  
							
						 
						
							2020-12-28 12:02:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								b122b6ffa3 
								
							 
						 
						
							
							
								
								Merge branch 'features/hashtag-column' into 'develop'  
							
							... 
							
							
							
							Insert text representation of hashtags into object["hashtags"]
See merge request pleroma/pleroma!2824  
							
						 
						
							2020-12-28 10:14:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								18b536c176 
								
							 
						 
						
							
							
								
								Pleroma.Object/1: take %Object{} as argument instead  
							
							
							
						 
						
							2020-12-28 11:05:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								4134abef63 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							
							
						 
						
							2020-12-26 22:23:05 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								87b13c5430 
								
							 
						 
						
							
							
								
								Create Object.hashtags/1 wrapper  
							
							
							
						 
						
							2020-12-22 05:15:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								acb03d591b 
								
							 
						 
						
							
							
								
								Insert text representation of hashtags into object["hashtags"]  
							
							... 
							
							
							
							Includes a new mix task: pleroma.database fill_old_hashtags 
							
						 
						
							2020-12-22 05:15:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								ee221277b0 
								
							 
						 
						
							
							
								
								Encapsulation of tags / hashtags fetching from objects.  
							
							
							
						 
						
							2020-12-21 22:54:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c9d73af74d 
								
							 
						 
						
							
							
								
								Cachex: Unify arity of callback function  
							
							
							
						 
						
							2020-12-21 12:03:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								713612c377 
								
							 
						 
						
							
							
								
								Cachex: Make caching provider switchable at runtime.  
							
							... 
							
							
							
							Defaults to Cachex. 
							
						 
						
							2020-12-18 17:44:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6dac2ac71a 
								
							 
						 
						
							
							
								
								Minor refactoring of the logic for hiding followers/following counts.  
							
							... 
							
							
							
							Field is not nullable anymore, and this is more readable. 
							
						 
						
							2020-12-14 13:27:42 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								f1b07a2b2b 
								
							 
						 
						
							
							
								
								OAuth form user remembering feature. Local MastoFE login / logout fixes.  
							
							
							
						 
						
							2020-11-28 21:51:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								12a5981cc3 
								
							 
						 
						
							
							
								
								Session token setting on token exchange. Auth-related refactoring.  
							
							
							
						 
						
							2020-11-25 21:47:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e164c37139 
								
							 
						 
						
							
							
								
								[ #2301 ] Proper handling of User.is_discoverable: users appear in in-service search but are hidden from external services like search bots.  
							
							
							
						 
						
							2020-11-19 19:30:02 +03:00