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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								14fae94c0e 
								
							 
						 
						
							
							
								
								[ #3213 ] Made Object.hashtags/1 work with :hashtags assoc. Adjusted tests.  
							
							 
							
							
							
						 
						
							2020-12-28 00:08:09 +03: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9ba60f70d2 
								
							 
						 
						
							
							
								
								Tests: Make as many tests as possible async.  
							
							 
							
							... 
							
							
							
							In general, tests that match these criteria can be made async:
- Doesn't use real Cachex.
- Doesn't write to the Config / Application Environment.
- Uses Mock. Using Mox is fine.
- Uses the streamer. 
							
						 
						
							2020-12-21 12:21:40 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								fc9ebe5073 
								
							 
						 
						
							
							
								
								Search tests: Use on_exit for restoring persistent_term state  
							
							 
							
							... 
							
							
							
							Otherwise if the assertion failed, the code below which resets the
state would never be reached 
							
						 
						
							2020-12-01 19:45:25 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								67b15cc033 
								
							 
						 
						
							
							
								
								Search: Save detected pg version in a persistent term.  
							
							 
							
							
							
						 
						
							2020-11-23 15:29:55 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9a1e5f5d48 
								
							 
						 
						
							
							
								
								Search: Change search method based on detected pg version  
							
							 
							
							
							
						 
						
							2020-11-20 16:26:43 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								81b6f02a5e 
								
							 
						 
						
							
							
								
								Search Test: linting  
							
							 
							
							
							
						 
						
							2020-11-19 16:48:51 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a60242464e 
								
							 
						 
						
							
							
								
								Search: Add option to search with the websearch function  
							
							 
							
							
							
						 
						
							2020-11-19 16:12:01 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cb3cd3a761 
								
							 
						 
						
							
							
								
								TopicsTest: Small addition.  
							
							 
							
							
							
						 
						
							2020-11-04 15:24:10 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								755f58168b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into restrict-domain  
							
							 
							
							
							
						 
						
							2020-10-13 19:26:04 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7dffaef479 
								
							 
						 
						
							
							
								
								tests consistency  
							
							 
							
							
							
						 
						
							2020-10-13 16:35:09 +03:00