Commits · 9f91f3a76883c0064943e81a2713cb05e4125a73 · CIRCLE / cloud · GitLab

01 Oct, 2014 6 commits
- Merge branch 'clientCorrect' into 'master' · 9f91f3a7
```
Client cookie timer correction

Small correction :)

See merge request !226
```
  Bach Dániel committed Oct 01, 2014
  9f91f3a7 Browse Files
- Merge branch 'fix-http500' into 'master' · f69d7306
```
Fix http500

🚧 tests

See merge request !223
```
  Bach Dániel committed Oct 01, 2014
  f69d7306 Browse Files
- vm: fix flake8 warning · b841385c
  Bach Dániel committed Oct 01, 2014
  
  b841385c Browse Files
- Merge branch 'issue-310' into 'master' · 83f7bd1e
```
Add memory to vm list

Closes #310

See merge request !225
```
  Bach Dániel committed Oct 01, 2014
  83f7bd1e Browse Files
- vm: add MigrateOperation test · a30840bc
  Bach Dániel committed Oct 01, 2014
  
  a30840bc Browse Files
- network: show all hosts in vlan list table · 250c4b3d
```
The filtering messed up the host list table for vlans
that contains hosts that are not associated with VMs
```
  Kálmán Viktor committed Oct 01, 2014
  250c4b3d Browse Files
30 Sep, 2014 6 commits
- dashboard: log scheduler errors in VmMigrateView · 469417cd
  Bach Dániel committed Sep 30, 2014
  
  469417cd Browse Files
- vm: fix MigrateOperation (Unhandled exception: 'NoneType' object has no attribute 'host') · 803c7821
  Bach Dániel committed Sep 30, 2014
  
  803c7821 Browse Files
- dashboard: client cookie timer was missing an 1000 multiplication · 2ba806df
  Csók Tamás committed Sep 30, 2014
  
  2ba806df Browse Files
- dashboard: add a little margin to disk resize button · 687fccd6
  Kálmán Viktor committed Sep 30, 2014
  
  687fccd6 Browse Files
- requirements: bump sizefield version · ed8ce9ce
```
This contains the fix for the empty form issue after sending
invalid format
```
  Kálmán Viktor committed Sep 30, 2014
  ed8ce9ce Browse Files
- Merge branch 'issue-296' into 'master' · 8b724e09
```
Disabled edit buttons if user has only user perm in vm detail

Closes #296

See merge request !215
```
  Kálmán Viktor committed Sep 30, 2014
  8b724e09 Browse Files
29 Sep, 2014 4 commits
- dashboard: handle SchedulerError in MigrateView · f5f2eb9c
  Bach Dániel committed Sep 29, 2014
  
  f5f2eb9c Browse Files
- vm: fix issue #315 (TypeError: unsupported operand type(s) for +: 'long' and 'unicode') · 5c50b57b
```
Closes #315
```
  Bach Dániel committed Sep 29, 2014
  5c50b57b Browse Files
- Merge branch 'feature-redeploy' into 'master' · a3ceda07
```
Feature Redeploy

🚧 test

See merge request !218
```
  Bach Dániel committed Sep 29, 2014
  a3ceda07 Browse Files
- Merge branch 'fix-groupaclupdate' · f0929ad9
  Bach Dániel committed Sep 29, 2014
  
  f0929ad9 Browse Files
26 Sep, 2014 1 commit
- dashboard: add memory to vm list · a1403945
  Kálmán Viktor committed Sep 26, 2014
  
  a1403945 Browse Files
25 Sep, 2014 9 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
- vm: add ResetNodeOperation · a431c8f2
```
Closes #285
```
  Bach Dániel committed Sep 25, 2014
  a431c8f2 Browse Files
- vm: add redeploy operation · bff353e8
```
Closes #262
```
  Bach Dániel committed Sep 25, 2014
  bff353e8 Browse Files
- dashboard: add reset_node option to VmStateChangeForm · 1e4c94ea
  Bach Dániel committed Sep 25, 2014
  
  1e4c94ea Browse Files
- hotfix return in-middle of the function · dc674ca8
  Guba Sándor committed Sep 25, 2014
  
  dc674ca8 Browse Files
24 Sep, 2014 14 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