Commits · 8b3c49e314730eb07d2d5f890bfb28717a4f7bb7 · CIRCLE / cloud · GitLab

23 Jul, 2014 13 commits
- vm: remove disk.set_level from SaveAsTemplateOperation · 8b3c49e3
  Bach Dániel committed Jul 23, 2014
  
  8b3c49e3 Browse Files
- Merge branch 'feature-template-fixes' into 'master' · a170119d
```
Template ACL fixes

👌 tests

fixes #195
fixes #194
fixes #208
```
  Bach Dániel committed Jul 23, 2014
  a170119d Browse Files
- dashboard: remove extra whitespace · ce33b51c
  Bach Dániel committed Jul 23, 2014
  
  ce33b51c Browse Files
- dashboard: add AclUpdateView tests · 3c43a38d
  Bach Dániel committed Jul 23, 2014
  
  3c43a38d Browse Files
- dashboard: fix tests · 72464340
  Bach Dániel committed Jul 23, 2014
  
  72464340 Browse Files
- dashboard: add acl template · c2037190
  Bach Dániel committed Jul 23, 2014
  
  c2037190 Browse Files
- dashboard: rewrite AclUpdateView.has_next_level · a25f2d4a
  Bach Dániel committed Jul 23, 2014
  
  a25f2d4a Browse Files
- dashboard: remove GroupRemoveAcl*View · dbbb156a
  Bach Dániel committed Jul 23, 2014
  
  dbbb156a Browse Files
- fabfile: allow updating portal if import raises · f0353c75
```
for example new requirements can cause this if source is already updated
```
  Őry Máté committed Jul 23, 2014
  f0353c75 Browse Files
- dashboard: deny adding entity to acl if already there · d00b1efc
  Őry Máté committed Jul 23, 2014
  
  d00b1efc Browse Files
- Merge branch 'nostate-operation' into 'master' · 5c0672bc
```
Nostate Operation
```
  Őry Máté committed Jul 23, 2014
  5c0672bc Browse Files
- dashboard: fix #217 Renew is an empty button for instance user · 46a12f1e
  Őry Máté committed Jul 23, 2014
  
  46a12f1e Browse Files
- vm: fix #200 renew raises error on destroyed machine · b3b485c8
  Őry Máté committed Jul 23, 2014
  
  b3b485c8 Browse Files
22 Jul, 2014 27 commits
- vm: enable concurrency_check in ResourcesOperation · 1b3f412d
  Bach Dániel committed Jul 22, 2014
  
  1b3f412d Browse Files
- dashboard: fix permission check in AclUpdateView · 40e3d8d4
  Bach Dániel committed Jul 22, 2014
  
  40e3d8d4 Browse Files
- dashboard: fix tests · 6d5826d5
  Bach Dániel committed Jul 22, 2014
  
  6d5826d5 Browse Files
- vm: fix copypasted WakeUpOperation.is_preferred · 2f54d6b6
  Őry Máté committed Jul 22, 2014
  
  2f54d6b6 Browse Files
- dashboard: fix flake8 warning · 216eb60b
  Bach Dániel committed Jul 22, 2014
  
  216eb60b Browse Files
- dashboard: add autocomplete for AclUpdateView · 00a31980
  Bach Dániel committed Jul 22, 2014
  
  00a31980 Browse Files
- fabfile: fix things · eea981fb
  Őry Máté committed Jul 22, 2014
  
  eea981fb Browse Files
- dashboard: fix tests · 6f5d8cc0
  Bach Dániel committed Jul 22, 2014
  
  6f5d8cc0 Browse Files
- storage: remove disk acl · dac4d7b7
  Bach Dániel committed Jul 22, 2014
  
  dac4d7b7 Browse Files
- dashboard: rewrite AclUpdateView · f0530049
  Bach Dániel committed Jul 22, 2014
  
  f0530049 Browse Files
- dashboard: rename get_vm_acl_data to get_acl_data · 946970a3
  Bach Dániel committed Jul 22, 2014
  
  946970a3 Browse Files
- dashboard: simplify AclUpdateViews · 09081306
  Bach Dániel committed Jul 22, 2014
  
  09081306 Browse Files
- dashboard: disable template buttons for non-owner users · c61651af
```
fixes #194
```
  Bach Dániel committed Jul 22, 2014
  c61651af Browse Files
- Merge branch 'feature-fabric' into 'master' · ffa1d2cf
```
Feature Fabric
```
  Bach Dániel committed Jul 22, 2014
  ffa1d2cf Browse Files
- fabfile: add pip support · 6f3bb02c
  Őry Máté committed Jul 22, 2014
  
  6f3bb02c Browse Files
- fabfile: add storage · 23999700
  Őry Máté committed Jul 22, 2014
  
  23999700 Browse Files
- update fabfile · 75ff941e
  Őry Máté committed Jul 22, 2014
  
  75ff941e Browse Files
- add fabfile · 8cdbd55d
  Őry Máté committed Jul 22, 2014
  
  8cdbd55d Browse Files
- fix test · 865a8ba5
  Guba Sándor committed Jul 22, 2014
  
  865a8ba5 Browse Files
- added emergency prefix · fd609634
  Guba Sándor committed Jul 22, 2014
  
  fd609634 Browse Files
- added readable name to vm_state_change · 2b903276
  Guba Sándor committed Jul 22, 2014
  
  2b903276 Browse Files
- added emergency to operation · 7e1dc7a9
  Guba Sándor committed Jul 22, 2014
  
  7e1dc7a9 Browse Files
- removed unused manual_state_change method · 356c9287
  Guba Sándor committed Jul 22, 2014
  
  356c9287 Browse Files
- Added emergency to permission name · f288eaf3
  Guba Sándor committed Jul 22, 2014
  
  f288eaf3 Browse Files
- activity: ActivityInProgressError is HumanReadable · b9327e39
  Guba Sándor committed Jul 22, 2014
  
  b9327e39 Browse Files
- remove unrelevant commit · c49bac70
  Guba Sándor committed Jul 22, 2014
  
  c49bac70 Browse Files
- Merge branch 'master' into nostate-operation · 5e496201
```
Conflicts:
	circle/vm/models/instance.py
```
  Guba Sándor committed Jul 22, 2014
  5e496201 Browse Files