Commits · 1c48024b5fc9e573e932c525a433c0321e4dfe64 · CIRCLE / cloud · GitLab

06 Mar, 2014 16 commits
- Update to master · 1c48024b
```
Merge branch 'master' into feature-vm-gc

Conflicts:
	circle/dashboard/views.py
```
  Őry Máté committed Mar 06, 2014
  1c48024b Browse Files
- dashboard: extract search_user · 05e64bb7
  Őry Máté committed Mar 06, 2014
  
  05e64bb7 Browse Files
- dashboard: add expiration warning notification's template · a24f503e
  Őry Máté committed Mar 06, 2014
  
  a24f503e Browse Files
- vm: extract Instance._do_renew · b0c5e369
```
Fixes unit tests.
```
  Őry Máté committed Mar 06, 2014
  b0c5e369 Browse Files
- vm: notify owners of expiring VMs · 9f93161b
  Őry Máté committed Mar 06, 2014
  
  9f93161b Browse Files
- dashboard: add expiration info and renew button to vm-detail · 6bb818a6
```
closes #45
```
  Őry Máté committed Mar 06, 2014
  6bb818a6 Browse Files
- dashboard: add VmRenewView · 2c9fc11e
  Őry Máté committed Mar 06, 2014
  
  2c9fc11e Browse Files
- acl: pass get_users_with_level's kwargs to filter · c6c2d058
  Őry Máté committed Mar 06, 2014
  
  c6c2d058 Browse Files
- vm: add activity to Instance.renew · 0cf2b4c6
  Őry Máté committed Mar 06, 2014
  
  0cf2b4c6 Browse Files
- vm: add Instance.notify_owners_about_expiration() · 42cc6856
  Őry Máté committed Mar 06, 2014
  
  42cc6856 Browse Files
- vm: add Instance.is_expiring() · 988dc1d2
  Őry Máté committed Mar 06, 2014
  
  988dc1d2 Browse Files
- vm: make destroyed/suspended notifications more accurate · 106e3707
  Őry Máté committed Mar 06, 2014
  
  106e3707 Browse Files
- dashboard: issue 94 server-side · 70fcc92b
  Kálmán Viktor committed Mar 06, 2014
  
  70fcc92b Browse Files
- dashboard: enable raw data in templates only for superusers · 19235ec6
  Kálmán Viktor committed Mar 06, 2014
  
  19235ec6 Browse Files
- firewall: return IP address if there is no hostname · 7df6dd21
```
fixes #93
```
  Bach Dániel committed Mar 06, 2014
  7df6dd21 Browse Files
- dashboard: fix console tab disabling · 5b87d860
  Kálmán Viktor committed Mar 06, 2014
  
  5b87d860 Browse Files
05 Mar, 2014 3 commits
- vm: extract Instance.get_renew_times from .renew · d9deb891
  Őry Máté committed Mar 05, 2014
  
  d9deb891 Browse Files
- vm: add number to mass-created VMs' name · 9403e818
  Őry Máté committed Mar 05, 2014
  
  9403e818 Browse Files
- dashboard: add Notification.valid_until · cc595a39
  Őry Máté committed Mar 05, 2014
  
  cc595a39 Browse Files
04 Mar, 2014 3 commits
- Merge branch 'issue-85' into 'master' · a5fc794f
```
Better login form
```
  Kálmán Viktor committed Mar 04, 2014
  a5fc794f Browse Files
- Merge branch 'master' into 'master' · 99986b1b
```
Fix README text
```
  Őry Máté committed Mar 04, 2014
  99986b1b Browse Files
- fix README.rst · 7f387628
  Őry Máté committed Mar 04, 2014
  
  7f387628 Browse Files
03 Mar, 2014 11 commits
- dashboard: login minor fixes · 7593f7e2
  Kálmán Viktor committed Mar 03, 2014
  
  7593f7e2 Browse Files
- dashboard: login i18n · 99c907d6
  Kálmán Viktor committed Mar 03, 2014
  
  99c907d6 Browse Files
- dashboard: don't display SSO if there is no SAML2 · 4aa93275
  Kálmán Viktor committed Mar 03, 2014
  
  4aa93275 Browse Files
- dashboard: minor fixes · c7ceae9d
  Kálmán Viktor committed Mar 03, 2014
  
  c7ceae9d Browse Files
- dashboard: password reset · 312a6731
  Kálmán Viktor committed Mar 03, 2014
  
  312a6731 Browse Files
- dashboard: change eduID text to SSO · 53269ec8
  Kálmán Viktor committed Mar 03, 2014
  
  53269ec8 Browse Files
- dashboard: new login with saml2 · 5e443754
  Kálmán Viktor committed Mar 03, 2014
  
  5e443754 Browse Files
- Merge branch 'enhance-migration-dialog' into 'master' · 36cb71a0
```
Enhance Migration Dialog

* add border around nodes
* add label tag
* disable checkbox for current node
* check checkbox for recommended node
* show recommended and current node
```
  Bach Dániel committed Mar 03, 2014
  36cb71a0 Browse Files
- Merge branch 'feature-network-oui' into 'master' · dbdf9d47
```
Display nic hardware vendor
```
  Bach Dániel committed Mar 03, 2014
  dbdf9d47 Browse Files
- dashboard: minor fixes · 5198bd4f
  Kálmán Viktor committed Mar 03, 2014
  
  5198bd4f Browse Files
- vm: fix flake8 · ec4f2a05
  Őry Máté committed Mar 03, 2014
  
  ec4f2a05 Browse Files
02 Mar, 2014 7 commits
- vm: implement vm expiration · 1a4ca401
  Őry Máté committed Mar 02, 2014
  
  1a4ca401 Browse Files
- dashboard: fancier node selection at migration · bf4950bf
  Őry Máté committed Mar 02, 2014
  
  bf4950bf Browse Files
- dashboard: show recommended node at vm migration · de65574f
```
recommended = which one the scheduler says
```
  Őry Máté committed Mar 02, 2014
  de65574f Browse Files
- dashboard: show current node at vm migration · bade9755
  Őry Máté committed Mar 02, 2014
  
  bade9755 Browse Files
- dashboard: make _vm-migrate template fancier · 4cde034a
  Őry Máté committed Mar 02, 2014
  
  4cde034a Browse Files
- vm: make scheduler's result public · 9db57446
  Őry Máté committed Mar 02, 2014
  
  9db57446 Browse Files
- Merge branch 'master' of git.cloud.ik.bme.hu:circle/cloud · f6687581
  Őry Máté committed Mar 02, 2014
  
  f6687581 Browse Files