Brian Underwood 
								
							 
						 
						
							
							
							
							
								
							
							
								7ca9ce9d67 
								
							 
						 
						
							
							
								
								fix: Give error message to users when address has already been validated  
							
							... 
							
							
							
							Plus other errors. 
							
						 
						
							2023-01-12 22:08:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								9be6caf125 
								
							 
						 
						
							
							
								
								argon2 password hashing ( #406 )  
							
							... 
							
							
							
							Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/406  
							
						 
						
							2022-12-30 02:46:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								07a48b9293 
								
							 
						 
						
							
							
								
								giant massive dep upgrade and dialyxir-found error emporium ( #371 )  
							
							... 
							
							
							
							Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/371  
							
						 
						
							2022-12-14 12:38:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									floatingghost 
								
							 
						 
						
							
							
							
							
								
							
							
								6b882a2c0b 
								
							 
						 
						
							
							
								
								Purge Rejected Follow requests in daily task ( #334 )  
							
							... 
							
							
							
							Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/334  
							
						 
						
							2022-12-03 23:17:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Norm 
								
							 
						 
						
							
							
							
							
								
							
							
								a6d85003fe 
								
							 
						 
						
							
							
								
								Remote interaction with posts ( #198 )  
							
							... 
							
							
							
							Grabbed from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3587 
Co-authored-by: Tusooa Zhu <tusooa@kazv.moe>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/198 
Co-authored-by: Norm <normandy@biribiri.dev>
Co-committed-by: Norm <normandy@biribiri.dev> 
							
						 
						
							2022-09-08 10:19:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Joel Beckmeyer 
								
							 
						 
						
							
							
							
							
								
							
							
								e26388a01c 
								
							 
						 
						
							
							
								
								Support reaching user@sub.domain.tld at user@domain.tld ( #134 )  
							
							... 
							
							
							
							Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/134 
Co-authored-by: Joel Beckmeyer <joel@beckmeyer.us>
Co-committed-by: Joel Beckmeyer <joel@beckmeyer.us> 
							
						 
						
							2022-08-02 13:54:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tusooa Zhu 
								
							 
						 
						
							
							
							
							
								
							
							
								4c5bc3e9f7 
								
							 
						 
						
							
							
								
								Pass remote follow avatar into media proxy  
							
							
							
						 
						
							2022-07-12 15:44:38 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sfr 
								
							 
						 
						
							
							
							
							
								
							
							
								058bf96798 
								
							 
						 
						
							
							
								
								implement Move activities ( #45 )  
							
							... 
							
							
							
							Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/45 
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com> 
							
						 
						
							2022-07-04 16:29:39 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6eb7d69e60 
								
							 
						 
						
							
							
								
								Merge branch 'delete-account-fix' into 'develop'  
							
							... 
							
							
							
							TwitterAPI: allow deleting one's own account with request body
Closes  #2799  and #2746 
See merge request pleroma/pleroma!3564  
							
						 
						
							2021-12-15 21:26:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8672ad6b00 
								
							 
						 
						
							
							
								
								TwitterAPI: allow deleting one's own account with request body  
							
							
							
						 
						
							2021-12-13 17:07:29 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8286ceb465 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into password-reset  
							
							
							
						 
						
							2021-12-03 00:11:38 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5da4f33bf1 
								
							 
						 
						
							
							
								
								Restore POST /auth/password  
							
							
							
						 
						
							2021-12-03 00:10:57 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a17910a6c6 
								
							 
						 
						
							
							
								
								CI: Bump lint stage to elixir-1.12  
							
							... 
							
							
							
							Elixir 1.12 changed formatting rules, this allows to avoid having to rollback to run `mix format` 
							
						 
						
							2021-10-06 08:11:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tusooa Zhu 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								198250dcef 
								
							 
						 
						
							
							
								
								Allow users to remove their emails if instance does not need email to register  
							
							
							
						 
						
							2021-09-05 21:27:02 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0e2aebd036 
								
							 
						 
						
							
							
								
								TwitterAPI: Make change_email require body params instead of query  
							
							... 
							
							
							
							Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503  
							
						 
						
							2021-08-13 17:57:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3961422f85 
								
							 
						 
						
							
							
								
								TwitterAPI: Make change_password require body params instead of query  
							
							... 
							
							
							
							Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503  
							
						 
						
							2021-08-13 17:56:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								197cdebca9 
								
							 
						 
						
							
							
								
								TwitterAPI: Make change_email require body params instead of query  
							
							
							
						 
						
							2021-08-10 20:33:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								09dcb2b522 
								
							 
						 
						
							
							
								
								TwitterAPI: Make change_password require body params instead of query  
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2740  
							
						 
						
							2021-08-10 20:01:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								0c56f9de0d 
								
							 
						 
						
							
							
								
								Merge branch 'tests/openapi-everywhere' into 'develop'  
							
							... 
							
							
							
							Put OpenAPI ~everywhere in tests
See merge request pleroma/pleroma!3324  
							
						 
						
							2021-06-04 18:53:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3ec1dbd922 
								
							 
						 
						
							
							
								
								Let pins federate  
							
							... 
							
							
							
							- save object ids on pin, instead of activity ids
- pins federation
- removed pinned_activities field from the users table
- activityPub endpoint for user pins
- pulling remote users pins 
							
						 
						
							2021-03-25 13:03:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								55bdfb075c 
								
							 
						 
						
							
							
								
								OpenAPI: TwitterAPI Util Controller  
							
							
							
						 
						
							2021-03-15 06:47:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a22c53810b 
								
							 
						 
						
							
							
								
								Remove deprecated /api/qvitter/statuses/notifications/read  
							
							
							
						 
						
							2021-03-15 06:47:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								e854c35e65 
								
							 
						 
						
							
							
								
								Convert tests to all use clear_config instead of Pleroma.Config.put  
							
							
							
						 
						
							2021-01-26 11:58:43 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								28581e03ad 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/deactivated_user_field  
							
							
							
						 
						
							2021-01-18 14:58:21 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								44a86951a3 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/approval_pending_user_field  
							
							
							
						 
						
							2021-01-18 12:05:05 -06: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 
								
							 
						 
						
							
							
							
							
								
							
							
								860b5c7804 
								
							 
						 
						
							
							
								
								Change user.deactivated field to user.is_active  
							
							
							
						 
						
							2021-01-15 11:24:46 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								f7e59c28ed 
								
							 
						 
						
							
							
								
								Change user.approval_pending field to user.is_approved  
							
							
							
						 
						
							2021-01-15 10:42:02 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								39f3683a06 
								
							 
						 
						
							
							
								
								Pbkdf2: Use it everywhere.  
							
							
							
						 
						
							2021-01-14 15:06:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9106048c61 
								
							 
						 
						
							
							
								
								Password: Replace Pbkdf2 with Password.  
							
							
							
						 
						
							2021-01-13 15:11:11 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								9d5ce82221 
								
							 
						 
						
							
							
								
								Test: More async/sync tweaks.  
							
							
							
						 
						
							2020-12-21 15:05:56 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								b4b68b71fc 
								
							 
						 
						
							
							
								
								Tests: Remove unneeded explicit cachex use.  
							
							... 
							
							
							
							Only use cachex when we're actually testing it. 
							
						 
						
							2020-12-18 13:18:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								30ed7b502f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into registration-workflow  
							
							
							
						 
						
							2020-11-21 10:23:53 -06: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9546c1444c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into registration-workflow  
							
							
							
						 
						
							2020-11-14 19:48:47 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								1a98476f48 
								
							 
						 
						
							
							
								
								Remove unused aliases  
							
							
							
						 
						
							2020-10-30 18:42:43 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c3112fd13a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into registration-workflow  
							
							
							
						 
						
							2020-10-13 19:20:00 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7dffaef479 
								
							 
						 
						
							
							
								
								tests consistency  
							
							
							
						 
						
							2020-10-13 16:35:09 +03:00