Commits · ed20ed7b815f15610c8372721e54ee9afb78b752 · Fukász Rómeó Ervin / cloud

28 Oct, 2014 13 commits
- dashboard: reindent node monitor column html · ed20ed7b
  Kálmán Viktor committed Oct 28, 2014
  
  ed20ed7b Browse Files
- dashboard: move inline css · 9795bd83
  Kálmán Viktor committed Oct 28, 2014
  
  9795bd83 Browse Files
- dashboard: fix vm create progress bars · f4cf294b
  Kálmán Viktor committed Oct 28, 2014
  
  f4cf294b Browse Files
- dashboard: fix store progress bar · 435048c3
  Kálmán Viktor committed Oct 28, 2014
  
  435048c3 Browse Files
- dashboard: fix index store list · a547cac5
  Kálmán Viktor committed Oct 28, 2014
  
  a547cac5 Browse Files
- dashboard: change bootstrap tour to introjs · 4855c8b3
```
Note: introjs 1.0.0 doesn't work with bootstrap
```
  Kálmán Viktor committed Oct 28, 2014
  4855c8b3 Browse Files
- bower: bump fontawesome version · e3adfe35
  Kálmán Viktor committed Oct 28, 2014
  
  e3adfe35 Browse Files
- dashboard: fix node box in bootstrap 3.2 · ab630e67
  Kálmán Viktor committed Oct 28, 2014
  
  ab630e67 Browse Files
- Merge branch 'master' into feature-pipeline · 67ab8684
```
Conflicts:
	circle/dashboard/static/dashboard/dashboard.js
	circle/dashboard/static/dashboard/disk-list.js
	circle/dashboard/static/dashboard/group-details.js
	circle/dashboard/static/dashboard/node-details.js
	circle/dashboard/static/dashboard/node-list.js
	circle/dashboard/static/dashboard/vm-details.js
	circle/dashboard/static/dashboard/vm-tour.js
	circle/dashboard/templates/dashboard/base.html
	circle/dashboard/templates/dashboard/index-nodes.html
	circle/dashboard/templates/dashboard/vm-detail.html
```
  Kálmán Viktor committed Oct 28, 2014
  67ab8684 Browse Files
- circle: use pipeline with disable compilers option · 368fa52f
  Kálmán Viktor committed Oct 28, 2014
  
  368fa52f Browse Files
- fab: compile less files before collectstatic in fab · 8eb950ce
  Kálmán Viktor committed Oct 28, 2014
  
  8eb950ce Browse Files
- circle: compileless command · aaa81f32
```
for staticcollected
```
  Kálmán Viktor committed Oct 28, 2014
  aaa81f32 Browse Files
- circle: ignore bower components and static files in less watch · d3dd06ae
  Kálmán Viktor committed Oct 28, 2014
  
  d3dd06ae Browse Files
27 Oct, 2014 17 commits
- Merge branch 'feature-node-permissions' into 'master' · 387eb4e8
```
Feature node permissions

Allow users with view_statistics to check the graphs and informations of the nodes.

See merge request !259
```
  Bach Dániel committed Oct 27, 2014
  387eb4e8 Browse Files
- dashboard: retab v3 · 76d043aa
  Bach Dániel committed Oct 27, 2014
  
  76d043aa Browse Files
- Merge branch 'feature-remove-tabs' into 'master' · d0f4347b
```
Feature replace tabs

See merge request !260
```
  Bach Dániel committed Oct 27, 2014
  d0f4347b Browse Files
- dashboard: retab v2 · 32e17050
  Bach Dániel committed Oct 27, 2014
  
  32e17050 Browse Files
- tests: fix redirects to permission denied (403) · 5c4c6d14
  Guba Sándor committed Oct 27, 2014
  
  5c4c6d14 Browse Files
- views/node: add get function to properly return 403 on unathorized · 69cf4530
```
access
```
  Guba Sándor committed Oct 27, 2014
  69cf4530 Browse Files
- dashboard: replace tabs in templates · 215b6f56
  Bach Dániel committed Oct 27, 2014
  
  215b6f56 Browse Files
- retab · 8316fe03
  Guba Sándor committed Oct 27, 2014
  
  8316fe03 Browse Files
