Merge branch 'hotfix/1.2.1'

isard-vdi · Jul 6, 2019 · a656a27 · a656a27
2 parents 89eb223 + 89cea9f
commit a656a27
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/.env b/.env
@@ -1 +1 @@
-TAG=1.2.0
+TAG=1.2.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.2.1] - 2019-07-06
+
+### Fixed
+
+- Removed last access from the user profile page [#67](https://github.com/isard-vdi/isard/issues/67)
+- Hide the delete user button until it works [#171](https://github.com/isard-vdi/isard/issues/171)
+- Don't depend only on environment variables for the Docker Compose Isard version [#175](https://github.com/isard-vdi/isard/pull/175)
+
 ## [1.2.0] - 2019-06-21 | La Pedriza
 
 ### Added

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
       - "443:443"
     networks:
       - isard_network
-    image: isard/nginx:${TAG}
+    image: isard/nginx:${TAG:-latest}
     build:
       context: .
       dockerfile: dockers/nginx/Dockerfile    
@@ -41,7 +41,7 @@ services:
       - "55900-55999:55900-55999"
     networks:
       - isard_network
-    image: isard/hypervisor:${TAG}
+    image: isard/hypervisor:${TAG:-latest}
     build:
       context: .
       dockerfile: dockers/hypervisor/Dockerfile    
@@ -62,7 +62,7 @@ services:
       - "isard-engine:127.0.0.1"
     networks:
       - isard_network
-    image: isard/app:${TAG}
+    image: isard/app:${TAG:-latest}
     build:
       context: .
       dockerfile: dockers/app/Dockerfile

diff --git a/src/webapp/templates/admin/pages/users_detail.html b/src/webapp/templates/admin/pages/users_detail.html
@@ -31,7 +31,9 @@ <h2>d.name</h2>
                             <button class="btn btn-success btn-xs pull-right btn-active" type="button"  data-placement="top" ><i class="fa fa-cube m-right-xs"></i>Enable/Disable</button>
                             <button class="btn btn-info btn-xs pull-right btn-passwd" type="button"  data-placement="top"><i class="fa fa-pencil m-right-xs" ></i>Reset passwd</button>
                             <button class="btn btn-info btn-xs pull-right btn-edit" type="button"  data-placement="top"><i class="fa fa-pencil m-right-xs" ></i>Edit</button>
+                            <!--
                             <button class="btn btn-danger btn-xs pull-right btn-delete" type="button"  data-placement="top" ><i class="fa fa-remove m-right-xs"></i>Delete</button>
+                            -->
                           </div>
                         </div>
                       </div>

diff --git a/src/webapp/templates/pages/user_profile.html b/src/webapp/templates/pages/user_profile.html
@@ -77,18 +77,9 @@ <h3>{{user.name}}</h3>
                     <div class="col-md-9 col-sm-9 col-xs-12">
 
                       <div class="profile_title">
-                        <div class="col-md-6">
+                        <div class="col-md-12">
                           <h2>User Activity Report</h2>
                         </div>
-                        <div class="col-md-6">
-                          <div id="reportrange" class="pull-right" style="margin-top: 5px; background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #E6E9ED">
-                            Last access: {{user.accessed}}
-<!--
-                            <i class="glyphicon glyphicon-calendar fa fa-calendar"></i>
-                            <span>December 30, 2014 - January 28, 2015</span> <b class="caret"></b>
--->
-                          </div>
-                        </div>
                       </div>
                       <!-- start of user-activity-graph -->
                       <div id="domains_donut" style="height:250px;"></div>