Commits · f0929ad9a9e18f8c928a549b6e8021db6b166696 · CIRCLE / cloud · GitLab

29 Sep, 2014 1 commit
- Merge branch 'fix-groupaclupdate' · f0929ad9
  Bach Dániel committed Sep 29, 2014
  
  f0929ad9 Browse Files
25 Sep, 2014 6 commits
- Merge branch 'issue-289' into 'master' · fed6ed40
```
show current node of vm

fixes #289
```
  Bach Dániel committed Sep 25, 2014
  fed6ed40 Browse Files
- Merge remote-tracking branch 'origin/master' into issue-289 · bc48c0ba
```
Conflicts:
	circle/dashboard/static/dashboard/dashboard.css
```
  Bach Dániel committed Sep 25, 2014
  bc48c0ba Browse Files
- dashboard: fix tests · 2cddba6e
  Bach Dániel committed Sep 25, 2014
  
  2cddba6e Browse Files
- dashboard: use correct profile.pk in GroupAclUpdateView · aecadda0
```
Closes #308
```
  Bach Dániel committed Sep 25, 2014
  aecadda0 Browse Files
- Merge branch 'issue-306' into 'master' · 9aec9ec4
```
Add permission check for profile view

Closes #306
```
  Bach Dániel committed Sep 25, 2014
  9aec9ec4 Browse Files
- hotfix return in-middle of the function · dc674ca8
  Guba Sándor committed Sep 25, 2014
  
  dc674ca8 Browse Files
24 Sep, 2014 33 commits
- Merge branch 'feature-resize_disk' into 'master' · 8f6b93ba
```
Feature Resize Disk

Resize disk image on a running virtual machine.
```
  Bach Dániel committed Sep 24, 2014
  8f6b93ba Browse Files
- Merge branch 'fix-extra-ws' into 'master' · ed1b46ed
```
Fix Extra Ws
```
  Bach Dániel committed Sep 24, 2014
  ed1b46ed Browse Files
- Merge branch 'master' into feature-resize_disk · dec67193
```
Conflicts:
	circle/vm/operations.py
```
  Őry Máté committed Sep 24, 2014
  dec67193 Browse Files
- vm: remove noop try-except block · a27aafa6
  Őry Máté committed Sep 24, 2014
  
  a27aafa6 Browse Files
- vm: remove always-true condition · 5788a437
  Őry Máté committed Sep 24, 2014
  
  5788a437 Browse Files
- dashboard: set initial resize size to current+10G · dff4ec15
  Őry Máté committed Sep 24, 2014
  
  dff4ec15 Browse Files
- dashboard: allow choosing disk in resize form · b57d742b
  Őry Máté committed Sep 24, 2014
  
  b57d742b Browse Files
- dashboard: vm list css fixes · 026e7b20
```
- make sure the status icon and text are in 1 line always
- center stuff to the middle vertically
```
  Kálmán Viktor committed Sep 24, 2014
  026e7b20 Browse Files
- Merge branch 'feature-save_as-status' into 'master' · 1b85b8f4
```
Feature Save As Status
```
  Guba Sándor committed Sep 24, 2014
  1b85b8f4 Browse Files
- dashboard: fix perm of profile view · 91be5c4c
  Kálmán Viktor committed Sep 24, 2014
  
  91be5c4c Browse Files
- dashboard: fix extra whitespace after merge activity text · c1d44817
  Kálmán Viktor committed Sep 24, 2014
  
  c1d44817 Browse Files
- Merge branch 'issue-292' into 'master' · b63173e2
```
Template traits and tags aren't editable
```
  Bach Dániel committed Sep 24, 2014
  b63173e2 Browse Files
- vm: fix tests to match new allocate_node · 2a45d4dc
  Őry Máté committed Sep 24, 2014
  
  2a45d4dc Browse Files
- vm: make Instance.allocate_node smarter · e445a532
  Őry Máté committed Sep 24, 2014
  
  e445a532 Browse Files
- dashboard: decrease mccabe complexity · 86cd1095
```
we don't have FileField in this form so this won't change much
```
  Kálmán Viktor committed Sep 24, 2014
  86cd1095 Browse Files
- Merge branch 'fix-get-acl-data' into 'master' · 986920ab
```
Fix Get Acl Data
```
  Bach Dániel committed Sep 24, 2014
  986920ab Browse Files
- 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
- hide resize button if no permission · 4ca21fef
  Guba Sándor committed Sep 24, 2014
  
  4ca21fef Browse Files
- dashboard,storage: add proper permission · c99ddda2
  Guba Sándor committed Sep 24, 2014
  
  c99ddda2 Browse Files
- dashboard: change float to int · aed52db7
  Guba Sándor committed Sep 24, 2014
  
  aed52db7 Browse Files
- operation: add status to save_as operation · e8e24d8b
  Guba Sándor committed Sep 24, 2014
  
  e8e24d8b Browse Files