- templates: remove unnecessary buttons and forms · b549f6b4
  Guba Sándor committed Oct 27, 2014
  
  b549f6b4 Browse Files
- tempaltes: hide buttons to non superusers · f1016e28
  Guba Sándor committed Oct 27, 2014
  
  f1016e28 Browse Files
- tempaltes: hide new button index/node_box · 80178219
  Guba Sándor committed Oct 27, 2014
  
  80178219 Browse Files
- templates: allow node box with vm.view_statistics perms · f0c59231
  Guba Sándor committed Oct 27, 2014
  
  f0c59231 Browse Files
- views/graph: allow graph with vm.view_statistics perms · 9928686b
  Guba Sándor committed Oct 27, 2014
  
  9928686b Browse Files
- views/node: allow node box with vm.view_statistics perms · 30681e63
  Guba Sándor committed Oct 27, 2014
  
  30681e63 Browse Files
- views/node: allow list with vm.view_statistics perms · 9ee92053
  Guba Sándor committed Oct 27, 2014
  
  9ee92053 Browse Files
- node: add view_statistics permission · 3c8b525a
  Guba Sándor committed Oct 27, 2014
  
  3c8b525a Browse Files
- Merge branch 'issue-319v2' · e00127f9
```
Conflicts:
	circle/dashboard/static/dashboard/node-details.js
```
  Bach Dániel committed Oct 27, 2014
  e00127f9 Browse Files
25 Oct, 2014 2 commits
- Merge branch 'fix-group-detail' into 'master' · 3d81d408
```
Fix group detail

Closes #323

See merge request !253
```
  Bach Dániel committed Oct 25, 2014
  3d81d408 Browse Files
- vm: handle cleanup errors in SaveAsTemplateOperation · 7c604358
  Bach Dániel committed Oct 25, 2014
  
  7c604358 Browse Files
22 Oct, 2014 2 commits
- dashboard: remove unused node list js · ae2e57a2
  Kálmán Viktor committed Oct 22, 2014
  
  ae2e57a2 Browse Files
- dashboard: escape html/or use .text instead of .html where needed · 5eba485c
  Kálmán Viktor committed Oct 22, 2014
  
  5eba485c Browse Files
21 Oct, 2014 1 commit
- dashboard: fix xss · 9efafced
  Bach Dániel committed Oct 21, 2014
  
  9efafced Browse Files
20 Oct, 2014 5 commits

locale: update Hungarian translation · f03b1685
```
fixes #343
```
Őry Máté committed Oct 20, 2014
f03b1685 Browse Files
update PO templates · 13ef826b
Őry Máté committed Oct 20, 2014

13ef826b Browse Files

Merge branch 'feature-new-tour' into 'master' · d3b23cb1

Feature new tour

Closes #211

Closes #210

(can't wait for pipeline)

![Kijelölés_020](https://git.ik.bme.hu/uploads/circle/cloud/4e651a54fa/Kijel%C3%B6l%C3%A9s_020.png)

![Kijelölés_021](https://git.ik.bme.hu/uploads/circle/cloud/e603387bb8/Kijel%C3%B6l%C3%A9s_021.png)

![Kijelölés_023](https://git.ik.bme.hu/uploads/circle/cloud/c113cf0cd2/Kijel%C3%B6l%C3%A9s_023.png)

![Kijelölés_022](https://git.ik.bme.hu/uploads/circle/cloud/1d67dc2f03/Kijel%C3%B6l%C3%A9s_022.png)

See merge request !236

committed Oct 20, 2014

d3b23cb1 Browse Files

dashboard: check for resource/disk perms in vm tour · 87cf344b
```
skip steps if the user doesn't have any
```
Kálmán Viktor committed Oct 20, 2014
87cf344b Browse Files

Merge branch 'fix-lease-template' into 'master' · 6116fd30

Fix lease/template

No more uhoh, if no permission to delete the template/lease.

Also fixed up Lease create (the user who created the lease didn't become owner), also removed all superuser mixins from lease views, cause they have ACL now.

See merge request !244

committed Oct 20, 2014

6116fd30 Browse Files