Merge branch 'master' into loic

2016-05-04 19:46:53 +02:00 · 2016-05-04 19:46:53 +02:00 · 4b978d4584
commit 4b978d4584
parent 0266c16ffc a0056da906
107 changed files with 23935 additions and 1 deletions
--- a/client/js/controllers/image/image.js
+++ b/client/js/controllers/image/image.js
@ -5,7 +5,7 @@
 */
 mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', 'Identity','$rootScope', function ($scope, Image, Loading, Identity, $rootScope)
    {
-			console.log("test");
+
        // Update view
        var callMeAfterGetImage = function () {
            $scope.images = Image.getData().images;