Changeset 12563 for stable/HeuristicLab.Services.WebApp/3.3/WebApp/plugins/login

Timestamp:

07/01/15 14:59:47 (9 years ago)

Author:

ascheibe

Message:

#2394 merged r12428, r12429, r12430, r12435, r12442, r12443, r12445, r12514, r12517, r12519, r12520, r12521, r12523, r12532, r12542, r12546, r12552, r12553, r12556, r12557, r12559, r12561, r12146, r12457 into stable

Location:

stable

Files:

• . (modified) (2 props)
• HeuristicLab.Services.WebApp (copied) (copied from trunk/sources/HeuristicLab.Services.WebApp)
• HeuristicLab.Services.WebApp/3.3/WebApp/plugins/login/loginCtrl.js (modified) (1 diff)

stable/HeuristicLab.Services.WebApp/3.3/WebApp/plugins/login/loginCtrl.js

@@ -9 +9 @@
                         $window.location.reload();
                     } else {
-                        $scope.result = "error logging in";
+                        $scope.result = "Invalid username or password. Please try again.";
                     }
                 });