Commits · 1311ddb3449bd57e8cd9764d2fb733c39ae068e3 · CIRCLE / cloud · GitLab

09 Jul, 2014 4 commits
- Merge branch 'feature-abort-save_as-rebased' into 'master' · 1311ddb3
```
Feature: abort save as
```
  Bach Dániel committed Jul 09, 2014
  1311ddb3 Browse Files
- vm: fix destroy_net in DestroyOperation · 00227f21
  Bach Dániel committed Jul 09, 2014
  
  00227f21 Browse Files
- vm: fix SaveAsTemplateOperation.on_abort() · 4cb0af54
  Bach Dániel committed Jul 09, 2014
  
  4cb0af54 Browse Files
- monitor: add timeout to measure_response_time() · fdd67076
  Bach Dániel committed Jul 09, 2014
  
  fdd67076 Browse Files
08 Jul, 2014 7 commits
- storage: save_as task parameter optional · 559e0901
  Guba Sándor committed Jul 08, 2014
  
  559e0901 Browse Files
- storage: make save_as abortable task · 66b0952f
  Guba Sándor committed Jul 08, 2014
  
  66b0952f Browse Files
- operations: add task parameter to Disk.save_as · 0bb9d185
  Guba Sándor committed Jul 08, 2014
  
  0bb9d185 Browse Files
- fix issue #185 (AclUpdateView should take org id into consideration) · d713a4fd
```
fixes #185
```
  Bach Dániel committed Jul 08, 2014
  d713a4fd Browse Files
- dashboard: fix operation view's template context · b2e6c849
  Őry Máté committed Jul 08, 2014
  
  b2e6c849 Browse Files
- dashboard: use proper button color for operations · 3e205b4e
  Őry Máté committed Jul 08, 2014
  
  3e205b4e Browse Files
- vm: Set DeployOperation.is_preferred == True for pending vms · 9f3d2282
  Bach Dániel committed Jul 08, 2014
  
  9f3d2282 Browse Files
07 Jul, 2014 17 commits
- Merge branch 'feature-group-perms' into 'master' · 0b3c1d59
```
Change group perms

![](http://i.imgur.com/iDgAcpa.png)
```
  Kálmán Viktor committed Jul 07, 2014
  0b3c1d59 Browse Files
- Merge branch 'issue-189' into 'master' · 6faef9af
```
Edit button for network interfaces in vm detail

![](http://i.imgur.com/7fOk30y.png)

Closes #189
```
  Kálmán Viktor committed Jul 07, 2014
  6faef9af Browse Files
- dashboard: oups, fix redirect url too · 03940a7f
  Kálmán Viktor committed Jul 07, 2014
  
  03940a7f Browse Files
- dashboard: fix css class names · 36ef4513
  Kálmán Viktor committed Jul 07, 2014
  
  36ef4513 Browse Files
- dashboard: add edit button for network interfaces · b6c2d26c
  Kálmán Viktor committed Jul 07, 2014
  
  b6c2d26c Browse Files
- dashboard: permissions form for group edit · 13dc0b24
  Kálmán Viktor committed Jul 07, 2014
  
  13dc0b24 Browse Files
- add pika to requirements · 3d7a6628
  Bach Dániel committed Jul 07, 2014
  
  3d7a6628 Browse Files
- storage: fix flake8 warnings · 22bc8ba0
  Bach Dániel committed Jul 07, 2014
  
  22bc8ba0 Browse Files
- Merge branch 'feature-fix-acls' · a8fb5a86
```
Conflicts:
	circle/vm/operations.py
```
  Bach Dániel committed Jul 07, 2014
  a8fb5a86 Browse Files
- Merge branch 'feature-recover' into 'master' · f7488817
```
Feature: Recover destroyed vm
```
  Bach Dániel committed Jul 07, 2014
  f7488817 Browse Files
- Merge branch 'issue-89-v2' into 'master' · e0fb01fd
```
Monitor response time, celery availability, boot time and running template instances

Graphite: http://pc3.szgt.uni-miskolc.hu:12275/
```
  Bach Dániel committed Jul 07, 2014
  e0fb01fd Browse Files
- vm: fix test_flush() · f32bb524
  Bach Dániel committed Jul 07, 2014
  
  f32bb524 Browse Files
- vm: add is_superuser check to FlushOperation · fa3812a3
  Bach Dániel committed Jul 07, 2014
  
  fa3812a3 Browse Files
- dashboard: hide vm console for unprivileged users · 24ee0e4c
  Bach Dániel committed Jul 07, 2014
  
  24ee0e4c Browse Files
- dashboard: add recover OperationView · cab4ad49
  Bach Dániel committed Jul 07, 2014
  
  cab4ad49 Browse Files
- vm: add RecoverOperation · 7e755c8f
  Bach Dániel committed Jul 07, 2014
  
  7e755c8f Browse Files
- storage: implement Disk.restore · 553a35a4
```
requires storagedriver b599a0f
```
  Bach Dániel committed Jul 07, 2014
  553a35a4 Browse Files
05 Jul, 2014 9 commits
- Merge remote-tracking branch 'origin/master' into feature-fix-acls · d0dc3084
  Bach Dániel committed Jul 05, 2014
  
  d0dc3084 Browse Files
- vm: increase timeout in SleepOperation · 0ac786b5
  Bach Dániel committed Jul 05, 2014
  
  0ac786b5 Browse Files
- vm: migration with zero downtime · 15821cba
  Bach Dániel committed Jul 05, 2014
  
  15821cba Browse Files
- dashboard: fix vm migrate url · af9bded6
  Bach Dániel committed Jul 05, 2014
  
  af9bded6 Browse Files
- Merge remote-tracking branch 'origin/master' into feature-fix-acls · 0eb1fbe1
  Bach Dániel committed Jul 05, 2014
  
  0eb1fbe1 Browse Files
- dashboard: add btn-default to disabled operation buttons · 9d49beaf
  Bach Dániel committed Jul 05, 2014
  
  9d49beaf Browse Files
- vm: reenable node if flush fails · 32c390c1
  Bach Dániel committed Jul 05, 2014
  
  32c390c1 Browse Files
- Merge remote-tracking branch 'origin/master' into feature-fix-acls · 79a46294
```
Conflicts:
	circle/dashboard/views.py
```
  Bach Dániel committed Jul 05, 2014
  79a46294 Browse Files
- dashboard: fix permission checks in TemplateForm · 0c7119c8
  Bach Dániel committed Jul 05, 2014
  
  0c7119c8 Browse Files
04 Jul, 2014 3 commits
- dashboard: fix permission checks in TemplateDetail · 0317d504
  Bach Dániel committed Jul 04, 2014
  
  0317d504 Browse Files
- dasboard: fix permission check in TemplateCreate · 606566aa
  Bach Dániel committed Jul 04, 2014
  
  606566aa Browse Files
- Merge branch 'feature-opview-retouch' into 'master' · cce7935c
```
Retouch operation buttons
```
  Őry Máté committed Jul 04, 2014
  cce7935c Browse Files