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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9d5ce82221 
								
							 
						 
						
							
							
								
								Test: More async/sync tweaks.  
							
							
							
						 
						
							2020-12-21 15:05:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b17c36c45a 
								
							 
						 
						
							
							
								
								Tests: More test fixes.  
							
							
							
						 
						
							2020-12-21 12:59:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2f8ec8a9cc 
								
							 
						 
						
							
							
								
								XMLBuidlder test: Make async.  
							
							
							
						 
						
							2020-12-21 12:35:04 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ee81a94ab2 
								
							 
						 
						
							
							
								
								Caching: Add caching behavior, add null implementation.  
							
							
							
						 
						
							2020-12-21 11:42:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kaizhe Huang 
								
							 
						 
						
							
							
							
							
								
							
							
								509f82e4d6 
								
							 
						 
						
							
							
								
								Add test for subscribe_address in JSON WebFinger response  
							
							
							
						 
						
							2020-12-19 22:11:47 +11:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								95a9bdfc37 
								
							 
						 
						
							
							
								
								Tests: Use NullCache for async tests.  
							
							... 
							
							
							
							Caching can't work in async tests, so for them it is mocked to a
null cache that is always empty. Synchronous tests are stubbed
with the real Cachex, which is emptied after every test. 
							
						 
						
							2020-12-18 19:53:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								713612c377 
								
							 
						 
						
							
							
								
								Cachex: Make caching provider switchable at runtime.  
							
							... 
							
							
							
							Defaults to Cachex. 
							
						 
						
							2020-12-18 17:44:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b4b68b71fc 
								
							 
						 
						
							
							
								
								Tests: Remove unneeded explicit cachex use.  
							
							... 
							
							
							
							Only use cachex when we're actually testing it. 
							
						 
						
							2020-12-18 13:18:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c1129ff674 
								
							 
						 
						
							
							
								
								Tests: Reset all cachex caches between synchronous tests  
							
							... 
							
							
							
							Don't bother in the async case, it doesn't make sense there. 
							
						 
						
							2020-12-18 11:53:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								80891e83d8 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into registration-workflow  
							
							
							
						 
						
							2020-12-17 09:05:36 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8b8c317c0f 
								
							 
						 
						
							
							
								
								Merge branch 'fix/2336-mastoapi-ws-posts-dropping' into 'develop'  
							
							... 
							
							
							
							Fix mastoapi ws posts dropping
