mirror of
				https://github.com/pierre42100/ComunicWeb
				synced 2025-11-04 12:14:12 +00:00 
			
		
		
		
	Fix conflict
This commit is contained in:
		@@ -121,7 +121,7 @@ const AccountInterface = {
 | 
				
			|||||||
	checkPasswordResetToken: function(token, callback){
 | 
						checkPasswordResetToken: function(token, callback){
 | 
				
			||||||
		var apiURI = "account/check_password_reset_token";
 | 
							var apiURI = "account/check_password_reset_token";
 | 
				
			||||||
		var params = {
 | 
							var params = {
 | 
				
			||||||
			token: token
 | 
								reset_token: token
 | 
				
			||||||
		};
 | 
							};
 | 
				
			||||||
		ComunicWeb.common.api.makeAPIrequest(apiURI, params, false, callback);
 | 
							ComunicWeb.common.api.makeAPIrequest(apiURI, params, false, callback);
 | 
				
			||||||
	},
 | 
						},
 | 
				
			||||||
@@ -136,7 +136,7 @@ const AccountInterface = {
 | 
				
			|||||||
	resetUserPassword: function(token, passwd, callback){
 | 
						resetUserPassword: function(token, passwd, callback){
 | 
				
			||||||
		var apiURI = "account/reset_user_passwd";
 | 
							var apiURI = "account/reset_user_passwd";
 | 
				
			||||||
		var params = {
 | 
							var params = {
 | 
				
			||||||
			token: token,
 | 
								reset_token: token,
 | 
				
			||||||
			password: passwd
 | 
								password: passwd
 | 
				
			||||||
		};
 | 
							};
 | 
				
			||||||
		ComunicWeb.common.api.makeAPIrequest(apiURI, params, false, callback);
 | 
							ComunicWeb.common.api.makeAPIrequest(apiURI, params, false, callback);
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user