Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e0b5edb6d5 
								
							 
						 
						
							
							
								
								[ #3213 ] Fixed Object.object_data_hashtags/1 to process only AS2 elements of data.tag (basing on  #2984 ).  
							
							
							
						 
						
							2020-12-30 14:42:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								a25c1e8ec0 
								
							 
						 
						
							
							
								
								[ #3213 ] Improved database.transfer_hashtags mix task: proper rollback, speedup.  
							
							
							
						 
						
							2020-12-30 14:35:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								14fae94c0e 
								
							 
						 
						
							
							
								
								[ #3213 ] Made Object.hashtags/1 work with :hashtags assoc. Adjusted tests.  
							
							
							
						 
						
							2020-12-28 00:08:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								4134abef63 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							
							
						 
						
							2020-12-26 22:23:05 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								cbb19d0e18 
								
							 
						 
						
							
							
								
								[ #3213 ] Hashtag-filtering functions in ActivityPub. Mix task for migrating hashtags to hashtags table.  
							
							
							
						 
						
							2020-12-26 22:20:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e4f1d8f48c 
								
							 
						 
						
							
							
								
								Merge branch 'cachex-test' into 'develop'  
							
							... 
							
							
							
							Test framework overhaul (speed, reliability)
See merge request pleroma/pleroma!3209  
							
						 
						
							2020-12-26 10:26:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								fecefe68f8 
								
							 
						 
						
							
							
								
								Add test/instance to .gitignore  
							
							
							
						 
						
							2020-12-23 14:09:22 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								88530c02d6 
								
							 
						 
						
							
							
								
								Merge branch 'update/linkify' into 'develop'  
							
							... 
							
							
							
							Update Linkify to 0.4.1
See merge request pleroma/pleroma!3217  
							
						 
						
							2020-12-23 15:58:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								5b838accc0 
								
							 
						 
						
							
							
								
								Update Linkify to 0.4.1  
							
							... 
							
							
							
							Fixes false positive detection of IPv4 addresses 
							
						 
						
							2020-12-23 09:07:01 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ce1be8f5e6 
								
							 
						 
						
							
							
								
								Merge branch 'mergeback/2.2.1' into 'develop'  
							
							... 
							
							
							
							Mergeback/2.2.1
See merge request pleroma/pleroma!3215  
							
						 
						
							2020-12-23 14:08:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ae934659d1 
								
							 
						 
						
							
							
								
								Align changelog  
							
							
							
						 
						
							2020-12-23 14:56:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								31c89acd00 
								
							 
						 
						
							
							
								
								Merge branch 'stable' into mergeback/2.2.1  
							
							
							
						 
						
							2020-12-23 14:41:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f64237927c 
								
							 
						 
						
							
							
								
								Merge branch 'release/2.2.1' into 'stable'  
							
							... 
							
							
							
							Release/2.2.1
See merge request pleroma/pleroma!3214  
							
						 
						
							2020-12-23 13:35:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								843d2074fe 
								
							 
						 
						
							
							
								
								Fixtures: Add application actor fixture.  
							
							
							
						 
						
							2020-12-23 11:56:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5ada38499b 
								
							 
						 
						
							
							
								
								Merge branch 'release/2.2.1' of git.pleroma.social:pleroma/pleroma into release/2.2.1  
							
							
							
						 
						
							2020-12-23 11:40:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								322463e1bd 
								
							 
						 
						
							
							
								
								Update changelog  
							
							
							
						 
						
							2020-12-23 11:39:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								463eec992a 
								
							 
						 
						
							
							
								
								Apply 1 suggestion(s) to 1 file(s)  
							
							
							
						 
						
							2020-12-23 10:35:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								68eed0873e 
								
							 
						 
						
							
							
								
								Linting  
							
							
							
						 
						
							2020-12-23 11:16:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d4e6ca88a6 
								
							 
						 
						
							
							
								
								Update frontend  
							
							
							
						 
						
							2020-12-23 09:35:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b988e9cc8b 
								
							 
						 
						
							
							
								
								Mix: Update version.  
							
							
							
						 
						
							2020-12-22 22:11:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a8ca282b4a 
								
							 
						 
						
							
							
								
								Update changelog  
							
							
							
						 
						
							2020-12-22 21:54:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d788b41c2e 
								
							 
						 
						
							
							
								
								Report fixes.  
							
							
							
						 
						
							2020-12-22 21:32:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0f527c9e02 
								
							 
						 
						
							
							
								
								Mix: Update linkify to 0.4.1  
							
							
							
						 
						
							2020-12-22 21:22:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								5cfa32cb50 
								
							 
						 
						
							
							
								
								[ #2301 ] Quick fix: users with is_discoverable == false (default!) are included in search results.  
							
							
							
						 
						
							2020-12-22 21:16:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								897b62091b 
								
							 
						 
						
							
							
								
								fix for elixir 1.11  
							
							... 
							
							
							
							load runtime configs in releases with config provider 
							
						 
						
							2020-12-22 21:08:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c26583c99e 
								
							 
						 
						
							
							
								
								SideEffects: fix test  
							
							
							
						 
						
							2020-12-22 21:08:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								41d6225e2e 
								
							 
						 
						
							
							
								
								User: Remove left-over (wrong) fix.  
							
							
							
						 
						
							2020-12-22 21:08:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a32e13e6c4 
								
							 
						 
						
							
							
								
								User: Don't allow local users in remote changesets  
							
							
							
						 
						
							2020-12-22 21:07:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								c10783087f 
								
							 
						 
						
							
							
								
								Switch to a fork of Hackney 1.15.2 for now so we can have our URL normalization bugfix  
							
							
							
						 
						
							2020-12-22 21:06:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								66c75b0192 
								
							 
						 
						
							
							
								
								Update changelog  
							
							
							
						 
						
							2020-12-22 21:05:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								29c3c35ba1 
								
							 
						 
						
							
							
								
								Search: Only skip ordering the rum index.  
							
							
							
						 
						
							2020-12-22 21:03:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3388bf9c9b 
								
							 
						 
						
							
							
								
								Activity search: Fix order of results  
							
							... 
							
							
							
							Greatly speeds up the search for RUM. 
							
						 
						
							2020-12-22 21:03:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								42a386eb9f 
								
							 
						 
						
							
							
								
								Document fixing the pleroma.user delete_activities mix task  
							
							
							
						 
						
							2020-12-22 20:51:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								a21aeeee12 
								
							 
						 
						
							
							
								
								Need to start web_resp cache or mix task fails  
							
							
							
						 
						
							2020-12-22 20:49:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								93852f1b42 
								
							 
						 
						
							
							
								
								Document S3 and Elixir 1.11 compat fix  
							
							
							
						 
						
							2020-12-22 20:48:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								012108a299 
								
							 
						 
						
							
							
								
								Fix S3 uploads with Elixir 1.11  
							
							
							
						 
						
							2020-12-22 20:48:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
							
							
								
							
							
								aa848cbd75 
								
							 
						 
						
							
							
								
								pleroma.instance: Fix Exiftool module name  
							
							
							
						 
						
							2020-12-22 20:48:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								065009a57a 
								
							 
						 
						
							
							
								
								remove PurgeExpiredActivity from Oban db config  
							
							
							
						 
						
							2020-12-22 20:47:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e369b1306b 
								
							 
						 
						
							
							
								
								Added Hashtag entity and objects-hashtags association with auto-sync with data.tag on Object update.  
							
							
							
						 
						
							2020-12-22 22:04:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								c5cce89f50 
								
							 
						 
						
							
							
								
								Merge branch 'update-elixir-make' into 'develop'  
							
							... 
							
							
							
							Update for retired elixir_make package version
See merge request pleroma/pleroma!3211  
							
						 
						
							2020-12-22 14:53:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dedc575225 
								
							 
						 
						
							
							
								
								update for retired elixir_make package version  
							
							
							
						 
						
							2020-12-22 17:42:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								0ca13be499 
								
							 
						 
						
							
							
								
								Merge branch 'update/instance-gen-template' into 'develop'  
							
							... 
							
							
							
							Update instance.gen template
See merge request pleroma/pleroma!3210  
							
						 
						
							2020-12-22 11:31:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d5746e8447 
								
							 
						 
						
							
							
								
								Do not include pool_size in the template. It encourages unwanted fiddling :)  
							
							
							
						 
						
							2020-12-21 15:19:24 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								ee221277b0 
								
							 
						 
						
							
							
								
								Encapsulation of tags / hashtags fetching from objects.  
							
							
							
						 
						
							2020-12-21 22:54:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8e1f32e715 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'develop'  
							
							... 
							
							
							
							WebFinger: add subscribe_address in return data of JSON responses
See merge request pleroma/pleroma!3206  
							
						 
						
							2020-12-21 17:13:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ab633e51ab 
								
							 
						 
						
							
							
								
								Linting  
							
							
							
						 
						
							2020-12-21 16:48:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1a3da01a65 
								
							 
						 
						
							
							
								
								Tests: Stub the pipeline in all tests.  
							
							... 
							
							
							
							Restores the old un-moxed behavior. 
							
						 
						
							2020-12-21 16:38:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5db1e6c8d3 
								
							 
						 
						
							
							
								
								Pipeline test: Switch from Mock to Mox.  
							
							... 
							
							
							
							Speeds up the test and makes it possible to run async. 
							
						 
						
							2020-12-21 16:35:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0ef0aed205 
								
							 
						 
						
							
							
								
								Tests: Add a helper method to reduce sleeping times in test.  
							
							... 
							
							
							
							This will 'time travel', i.e. change the inserted_at and update_at
fields of the object in question. This is used to backdate things
were we used sleeping before to ensure time differences. 
							
						 
						
							2020-12-21 16:31:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ba19975838 
								
							 
						 
						
							
							
								
								Linting  
							
							
							
						 
						
							2020-12-21 16:22:36 +01:00