Commits · 113c216a6f34a3ba6e6e4821da1301aeaa9622d0 · CIRCLE / cloud · GitLab

24 Sep, 2014 13 commits
- Merge branch 'issue-298' into 'master' · 113c216a
```
Issue 298

closes #298
```
  Bach Dániel committed Sep 24, 2014
  113c216a Browse Files
- dashboard: fix VmMigrateView · 0a778b39
  Őry Máté committed Sep 24, 2014
  
  0a778b39 Browse Files
- locale: update Hungarian translation again · e3519af3
  Őry Máté committed Sep 24, 2014
  
  e3519af3 Browse Files
- vm: add OFFLINE state for disabled non-online nodes · 28867629
  Őry Máté committed Sep 24, 2014
  
  28867629 Browse Files
- dashboard: show more detailed status info in node-detail · 13efc315
  Őry Máté committed Sep 24, 2014
  
  13efc315 Browse Files
- dashboard: show node status in list · d49b38d5
  Őry Máté committed Sep 24, 2014
  
  d49b38d5 Browse Files
- dashboard: fix merge · 1eef65b6
  Őry Máté committed Sep 24, 2014
  
  1eef65b6 Browse Files
- update Hungarian translation · ed427beb
  Őry Máté committed Sep 24, 2014
  
  ed427beb Browse Files
- update PO templates · 37eef882
  Őry Máté committed Sep 24, 2014
  
  37eef882 Browse Files
- Merge branch 'master' into issue-298 · 34e36778
```
Conflicts:
	circle/dashboard/urls.py
	circle/dashboard/views/node.py
	circle/vm/models/node.py
```
  Őry Máté committed Sep 24, 2014
  34e36778 Browse Files
- vm: reset schedule_enabled if not node.enabled · 422d6191
  Őry Máté committed Sep 24, 2014
  
  422d6191 Browse Files
- vm: use Node.schedule_enabled in Node states · 067a35d9
  Őry Máté committed Sep 24, 2014
  
  067a35d9 Browse Files
- manager: don't schedule to non-schedule_enabled Node · bf7cb98d
  Őry Máté committed Sep 24, 2014
  
  bf7cb98d Browse Files
23 Sep, 2014 10 commits
- vm: fix tests · 8c1e37eb
  Őry Máté committed Sep 23, 2014
  
  8c1e37eb Browse Files
- dashboard: add new node operation views · 1c990ba8
  Őry Máté committed Sep 23, 2014
  
  1c990ba8 Browse Files
- vm: add new Node operations · cbf6979a
  Őry Máté committed Sep 23, 2014
  
  cbf6979a Browse Files
- dashboard: remove old node-op views · 494dc514
  Őry Máté committed Sep 23, 2014
  
  494dc514 Browse Files
- Merge branch 'fabfile-monitor-client' into 'master' · 34bf3f22
```
fabfile: add monitor-client
```
  Bach Dániel committed Sep 23, 2014
  34bf3f22 Browse Files
- Merge branch 'fix-graphs' into 'master' · f39316fd
```
Fix Graphs

Closes #238
Closes #237
Closes #281

Demo: https://miskolc.cloud.bme.hu:18525/dashboard/node/list/
```
  Bach Dániel committed Sep 23, 2014
  f39316fd Browse Files
- dashboard: raise Http404 instead of SuspiciousOperation in GraphViewBase · 226520e5
  Bach Dániel committed Sep 23, 2014
  
  226520e5 Browse Files
- dashboard: graph fixes · 26742917
```
- change default button to simply represent a time
- add max-width 100% for graphs
```
  Kálmán Viktor committed Sep 23, 2014
  26742917 Browse Files
- vm: add Node.schedule_enabled · 20dd6ea5
  Őry Máté committed Sep 23, 2014
  
  20dd6ea5 Browse Files
- common: make register_operation a class-decorator · 23717a39
  Őry Máté committed Sep 23, 2014
  
  23717a39 Browse Files
22 Sep, 2014 17 commits
- dashboard: i18n for graphs · 9ffd1dbd
  Bach Dániel committed Sep 22, 2014
  
  9ffd1dbd Browse Files
- Merge branch 'fix-connect-button' into 'master' · d6f8ae38
```
Fix Connect Button
```
  Bach Dániel committed Sep 22, 2014
  d6f8ae38 Browse Files
- dashboard: enhance graphs · ccbce20a
```
- highlight the currently selected option
- switch the images via js
```
  Kálmán Viktor committed Sep 22, 2014
  ccbce20a Browse Files
- dashboard: fix #297 (Client connect button throws 403 for users (requires operator level)) · a5867cdc
```
Closes #297
```
  Bach Dániel committed Sep 22, 2014
  a5867cdc Browse Files
- dashboard: add 6 months to graph time options · dd4d012c
```
also change 1 month to 30 days instead of 4 weeks
```
  Kálmán Viktor committed Sep 22, 2014
  dd4d012c Browse Files
- dashboard: add graph time options · 0107aa6d
  Kálmán Viktor committed Sep 22, 2014
  
  0107aa6d Browse Files
- dashboard: move inline css · d3fb12c8
  Kálmán Viktor committed Sep 22, 2014
  
  d3fb12c8 Browse Files
- dashboard: add graph time options for node graphs · c85691f6
  Kálmán Viktor committed Sep 22, 2014
  
  c85691f6 Browse Files
- fabfile: add monitor-client · 93079b1d
  Bach Dániel committed Sep 22, 2014
  
  93079b1d Browse Files
- dashboard: close unclosed tag · 83635528
  Kálmán Viktor committed Sep 22, 2014
  
  83635528 Browse Files
- Merge branch 'master' into fix-graphs · 8355c1d3
```
Conflicts:
	circle/dashboard/views.py
```
  Kálmán Viktor committed Sep 22, 2014
  8355c1d3 Browse Files
- dashboard: center node graphs · 0892583d
  Kálmán Viktor committed Sep 22, 2014
  
  0892583d Browse Files
- Merge branch 'issue-295' into 'master' · 0c2709fa
```
Issue 295
```
  Őry Máté committed Sep 22, 2014
  0c2709fa Browse Files
- Merge branch 'feature-refactor-views' into 'master' · 91843cc1
```
Feature Refactor Views
```
  Őry Máté committed Sep 22, 2014
  91843cc1 Browse Files
- Merge branch 'master' into feature-refactor-views · 154902de
```
Conflicts:
	circle/dashboard/views.py
```
  Őry Máté committed Sep 22, 2014
  154902de Browse Files
- dashboard: fix graph for disabled node · 9d8e8ef0
  Kálmán Viktor committed Sep 22, 2014
  
  9d8e8ef0 Browse Files
- dashboard: fix redirects · 2fd40158
  Őry Máté committed Sep 22, 2014
  
  2fd40158 Browse Files