Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								44a86951a3 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/approval_pending_user_field  
							
							
							
						 
						
							2021-01-18 12:05:05 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1b79dce7bc 
								
							 
						 
						
							
							
								
								Fix Reblog API  
							
							... 
							
							
							
							Do not set visibility parameter to `public` by default and let CommonAPI to infer it from status. 
							
						 
						
							2021-01-18 20:15:57 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								bdfd72630f 
								
							 
						 
						
							
							
								
								ListController: Fix being unable to add / remove users.  
							
							
							
						 
						
							2021-01-18 16:28:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3f88e33a71 
								
							 
						 
						
							
							
								
								[ #3251 ] Fixed wrong test-env config setting for [Pleroma.Upload]. Refactoring. Added warning to clear_config/_ to minimize such issues in future.  
							
							
							
						 
						
							2021-01-16 23:05:31 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2c0fe2ea9e 
								
							 
						 
						
							
							
								
								Remove toggle_confirmation; require explicit state change  
							
							... 
							
							
							
							Also cosmetic changes to make the code clearer 
							
						 
						
							2021-01-15 13:11:51 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d36182c088 
								
							 
						 
						
							
							
								
								Change user.confirmation_pending field to user.is_confirmed  
							
							
							
						 
						
							2021-01-15 12:44:41 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6c50ac1d3f 
								
							 
						 
						
							
							
								
								Readability  
							
							
							
						 
						
							2021-01-15 11:37:17 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ebd7d1365b 
								
							 
						 
						
							
							
								
								Make setting user activation status explicit  
							
							
							
						 
						
							2021-01-15 11:37:17 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								cd1e5d76ab 
								
							 
						 
						
							
							
								
								Remove User.restrict_deactivated/1  
							
							... 
							
							
							
							Everything else is in User.Query, no need for this odd kludge. 
							
						 
						
							2021-01-15 11:24:46 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								860b5c7804 
								
							 
						 
						
							
							
								
								Change user.deactivated field to user.is_active  
							
							
							
						 
						
							2021-01-15 11:24:46 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								63923df0a5 
								
							 
						 
						
							
							
								
								Further simplify changeset logic  
							
							
							
						 
						
							2021-01-15 10:42:02 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								f7e59c28ed 
								
							 
						 
						
							
							
								
								Change user.approval_pending field to user.is_approved  
							
							
							
						 
						
							2021-01-15 10:42:02 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								cf367fdbd5 
								
							 
						 
						
							
							
								
								Merge branch 'optimize-command_available' into 'develop'  
							
							... 
							
							
							
							Optimize Pleroma.Utils.command_available?/1
See merge request pleroma/pleroma!3254  
							
						 
						
							2021-01-15 04:44:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d0e0396528 
								
							 
						 
						
							
							
								
								Hack to fix tests not passing. Unclear why the filters are being set to nil.  
							
							... 
							
							
							
							Both of these changes are needed or it doesn't work. 
							
						 
						
							2021-01-14 17:49:37 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								8d6e9b25a4 
								
							 
						 
						
							
							
								
								Just validate command is in PATH; forking a shell is wasteful  
							
							
							
						 
						
							2021-01-14 17:19:02 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								39f3683a06 
								
							 
						 
						
							
							
								
								Pbkdf2: Use it everywhere.  
							
							
							
						 
						
							2021-01-14 15:06:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								87a31c5c9b 
								
							 
						 
						
							
							
								
								Password -> Password.Pbkdf2  
							
							
							
						 
						
							2021-01-14 14:49:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								f0ab60189e 
								
							 
						 
						
							
							
								
								truncated_namespace should default to nil  
							
							
							
						 
						
							2021-01-13 11:54:00 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9106048c61 
								
							 
						 
						
							
							
								
								Password: Replace Pbkdf2 with Password.  
							
							
							
						 
						
							2021-01-13 15:11:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c7cd9bd591 
								
							 
						 
						
							
							
								
								Password: Add password module  
							
							... 
							
							
							
							Replaces Pbkdf2. 
							
						 
						
							2021-01-13 15:09:01 +01: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								c35e6fb516 
								
							 
						 
						
							
							
								
								Provide a non-nil fallback for Upload.base_url/0 for tests using TestUploaderSuccess as the uploader  
							
							
							
						 
						
							2021-01-12 16:34:24 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								12528edc34 
								
							 
						 
						
							
							
								
								Fix another ad-hoc construction of the upload base_url  
							
							
							
						 
						
							2021-01-12 16:32:52 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								8b28dce82a 
								
							 
						 
						
							
							
								
								Deprecate Pleroma.Uploaders.S3, :public_endpoint  
							
							
							
						 
						
							2021-01-12 16:31:35 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								5453038ce9 
								
							 
						 
						
							
							
								
								Merge branch 'fix/backup-url-on-s3' into 'develop'  
							
							... 
							
							
							
							Standardize base url for uploads
See merge request pleroma/pleroma!3246  
							
						 
						
							2021-01-12 20:54:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7a1cb752dd 
								
							 
						 
						
							
							
								
								Pagination: Don't be dos'd by random parameters.  
							
							
							
						 
						
							2021-01-12 12:59:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ef59d99833 
								
							 
						 
						
							
							
								
								Simplify. We will always have a result from Upload.base_url/0, so just add it to the list  
							
							
							
						 
						
							2021-01-11 14:19:14 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								1040881047 
								
							 
						 
						
							
							
								
								Fix regression in MediaProxy.local?/0 and appending the Upload.base_url to whitelisted domains  
							
							
							
						 
						
							2021-01-11 14:01:31 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e1a547d7d3 
								
							 
						 
						
							
							
								
								ChatMessages: Fix pagination headers.  
							
							... 
							
							
							
							They used to contain the path parameter `id` as query param,
which would break the link. 
							
						 
						
							2021-01-11 15:30:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								9887cdf9be 
								
							 
						 
						
							
							
								
								Formatting  
							
							
							
						 
						
							2021-01-10 09:03:42 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								fa63f1b55b 
								
							 
						 
						
							
							
								
								Apply 4 suggestion(s) to 2 file(s)  
							
							
							
						 
						
							2021-01-10 01:34:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								e8bf060e6e 
								
							 
						 
						
							
							
								
								Move construction of S3 base URL with optional namespace and bucket to Upload.base_url/0  
							
							... 
							
							
							
							Now we should have a correct base URL for S3 hosted objects throughout the codebase. 
							
						 
						
							2021-01-08 17:32:42 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								86dcfb4eb9 
								
							 
						 
						
							
							
								
								More places we should be using Upload.base_url  
							
							
							
						 
						
							2021-01-08 17:32:42 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								530fb5b29e 
								
							 
						 
						
							
							
								
								Avoid duplicate Config calls  
							
							
							
						 
						
							2021-01-08 17:32:42 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3c936061d5 
								
							 
						 
						
							
							
								
								Apply Upload.base_url for S3  
							
							
							
						 
						
							2021-01-08 17:32:42 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ad79983614 
								
							 
						 
						
							
							
								
								Fix URL generated for backup files, try to create a source of truth we can reuse throughout the codebase  
							
							
							
						 
						
							2021-01-08 17:32:42 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								80167e62dd 
								
							 
						 
						
							
							
								
								Merge branch 'fix/missing_emoji_steal_dir' into 'develop'  
							
							... 
							
							
							
							Create dir for EmojiStealPolicy automatically
See merge request pleroma/pleroma!3218  
							
						 
						
							2021-01-08 13:10:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3342f6a7ef 
								
							 
						 
						
							
							
								
								Backups: render ID in API  
							
							
							
						 
						
							2021-01-07 13:06:22 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ac1298fce8 
								
							 
						 
						
							
							
								
								Merge branch 'cleanup/unused-proxy-opts' into 'develop'  
							
							... 
							
							
							
							Cleanup Pleroma.Upload proxy opts
See merge request pleroma/pleroma!3236  
							
						 
						
							2021-01-07 16:25:39 +00: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 
								
							 
						 
						
							
							
							
							
								
							
							
								4d56aca904 
								
							 
						 
						
							
							
								
								Merge branch 'adminapi-user-email' into 'develop'  
							
							... 
							
							
							
							AdminAPI: return user email
See merge request pleroma/pleroma!3240  
							
						 
						
							2021-01-07 10:08:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								20af025c65 
								
							 
						 
						
							
							
								
								AdminAPI: return user email  
							
							
							
						 
						
							2021-01-06 11:30:32 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								48cd336a72 
								
							 
						 
						
							
							
								
								allow external emoji  
							
							
							
						 
						
							2021-01-06 10:13:01 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d69c78ceb9 
								
							 
						 
						
							
							
								
								Remove configurability of upload proxy opts, simplify  
							
							
							
						 
						
							2021-01-05 15:06:00 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								64116f63d9 
								
							 
						 
						
							
							
								
								URI.encode custom emojis  
							
							
							
						 
						
							2021-01-05 12:29:51 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								20a269ed69 
								
							 
						 
						
							
							
								
								Merge branch 'fix/pagination-regression' into 'develop'  
							
							... 
							
							
							
							Do not try to guess which pagination we need by the existence of an :offset param.
Closes  #2399 
See merge request pleroma/pleroma!3230  
							
						 
						
							2021-01-05 12:40:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e802b48d55 
								
							 
						 
						
							
							
								
								User: Use ObjectID type to validate also-known-as field  
							
							
							
						 
						
							2021-01-05 13:10:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f0e6cff583 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases  
							
							
							
						 
						
							2021-01-05 12:42:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								bea69853a2 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff  
							
							
							
						 
						
							2021-01-05 12:19:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d44850d7a5 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor  
							
							
							
						 
						
							2021-01-05 10:48:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8e5904daa5 
								
							 
						 
						
							
							
								
								SideEffects.DeleteTest: asyncify.  
							
							... 
							
							
							
							Replace Mock with Mox, mock out Logger. 
							
						 
						
							2021-01-04 18:40:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								83f27282ba 
								
							 
						 
						
							
							
								
								Do not try to guess which pagination we need by the existence of an :offset param.  
							
							... 
							
							
							
							Require explicit request to get offset pagination. 
							
						 
						
							2021-01-04 10:13:17 -06: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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0ec7e9b8e9 
								
							 
						 
						
							
							
								
								AdminAPI: return id for moderation log entries  
							
							
							
						 
						
							2021-01-01 11:59:48 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								afe9c152ab 
								
							 
						 
						
							
							
								
								Merge branch 'fix/reports-ordering' into 'develop'  
							
							... 
							
							
							
							Do not reverse order of reports. We want newest ones sorted to the top.
Closes  #2364 
See merge request pleroma/pleroma!3225  
							
						 
						
							2020-12-31 19:24:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4200a06340 
								
							 
						 
						
							
							
								
								Aliases: refactor validate_also_known_as/1  
							
							
							
						 
						
							2020-12-31 12:53:28 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
							
							
								
							
							
								0d6b9ce8ca 
								
							 
						 
						
							
							
								
								Apply 2 suggestion(s) to 1 file(s)  
							
							
							
						 
						
							2020-12-31 18:51:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								2aa60e7592 
								
							 
						 
						
							
							
								
								Apply 1 suggestion(s) to 1 file(s)  
							
							
							
						 
						
							2020-12-31 09:58:43 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								11d40e92b7 
								
							 
						 
						
							
							
								
								Render AKAs in Actor endpoints  
							
							
							
						 
						
							2020-12-30 18:53:27 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cbce880076 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into aliases  
							
							
							
						 
						
							2020-12-30 17:10:02 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2597b028f7 
								
							 
						 
						
							
							
								
								Make pagination type conditional  
							
							
							
						 
						
							2020-12-30 16:37:04 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								085d4e6cfc 
								
							 
						 
						
							
							
								
								Continue to use ActivityPub.fetch_user_activities/3, make it pass :offset  
							
							
							
						 
						
							2020-12-30 16:10:10 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								4c5f75f4e9 
								
							 
						 
						
							
							
								
								Support pagination in AdminAPI for user statuses  
							
							
							
						 
						
							2020-12-30 15:18:54 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								744b34709d 
								
							 
						 
						
							
							
								
								Do not reverse order of reports. We want newest ones sorted to the top.  
							
							
							
						 
						
							2020-12-30 14:22:48 -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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2e859794ee 
								
							 
						 
						
							
							
								
								non condition dir creation  
							
							
							
						 
						
							2020-12-27 21:58:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dad76703aa 
								
							 
						 
						
							
							
								
								not needed  
							
							
							
						 
						
							2020-12-27 21:53:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7bfb041658 
								
							 
						 
						
							
							
								
								insreasing test coverage for StealEmojiPolicy  
							
							
							
						 
						
							2020-12-27 21:53:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								aafd7b44ce 
								
							 
						 
						
							
							
								
								check dir existence in policy  
							
							
							
						 
						
							2020-12-27 21:53:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e02889edb2 
								
							 
						 
						
							
							
								
								Add MRFs to the list of things that may need a soft reboot  
							
							
							
						 
						
							2020-12-27 21:53:29 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								72aeb2e73b 
								
							 
						 
						
							
							
								
								Mark private  
							
							
							
						 
						
							2020-12-27 21:53:29 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								77e39e6aae 
								
							 
						 
						
							
							
								
								Create dir for EmojiStealPolicy automatically  
							
							
							
						 
						
							2020-12-27 21:53:29 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ab633e51ab 
								
							 
						 
						
							
							
								
								Linting  
							
							
							
						 
						
							2020-12-21 16:48:35 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								c9d73af74d 
								
							 
						 
						
							
							
								
								Cachex: Unify arity of callback function  
							
							
							
						 
						
							2020-12-21 12:03:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ee81a94ab2 
								
							 
						 
						
							
							
								
								Caching: Add caching behavior, add null implementation.  
							
							
							
						 
						
							2020-12-21 11:42:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kaizhe Huang 
								
							 
						 
						
							
							
							
							
								
							
							
								fb02241580 
								
							 
						 
						
							
							
								
								Fix trailing whitespaces in lib/pleroma/web/web_finger.ex  
							
							
							
						 
						
							2020-12-21 00:54:15 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									FiveYellowMice 
								
							 
						 
						
							
							
							
							
								
							
							
								83cd7f2b5f 
								
							 
						 
						
							
							
								
								WebFinger: add subscribe_address in return data of JSON responses  
							
							
							
						 
						
							2020-12-18 13:48:38 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								7da0349d73 
								
							 
						 
						
							
							
								
								Changed default OAuth token expiration time to 30 days.  
							
							
							
						 
						
							2020-12-09 19:59:46 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5b9b7b4888 
								
							 
						 
						
							
							
								
								Apply 1 suggestion(s) to 1 file(s)  
							
							
							
						 
						
							2020-12-08 16:16:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								fb3fd692c6 
								
							 
						 
						
							
							
								
								Add a startup error for modified Repo pool_size  
							
							
							
						 
						
							2020-12-07 16:44:55 -06: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