Merge branch 'release/1.2.1'

5ebe0a43 · Vladimir Baranov · 8a145c24 · f4cfb14d · 5ebe0a43 · 5ebe0a43
Commit 5ebe0a43 authored Aug 18, 2016 by Vladimir Baranov
8 changed files
--- a/VERSION
+++ b/VERSION
-1.2.0
+1.2.1
--- a/app/zetalib/error_service.js
+++ b/app/zetalib/error_service.js
@@ -102,7 +102,6 @@ angular.module('ulakbus')
                    if ($location.path() === "/login") {
                        $log.debug("show errors on login form");
                    } else {
-                        alert("Want relogin!");
                        return window.location.reload();
                    }
                },

--- a/dist/app.js
+++ b/dist/app.js
--- a/dist/bower_components/components.js
+++ b/dist/bower_components/components.js
--- a/dist/bower_components/jquery.min.js
+++ b/dist/bower_components/jquery.min.js
--- a/dist/css/app.css
+++ b/dist/css/app.css
--- a/dist/index.html
+++ b/dist/index.html
@@ -17,7 +17,6 @@

    <link rel="stylesheet" href="css/app.css">
    <link rel="stylesheet" href="css/roboto/roboto.css">
-    <link rel="stylesheet" href="css/jquery-ui.min.css">
 </head>
 <body ng-controller="KeyListenController" ng-keydown="down($event)">

@@ -74,7 +73,6 @@


 <script src="bower_components/jquery.min.js"></script>
-<script src="bower_components/jquery-ui.min.js"></script>
 <script src="bower_components/angular.js"></script>
 <script src="bower_components/components.js"></script>
 <script src="shared/translations.js"></script>

--- a/dist/templates.js
+++ b/dist/templates.js