Closes  #2336 
See merge request pleroma/pleroma!3198  
							
						 
						
							2020-12-16 11:35:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6bb4f4e172 
								
							 
						 
						
							
							
								
								Merge branch 'support/2255_posix_errors' into 'develop'  
							
							... 
							
							
							
							[#2255 ] added error messages for posix error code
See merge request pleroma/pleroma!3138  
							
						 
						
							2020-12-15 15:16:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								cebe3c7def 
								
							 
						 
						
							
							
								
								Fix for dropping posts/notifs in WS when mix task is executed  
							
							... 
							
							
							
							- start oban in mix tasks with empty queues, plugins and crontab
- fix for update_users_following_followers_counts
- fix for removed logo.png
- typo in resend confirmation emails mix task docs
- fix for uploads mix task (start Majic.Pool)
- fix for creating user mix task (start :fast_html app) 
							
						 
						
							2020-12-14 11:02:32 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								7fff9c1bee 
								
							 
						 
						
							
							
								
								Tweaks to OAuth entities expiration: changed default to 30 days, removed hardcoded values usage, fixed OAuthView (expires_in).  
							
							
							
						 
						
							2020-12-09 21:14:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								477c6c8e55 
								
							 
						 
						
							
							
								
								Merge branch 'auth-improvements' into 'develop'  
							
							... 
							
							
							
							Cookie auth rework / Auth subsystem refactoring and tweaks
Closes pleroma/secteam/pleroma#3
See merge request pleroma/pleroma!3112  
							
						 
						
							2020-12-09 15:55:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1436a2fa2d 
								
							 
						 
						
							
							
								
								Merge branch 'stream-follow-updates' into 'develop'  
							
							... 
							
							
							
							Stream follow updates
Closes  #2299 
See merge request pleroma/pleroma!3183  
							
						 
						
							2020-12-09 15:52:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e73d878b38 
								
							 
						 
						
							
							
								
								Merge branch 'feat/warn-large-pool-size' into 'develop'  
							
							... 
							
							
							
							Add a startup error for modified Repo pool_size
See merge request pleroma/pleroma!3190  
							
						 
						
							2020-12-08 16:36:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								50d16a9e27 
								
							 
						 
						
							
							
								
								ApplicationRequirements: Add test, more text for pool size.  
							
							
							
						 
						
							2020-12-08 17:30:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1403798820 
								
							 
						 
						
							
							
								
								instance.reachable?: Limit to binary input  
							
							
							
						 
						
							2020-12-07 21:20:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e1a2e8b17c 
								
							 
						 
						
							
							
								
								instance: Do not fetch unreachable instances  
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2346  
							
						 
						
							2020-12-07 20:11:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								c8e7ace812 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 
						
							2020-12-07 21:45:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ed76323776 
								
							 
						 
						
							
							
								
								Merge branch 'feature/configdb-mix-tasks' into 'develop'  
							
							... 
							
							
							
							Add mix tasks to give additional ConfigDB recovery and debugging options
See merge request pleroma/pleroma!3174  
							
						 
						
							2020-12-07 18:06:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								e3dd0d45b7 
								
							 
						 
						
							
							
								
								Slip in a test to ensure we can use the atom syntax in mix task arguments  
							
							
							
						 
						
							2020-12-07 11:21:06 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e00c667145 
								
							 
						 
						
							
							
								
								[ #3174 ] Refactoring: ConfigDB fetching functions, ConfigDB tests.  
							
							... 
							
							
							
							Minor fixes. 
							
						 
						
							2020-12-06 18:02:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								a010c5b16a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements  
							
							
							
						 
						
							2020-12-06 13:59:35 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e9859b68fc 
								
							 
						 
						
							
							
								
								[ #3112 ] Ensured presence and consistency of :user and :token assigns (EnsureUserTokenAssignsPlug). Refactored auth info dropping functions.  
							
							
							
						 
						
							2020-12-06 13:59:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								657002e738 
								
							 
						 
						
							
							
								
								Answer new prompt interactively  
							
							
							
						 
						
							2020-12-04 12:07:23 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								6adad96c79 
								
							 
						 
						
							
							
								
								Merge branch 'issue/2256' into 'develop'  
							
							... 
							
							
							
							[#2256 ] added subject actor to moderation log
See merge request pleroma/pleroma!3164  
							
						 
						
							2020-12-04 17:49:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								1d04bd0894 
								
							 
						 
						
							
							
								
								Merge branch 'supported-emojos' into 'develop'  
							
							... 
							
							
							
							Update Emoji support to unicode 13.1, support all RGI emoji.
See merge request pleroma/pleroma!3186  
							
						 
						
							2020-12-03 18:29:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fa0d0b602f 
								
							 
						 
						
							
							
								
								Emoji: Also accept regional indicators  
							
							
							
						 
						
							2020-12-03 16:17:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								05879a3b3e 
								
							 
						 
						
							
							
								
								Merge branch '2339-local-remote-mixup' into 'develop'  
							
							... 
							
							
							
							User: Don't allow local users in remote changesets
Closes  #2339 
See merge request pleroma/pleroma!3185  
							
						 
						
							2020-12-03 01:28:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								e379ab8277 
								
							 
						 
						
							
							
								
								Add --force flag for delete and reset commands  
							
							... 
							
							
							
							Bunch of reorganization and consolidation 
							
						 
						
							2020-12-02 16:24:32 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								13947999ad 
								
							 
						 
						
							
							
								
								Use a callback strategy to short circuit the functions and print a nice error  
							
							
							
						 
						
							2020-12-02 12:33:34 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3e6d9187a7 
								
							 
						 
						
							
							
								
								Add tests for config dumping  
							
							
							
						 
						
							2020-12-02 10:43:22 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								126d236455 
								
							 
						 
						
							
							
								
								We no longer expect mentions to link if they are prefixed with too many @'s  
							
							
							
						 
						
							2020-12-02 10:27:55 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8fb259e739 
								
							 
						 
						
							
							
								
								Emoji: Only accept RGI emoji.  
							
							... 
							
							
							
							"recommended for general interchange" 
							
						 
						
							2020-12-02 16:46:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3b3cf63118 
								
							 
						 
						
							
							
								
								Emoji: Add test for ZWJ sequence emoji  
							
							
							
						 
						
							2020-12-02 16:18:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c9afb350e7 
								
							 
						 
						
							
							
								
								Document follow relationship updates and cleanup  
							
							
							
						 
						
							2020-12-02 19:16:36 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1adee08321 
								
							 
						 
						
							
							
								
								Emoji: Update to Unicode 13.1, switch base file, allow multichar.  
							
							
							
						 
						
							2020-12-02 16:15:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5d15486098 
								
							 
						 
						
							
							
								
								SideEffects: fix test  
							
							
							
						 
						
							2020-12-02 14:48:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								222312900e 
								
							 
						 
						
							
							
								
								User: Don't allow local users in remote changesets  
							
							
							
						 
						
							2020-12-02 12:18:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								35ba48494f 
								
							 
						 
						
							
							
								
								Stream follow updates  
							
							
							
						 
						
							2020-12-02 00:18:58 +04: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								d50a3345ae 
								
							 
						 
						
							
							
								
								[ #3112 ] Allowed revoking same-user token from any apps. Added tests.  
							
							
							
						 
						
							2020-11-30 21:55:48 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								50e47a215f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements  
							
							
							
						 
						
							2020-11-28 21:51:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								f1b07a2b2b 
								
							 
						 
						
							
							
								
								OAuth form user remembering feature. Local MastoFE login / logout fixes.  
							
							
							
						 
						
							2020-11-28 21:51:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6aadb1cb40 
								
							 
						 
						
							
							
								
								digest algorithm is taken from header  
							
							
							
						 
						
							2020-11-27 08:10:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								fb72f2034a 
								
							 
						 
						
							
							
								
								fix spec  
							
							
							
						 
						
							2020-11-25 22:44:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								62993db499 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements  
							
							
							
						 
						
							2020-11-25 21:48:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								12a5981cc3 
								
							 
						 
						
							
							
								
								Session token setting on token exchange. Auth-related refactoring.  
							
							
							
						 
						
							2020-11-25 21:47:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								54df44d380 
								
							 
						 
						
							
							
								
								Fix badly formatted JSON fixtures which causes Jason to erroneously detect control characters  
							
							
							
						 
						
							2020-11-23 14:48:14 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3283d0805f 
								
							 
						 
						
							
							
								
								Use Jason instead of Poison in tests  
							
							
							
						 
						
							2020-11-23 13:28:55 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								67b15cc033 
								
							 
						 
						
							
							
								
								Search: Save detected pg version in a persistent term.  
							
							
							
						 
						
							2020-11-23 15:29:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f9a4cf2097 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch  
							
							
							
						 
						
							2020-11-23 15:18:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								489b12cde4 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements  
							
							
							
						 
						
							2020-11-21 19:47:46 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								ccc2cf0e87 
								
							 
						 
						
							
							
								
								Session-based OAuth auth fixes (token expiration check), refactoring, tweaks.  
							
							
							
						 
						
							2020-11-21 19:47:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								30ed7b502f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into registration-workflow  
							
							
							
						 
						
							2020-11-21 10:23:53 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								ecd1ef8cb5 
								
							 
						 
						
							
							
								
								Merge branch 'fix/2302-report-duplicates' into 'develop'  
							
							... 
							
							
							
							Fix for forwarded reports
Closes  #2303  and #2302 
See merge request pleroma/pleroma!3146  
							
						 
						
							2020-11-20 18:40:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8532325d65 
								
							 
						 
						
							
							
								
								SearchController Test: Fix test.  
							
							
							
						 
						
							2020-11-20 16:29:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9a1e5f5d48 
								
							 
						 
						
							
							
								
								Search: Change search method based on detected pg version  
							
							
							
						 
						
							2020-11-20 16:26:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								79a509ee61 
								
							 
						 
						
							
							
								
								Merge branch '2301-users-search-discoverability-fix' into 'develop'  
							
							... 
							
							
							
							[#2301 ] Proper handling of User.is_discoverable
Closes  #2301 
See merge request pleroma/pleroma!3162  
							
						 
						
							2020-11-19 20:33:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								cd1b4155d5 
								
							 
						 
						
							
							
								
								Merge branch 'oban-jobs-to-simple-tasks' into 'develop'  
							
							... 
							
							
							
							Moving some background jobs into simple tasks
Closes  #1790 
See merge request pleroma/pleroma!3129  
							
						 
						
							2020-11-19 20:32:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								66f411fba0 
								
							 
						 
						
							
							
								
								added subject actor to moderation log  
							
							
							
						 
						
							2020-11-19 22:13:45 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								b27d8f7437 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix  
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md 
							
						 
						
							2020-11-19 19:35:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5e04f4156c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch  
							
							
							
						 
						
							2020-11-19 17:32:57 +01: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								c8d11c3064 
								
							 
						 
						
							
							
								
								Merge branch '2317-old-reset-tokens' into 'develop'  
							
							... 
							
							
							
							Resolve "Don't allow old password reset tokens"
Closes  #2317 
See merge request pleroma/pleroma!3160  
							
						 
						
							2020-11-19 16:22:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								783fa797bb 
								
							 
						 
						
							
							
								
								SearchController Test: Fix test  
							
							
							
						 
						
							2020-11-19 16:53:26 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								fcad3e716a 
								
							 
						 
						
							
							
								
								[ #2301 ] Quick fix: users with is_discoverable == false (default!) are included in search results.  
							
							
							
						 
						
							2020-11-19 18:08:22 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								46dab37351 
								
							 
						 
						
							
							
								
								little fix  
							
							
							
						 
						
							2020-11-19 15:29:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								11e0d5f9ac 
								
							 
						 
						
							
							
								
								Password Resets: Don't accept tokens above a certain age.  
							
							... 
							
							
							
							By default, one day 
							
						 
						
							2020-11-19 12:27:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4aaffe3a10 
								
							 
						 
						
							
							
								
								log capture  
							
							
							
						 
						
							2020-11-19 09:58:32 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								be0b874e1d 
								
							 
						 
						
							
							
								
								fix for mastodon forwarded reports  
							
							
							
						 
						
							2020-11-19 09:53:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a840aefda8 
								
							 
						 
						
							
							
								
								formatting  
							
							
							
						 
						
							2020-11-19 09:53:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e2bf6b1f7e 
								
							 
						 
						
							
							
								
								fix for forwarded reports  
							
							
							
						 
						
							2020-11-19 09:53:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									minibikini 
								
							 
						 
						
							
							
							
							
								
							
							
								6669ac5bf7 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'hide-muted-reactions'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2020-11-18 20:22:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								aae669d05e 
								
							 
						 
						
							
							
								
								Merge branch 'fix/webpush-and-emojireact' into 'develop'  
							
							... 
							
							
							
							Push notifications: add pleroma:emoji_reaction, improve tests
Closes  #2185 
See merge request pleroma/pleroma!3141  
							
						 
						
							2020-11-18 18:33:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6b32e1de23 
								
							 
						 
						
							
							
								
								Merge branch 'frontend-admin-api' into 'develop'  
							
							... 
							
							
							
							Add an API to manage frontends
Closes  #2238 
See merge request pleroma/pleroma!3108  
							
						 
						
							2020-11-18 17:51:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								9c5d1cb9ed 
								
							 
						 
						
							
							
								
								fix tests  
							
							
							
						 
						
							2020-11-18 09:58:51 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								415481a4d9 
								
							 
						 
						
							
							
								
								Add test for POST when push is disabled  
							
							... 
							
							
							
							Also group together the tests verifiying failure when disabled 
							
						 
						
							2020-11-17 22:18:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3eaa5335c9 
								
							 
						 
						
							
							
								
								Revert adding extra alert types here  
							
							
							
						 
						
							2020-11-17 21:37:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d9732fb7d3 
								
							 
						 
						
							
							
								
								Fix incorrect test description  
							
							
							
						 
						
							2020-11-17 21:34:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ff7a4b6aa2 
								
							 
						 
						
							
							
								
								Test that we ignore invalid subscription alert types separately.  
							
							
							
						 
						
							2020-11-17 20:22:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								30f140e570 
								
							 
						 
						
							
							
								
								Ensure all supported push notification subscription alert types are tested  
							
							
							
						 
						
							2020-11-17 20:22:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								499faa82f6 
								
							 
						 
						
							
							
								
								Synchronize reaction notification text with PleromaFE's style  
							
							
							
						 
						
							2020-11-17 20:22:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								67a6abd071 
								
							 
						 
						
							
							
								
								Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions  
							
							
							
						 
						
							2020-11-17 20:20:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3ce11b830e 
								
							 
						 
						
							
							
								
								Add capability for emoji reaction push notifications  
							
							
							
						 
						
							2020-11-17 20:20:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								bb9650f3c2 
								
							 
						 
						
							
							
								
								FrontendController: Return error on installation error.  
							
							
							
						 
						
							2020-11-17 16:43:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								d33b9e7b33 
								
							 
						 
						
							
							
								
								Merge branch 'remove/fedsockets' into 'develop'  
							
							... 
							
							
							
							Remove FedSockets
See merge request pleroma/pleroma!3155  
							
						 
						
							2020-11-17 14:58:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f69fe36ebf 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into frontend-admin-api  
							
							
							
						 
						
							2020-11-17 18:34:04 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d48dbfab2b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into hide-muted-reactions  
							
							
							
						 
						
							2020-11-17 18:30:10 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								79d2d3f609 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into hide-muted-reactions  
							
							
							
						 
						
							2020-11-17 18:29:52 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								2c55f7d7cb 
								
							 
						 
						
							
							
								
								Remove FedSockets  
							
							... 
							
							
							
							Current FedSocket implementation has a bunch of problems. It doesn't
have proper error handling (in case of an error the server just doesn't
respond until the connection is closed, while the client doesn't match
any error messages and just assumes there has been an error after 15s)
and the code is full of bad descisions (see: fetch registry which uses
uuids for no reason and waits for a response by recursively querying a
 ets table until the value changes, or double JSON encoding).
Sometime ago I almost completed rewriting fedsockets from scrach to
adress these issues. However, while doing so, I realized that fedsockets
 are just too overkill for what they were trying to accomplish, which is
 reduce the overhead of federation by not signing every message.
This could be done without reimplementing failure states and endpoint
 logic we already have with HTTP by, for example, using TLS cert auth,
or switching to a more performant signature algorithm. I opened
https://git.pleroma.social/pleroma/pleroma/-/issues/2262  for further
discussion on alternatives to fedsockets.
From discussions I had with other Pleroma developers it seems like they
 would approve the descision to remove them as well,
therefore I am submitting this patch. 
							
						 
						
							2020-11-17 17:28:30 +03:00