aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/server/ApiManagers/UserManager.ts7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/server/ApiManagers/UserManager.ts b/src/server/ApiManagers/UserManager.ts
index 3ae2a5d30..6997cb192 100644
--- a/src/server/ApiManagers/UserManager.ts
+++ b/src/server/ApiManagers/UserManager.ts
@@ -64,9 +64,15 @@ export default class UserManager extends ApiManager {
// req.assert("new_pass", "Password must be at least 4 characters long").len({ min: 4 });
req.assert("new_confirm", "Passwords do not match").equals(new_pass);
+<<<<<<< HEAD
+ // if (req.assert("new_pass", "Password must be at least 4 characters long").len({ min: 4 })) {
+ // result.inch = "interesting";
+ // }
+=======
if (req.assert("new_pass", "Password must be at least 4 characters long").len({ min: 4 })) {
result.inch = "interesting";
}
+>>>>>>> a9dab5e6befa36c54afd1e46507f266fda30a42e
// was there error in validating new passwords?
if (req.validationErrors()) {
@@ -89,6 +95,7 @@ export default class UserManager extends ApiManager {
});
+
register({
method: Method.GET,
subscription: "/activity",