Commits · e11fffa5cd3fde2f2511aac9530942b82dd09709 · CIRCLE / cloud · GitLab

01 Oct, 2014 9 commits
- Merge remote-tracking branch 'origin/master' into feature-vm-tasks · e11fffa5
```
Conflicts:
	circle/vm/models/instance.py
	circle/vm/tests/test_models.py
```
  Bach Dániel committed Oct 01, 2014
  e11fffa5 Browse Files
- vm: fix typos · 19cdda94
  Őry Máté committed Oct 01, 2014
  
  19cdda94 Browse Files
- 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
- vm: fix tests · a89d41d2
  Őry Máté committed Oct 01, 2014
  
  a89d41d2 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 9 commits
- dashboard: add memory to vm list · a1403945
  Kálmán Viktor committed Sep 26, 2014
  
  a1403945 Browse Files
- vm: move Instance.get_screenshot to ScreenshotOperation · b0e7d502
  Őry Máté committed Sep 26, 2014
  
  b0e7d502 Browse Files
- vm: move Instance.migrate_vm to MigrateOperation · cd1b2bc0
  Őry Máté committed Sep 26, 2014
  
  cd1b2bc0 Browse Files
- vm: move Instance.delete_mem_dump to DeleteMemDumpOperation · bd5649a8
  Őry Máté committed Sep 26, 2014
  
  bd5649a8 Browse Files
- vm: move Instance.shutdown_vm to ShutdownOperation · bc931f31
  Őry Máté committed Sep 26, 2014
  
  bc931f31 Browse Files
- vm: move Instance.suspend_vm to SuspendVmOperation · faa40f86
  Őry Máté committed Sep 26, 2014
  
  faa40f86 Browse Files
- vm: move Instance.wake_up_vm to WakeUpVmOperation · 71c7bedb
  Őry Máté committed Sep 26, 2014
  
  71c7bedb Browse Files
- vm: fix tests · 191641ad
  Őry Máté committed Sep 26, 2014
  
  191641ad Browse Files
- vm: move Instance.deploy_vm to DeployVmOperation · eb9b746f
  Őry Máté committed Sep 26, 2014
  
  eb9b746f Browse Files
25 Sep, 2014 12 commits
- vm: first batch of moving Instance methods to SubOperations · 95199687
  Őry Máté committed Sep 25, 2014
  
  95199687 Browse Files
- vm: remove redundant activity_code_suffixes · afa5deac
  Őry Máté committed Sep 25, 2014
  
  afa5deac Browse Files
- vm: add remote operation classes · 0caef6e0
  Őry Máté committed Sep 25, 2014
  
  0caef6e0 Browse Files
- 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
- vm: refactor InstanceActiveManager · 613c590c
  Őry Máté committed Sep 25, 2014
  
  613c590c Browse Files
- common: add SubOperationMixin · 75c6484a
  Őry Máté committed Sep 25, 2014
  
  75c6484a 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