diff options
| author | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-02-24 14:42:46 +0100 |
|---|---|---|
| committer | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-02-24 14:42:46 +0100 |
| commit | 7676509fcd6ab0a6c3e666c00c6ff96ecc1f7ffb (patch) | |
| tree | 4af40ce8a204c43e99bf3026b1db2cf9679d1502 /client/js/controllers | |
| parent | d2f5ae5c83ef5bc41cf430ace79769459b4acbf8 (diff) | |
| parent | c511010ec41e57d99d1756780ee968269fa2b8fb (diff) | |
Merge branch 'loic' into develop
Diffstat (limited to 'client/js/controllers')
| -rw-r--r-- | client/js/controllers/home/main.js | 1 | ||||
| -rw-r--r-- | client/js/controllers/login.js | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js index d25bfad..27de5f3 100644 --- a/client/js/controllers/home/main.js +++ b/client/js/controllers/home/main.js @@ -6,7 +6,6 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', function ($scope, Compute) { - var updatePage=function(){ // TODO Update graph etc... } diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js index 829fc1d..a37591c 100644 --- a/client/js/controllers/login.js +++ b/client/js/controllers/login.js @@ -20,7 +20,6 @@ mainApp.controller('loginCtrl', ['$scope','$sce','Identity', function ($scope,$s $('#loadingLoginButton').hide(); $('#failedToLoginAlert').hide(); - $scope.loginAction=function(){ // Begin login state for template |