Commits · 984491105a58db299e9b462f424821dbd73dfa74 · CIRCLE / cloud · GitLab

14 Jul, 2014 6 commits
- Merge branch 'feature-base-template' into 'master' · 98449110
```
Common base template for dashboard, network, registration

Closes #191
Closes #173

Also Font Awesome 4.1 upgrade

https://miskolc.cloud.bme.hu:18525/dashboard/
```
  Kálmán Viktor committed Jul 14, 2014
  98449110 Browse Files
- Merge branch 'master' into feature-base-template · 325b8bba
```
Conflicts:
	circle/dashboard/templates/dashboard/template-list.html
	circle/dashboard/templates/dashboard/vm-detail/home.html
	circle/dashboard/views.py
```
  Őry Máté committed Jul 14, 2014
  325b8bba Browse Files
- dashboard: remove trailing whitespaces · c073030c
  Őry Máté committed Jul 14, 2014
  
  c073030c Browse Files
- Merge branch 'feature-improve-docs-rebased' into 'master' · 2ca7eb56
```
Improve Docs

🚧
```
  Őry Máté committed Jul 14, 2014
  2ca7eb56 Browse Files
- vm: allow deploying in PAUSED state · f7d7d5ac
  Bach Dániel committed Jul 14, 2014
  
  f7d7d5ac Browse Files
- vm: discard tasks on celery start · be246be6
  Bach Dániel committed Jul 14, 2014
  
  be246be6 Browse Files
11 Jul, 2014 34 commits
- Merge branch 'feature-renew-op-rebased' into 'master' · 6658f290
```
Feature Renew Op

🆗 refactor renew to an operation
🆗 token+operation
🆗 view
🆗 Lease acl views @kviktor
```
  Őry Máté committed Jul 11, 2014
  6658f290 Browse Files
- dashboard: fix lease permissions · 31295e76
  Őry Máté committed Jul 11, 2014
  
  31295e76 Browse Files
- dashboard: allow creating templates only with lease operators · c11cf23e
  Őry Máté committed Jul 11, 2014
  
  c11cf23e Browse Files
- acl: fix management command · c1b159b9
  Őry Máté committed Jul 11, 2014
  
  c1b159b9 Browse Files
- dashboard: add lease acl update · 98456714
  Kálmán Viktor committed Jul 11, 2014
  
  98456714 Browse Files
- settigs: allow changing console log level · 64c69044
  Őry Máté committed Jul 11, 2014
  
  64c69044 Browse Files
- dashboard: rewrite renew tests to mocked · e1ebdb06
  Őry Máté committed Jul 11, 2014
  
  e1ebdb06 Browse Files
- dashboard: improve FakeRequestFactory · 405dd1f1
  Őry Máté committed Jul 11, 2014
  
  405dd1f1 Browse Files
- dashboard: fix RedirectToLoginMixin · 0e906aea
```
it didn't reraise the exception if it occured but user is already logged in
```
  Őry Máté committed Jul 11, 2014
  0e906aea Browse Files
- dashboard: refactor ops ajax functionality to AjaxOperationMixin · 5880ee1e
  Őry Máté committed Jul 11, 2014
  
  5880ee1e Browse Files
- vm: disable concurrency_check in RenewOperation · e9439649
  Őry Máté committed Jul 11, 2014
  
  e9439649 Browse Files
- dashboard: remove useless copypasted method · 89367eee
  Őry Máté committed Jul 11, 2014
  
  89367eee Browse Files
- dashboard: allow choosing lease for renew · 9bbbc3ad
  Őry Máté committed Jul 11, 2014
  
  9bbbc3ad Browse Files
- dashboard: add FormOperationMixin.get_form_kwargs method · 883ba7ec
```
this allows sending custom parameters to form constructors
```
  Őry Máté committed Jul 11, 2014
  883ba7ec Browse Files
- dashboard: allow sleep and destroy ops with token · 62a43cb3
  Őry Máté committed Jul 11, 2014
  
  62a43cb3 Browse Files
- dashboard: redirect to login page if token invalid · d7cca36e
  Őry Máté committed Jul 11, 2014
  
  d7cca36e Browse Files
- dashboard: refactor VmRenewView to an explicit class · 8e306d05
  Őry Máté committed Jul 11, 2014
  
  8e306d05 Browse Files
- vm: add ACL to leases · 4f4bd0c6
  Őry Máté committed Jul 11, 2014
  
  4f4bd0c6 Browse Files
- dashboard: add TokenOperationView · 726c6897
  Őry Máté committed Jul 11, 2014
  
  726c6897 Browse Files
- dashboard: refactor OperationView to be more extendable · 41195564
  Őry Máté committed Jul 11, 2014
  
  41195564 Browse Files
- dashboard: add RedirectToLoginMixin · 726b6590
  Őry Máté committed Jul 11, 2014
  
  726b6590 Browse Files
- dashboard: remove old VmRenewView and friends · 216d708c
  Őry Máté committed Jul 11, 2014
  
  216d708c Browse Files
- vm: fix RenewOperation implementation and calls · 3a089576
  Őry Máté committed Jul 11, 2014
  
  3a089576 Browse Files
- dashboard: log stack trace if operation couldn't start · c15133d8
  Őry Máté committed Jul 11, 2014
  
  c15133d8 Browse Files
- common: automagically get parent activity's user · 5c98be39
  Őry Máté committed Jul 11, 2014
  
  5c98be39 Browse Files
- vm: move renew to a new operation · 2ff6b951
```
fixes #184
```
  Őry Máté committed Jul 11, 2014
  2ff6b951 Browse Files
- dashboard: use specific var name in OperationView.bind_to_object · 44430db0
  Őry Máté committed Jul 11, 2014
  
  44430db0 Browse Files
- network: fix switch port js · b774b536
  Kálmán Viktor committed Jul 11, 2014
  
  b774b536 Browse Files
- vm: fix tests · e2c20940
  Kálmán Viktor committed Jul 11, 2014
  
  e2c20940 Browse Files
- templates: use the common base.html · 66720732
  Kálmán Viktor committed Jul 11, 2014
  
  66720732 Browse Files
- network: fa upgrade · a5becb5d
  Kálmán Viktor committed Jul 11, 2014
  
  a5becb5d Browse Files
- dashboard: fix js search · 5f4f2015
  Kálmán Viktor committed Jul 11, 2014
  
  5f4f2015 Browse Files
- dashboard: fa upgrade done · 9cd07b2b
  Kálmán Viktor committed Jul 11, 2014
  
  9cd07b2b Browse Files
- dashboard: change vm and node detail · 3efae6d8
  Kálmán Viktor committed Jul 11, 2014
  
  3efae6d8 Browse Files