| 
								
								
									 lain | ba40af054c | Merge branch 'test-cases-mox-setup' into 'develop' Mox mode setup tweak; refactoring
See merge request pleroma/pleroma!3263 | 2021-01-21 09:03:26 +00:00 |  | 
				
					
						| 
								
								
									 feld | 2926713fe5 | Merge branch 'deprecate-public_endpoint' into 'develop' Deprecate Uploaders.S3, :public_endpoint
See merge request pleroma/pleroma!3251 | 2021-01-20 22:48:48 +00:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 9988d9261c | Add bucket_namespace to be extra certain truncated_namespace works | 2021-01-20 16:33:00 -06:00 |  | 
				
					
						| 
								
								
									 Mark Felder | dfc4cb6ebd | Special handling for unconfirmed users based on instance config no longer needed. | 2021-01-20 11:30:29 -06:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 5d344e5c79 | Only need to test if unconfirmed users are successfully deleted It's no longer possible to have an active user account with User.is_confirmed == false | 2021-01-20 11:26:14 -06:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 3cb4d40ebf | This scenario no longer exists. Users are auto-confirmed if confirmation not required at time of registration. | 2021-01-20 11:17:13 -06:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 318d6dde1c | Mox mode setup tweak; refactoring. | 2021-01-19 00:23:39 +03:00 |  | 
				
					
						| 
								
								
									 feld | 958a7f6ed0 | Merge branch 'fix/reblog-api' into 'develop' Fix Reblog API
Closes #2423
See merge request pleroma/pleroma!3261 | 2021-01-18 21:19:14 +00:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 44a86951a3 | Merge branch 'develop' into refactor/approval_pending_user_field | 2021-01-18 12:05:05 -06:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 51d5951c02 | Test that only author can reblog a private status | 2021-01-18 21:01:00 +04: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 |  | 
				
					
						| 
								
								
									 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 | f7e59c28ed | Change user.approval_pending field to user.is_approved | 2021-01-15 10:42:02 -06: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 | 0b725f5d21 | Lint | 2021-01-14 16:00:32 -06:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 12c8ce481c | Bump Copyright year | 2021-01-14 13:58:52 -06:00 |  | 
				
					
						| 
								
								
									 Mark Felder | fb47e83adc | Add ConfigDB migration | 2021-01-14 13:53:55 -06:00 |  | 
				
					
						| 
								
								
									 Lain Soykaf | fd9a0ac329 | BackupTest: Fix s3 test. | 2021-01-14 20:18:45 +01:00 |  | 
				
					
						| 
								
								
									 Lain Soykaf | c4b74c9c3f | Linting. | 2021-01-14 16:01:14 +01: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 | ba234d3c73 | Unnecessary duplication here | 2021-01-13 12:01:01 -06:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 94e5180846 | Consistent style | 2021-01-13 12:00:48 -06:00 |  | 
				
					
						| 
								
								
									 Lain Soykaf | aff83eb7c1 | Linting | 2021-01-13 16:00:12 +01: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 | 67e888498c | Switch another test to Upload.base_url/0 | 2021-01-12 16:42:43 -06:00 |  | 
				
					
						| 
								
								
									 Mark Felder | e87cca97e6 | Fix tests relying on old behavior. Use the Upload.base_url, Luke. | 2021-01-12 16:35:10 -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 | 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 | 3c936061d5 | Apply Upload.base_url for S3 | 2021-01-08 17:32:42 -06:00 |  | 
				
					
						| 
								
								
									 lain | 5822338f3a | Merge branch 'guppe-example' into 'develop' ActivtityPub Test: Add example for guppe actor
See merge request pleroma/pleroma!3243 | 2021-01-08 15:55:48 +00:00 |  | 
				
					
						| 
								
								
									 Alex Gleason | e73c7fa7e5 | Merge remote-tracking branch 'upstream/develop' into confirm-users | 2021-01-08 07:48:19 -06:00 |  | 
				
					
						| 
								
								
									 Alex Gleason | 1b98cd8610 | Remove ConfirmUserPlug | 2021-01-08 07:47:55 -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 | bd788c0939 | ActivtityPub Test: Add example for guppe actor | 2021-01-07 16:20:30 +01:00 |  | 
				
					
						| 
								
								
									 lain | cf0eb0c1c5 | Merge branch 'object-normalize-refactor' into 'develop' Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229 | 2021-01-07 11:09:18 +00:00 |  | 
				
					
						| 
								
								
									 lain | 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 | 9f6fa5877f | Add AdminAPI.AccountViewTest | 2021-01-06 11:43:07 -06: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 | f9090e00e6 | Add test to validate URLs to custom emojis are properly encoded | 2021-01-05 13:58:49 -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 | fee0c6a2cb | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-confirm-users | 2021-01-05 13:33:57 +01:00 |  | 
				
					
						| 
								
								
									 lain | e802b48d55 | User: Use ObjectID type to validate also-known-as field | 2021-01-05 13:10:14 +01:00 |  |