Commits · 66ddb1a945d16cd0de472c2223c81d002f4ea737 · CIRCLE / cloud · GitLab

16 Jul, 2014 7 commits
- vm: add readable name to activities · 66ddb1a9
  Őry Máté committed Jul 16, 2014
  
  66ddb1a9 Browse Files
- Merge branch 'master' into issue-139 · 96f1d71c
```
Conflicts:
	circle/dashboard/templates/dashboard/_notifications-timeline.html
	circle/dashboard/templates/dashboard/node-detail/_activity-timeline.html
	circle/dashboard/templates/dashboard/notifications/ownership-offer.html
	circle/dashboard/templates/dashboard/notifications/vm-destroyed.html
	circle/dashboard/templates/dashboard/notifications/vm-expiring.html
	circle/dashboard/templates/dashboard/notifications/vm-suspended.html
	circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html
```
  Őry Máté committed Jul 16, 2014
  96f1d71c Browse Files
- dashboard: update notification view · 66805404
  Őry Máté committed Jul 16, 2014
  
  66805404 Browse Files
- dashboard: fix migration · 55773d3c
```
datamigration made var substituion fail if original rendered text contained
percent char. now these are escaped
```
  Őry Máté committed Jul 16, 2014
  55773d3c Browse Files
- dashboard: use new notify method · 4df81053
  Őry Máté committed Jul 16, 2014
  
  4df81053 Browse Files
- dashboard: use HumanReadableObject for Notifications · 9ffe5f16
  Őry Máté committed Jul 16, 2014
  
  9ffe5f16 Browse Files
- common: force unicode() on nonserializable objs for HROs · 82af31c5
  Őry Máté committed Jul 16, 2014
  
  82af31c5 Browse Files
15 Jul, 2014 2 commits
- common: add HumanReadableObject.__unicode__ · b37ca46b
  Őry Máté committed Jul 15, 2014
  
  b37ca46b Browse Files
- Merge branch 'feature-firewall-fixes' into 'master' · b4b966f0
```
Feature Firewall Fixes
```
  Bach Dániel committed Jul 15, 2014
  b4b966f0 Browse Files
14 Jul, 2014 10 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
- vm: use HRO for result strings · 7c658a86
  Őry Máté committed Jul 14, 2014
  
  7c658a86 Browse Files
- common: allow omitting admin_text_template in create_readable · dbe6fd36
  Őry Máté committed Jul 14, 2014
  
  dbe6fd36 Browse Files
- common: show proper warnings for result compat iface · 205ea343
  Őry Máté committed Jul 14, 2014
  
  205ea343 Browse Files
- Merge branch 'master' into issue-139 · d0dc1ed8
```
Conflicts:
	circle/vm/models/activity.py
```
  Őry Máté committed Jul 14, 2014
  d0dc1ed8 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 21 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