Commits · 0a56f429836f75849bc4c0a1be4688eba54883b9 · Gelencsér Szabolcs / cloud · GitLab

22 Apr, 2014 8 commits
- dashboard: fix template wizard texts · 0a56f429
  Kálmán Viktor committed Apr 22, 2014
  
  0a56f429 Browse Files
- Merge branch 'master' into feature-template-wizard · a46d3f9c
```
Conflicts:
	circle/dashboard/templates/dashboard/vm-detail.html
	circle/dashboard/urls.py
	circle/dashboard/views.py
```
  Kálmán Viktor committed Apr 22, 2014
  a46d3f9c Browse Files
- dashboard: add trans tag to the template create help message · e139bff7
  Kálmán Viktor committed Apr 22, 2014
  
  e139bff7 Browse Files
- dashboard: i18n fixes · b05078d8
  Kálmán Viktor committed Apr 22, 2014
  
  b05078d8 Browse Files
- dashboard: fix system input in template create · c7517f56
  Kálmán Viktor committed Apr 22, 2014
  
  c7517f56 Browse Files
- dashboard: fix import in model · 988d4d28
  Kálmán Viktor committed Apr 22, 2014
  
  988d4d28 Browse Files
- Merge branch 'feature-profile' into 'master' · 46104fe6
```
Change password

Users can change their own password.
```
  Bach Dániel committed Apr 22, 2014
  46104fe6 Browse Files
- Merge branch 'issue-154' · a9cb4a8f
```
Conflicts:
	circle/vm/operations.py
```
  Bach Dániel committed Apr 22, 2014
  a9cb4a8f Browse Files
21 Apr, 2014 7 commits
- add uwsgi config files · 5d753e30
```
howto: https://git.ik.bme.hu/circle/cloud/wikis/nginx
```
  Bach Dániel committed Apr 21, 2014
  5d753e30 Browse Files
- remove STATICFILES_DIRS from base.py · 4db52b74
  Bach Dániel committed Apr 21, 2014
  
  4db52b74 Browse Files
- update .gitignore · eb9746e8
  Bach Dániel committed Apr 21, 2014
  
  eb9746e8 Browse Files
- storage: enhanced DiskAdmin · 71000570
  Bach Dániel committed Apr 21, 2014
  
  71000570 Browse Files
- vm: add on_delete=SET_NULL to Template.parent · b965f64d
  Bach Dániel committed Apr 21, 2014
  
  b965f64d Browse Files
- vm: fix imports (wsgi) · 359d05b7
  Bach Dániel committed Apr 21, 2014
  
  359d05b7 Browse Files
- vm: fix Interface.create · cc6205bd
  Bach Dániel committed Apr 21, 2014
  
  cc6205bd Browse Files
20 Apr, 2014 1 commit
- firewall: random fixes · 1a2eab74
  Bach Dániel committed Apr 20, 2014
  
  1a2eab74 Browse Files
19 Apr, 2014 9 commits
- vm: fix _rename and its tests · 433b8374
```
🍻
```
  Őry Máté committed Apr 19, 2014
  433b8374 Browse Files
- Merge branch 'feature-operations-view' · 07e58f59
  Őry Máté committed Apr 19, 2014
  
  07e58f59 Browse Files
- vm: test SaveAsTemplateOperation._rename · 24bad338
  Őry Máté committed Apr 19, 2014
  
  24bad338 Browse Files
- vm: add default name to save_as_template · 8595c190
  Őry Máté committed Apr 19, 2014
  
  8595c190 Browse Files
- dashboard: fix pep8 · d3889c7e
  Őry Máté committed Apr 19, 2014
  
  d3889c7e Browse Files
- Merge branch 'feature-operations-view' · 21a68f69
```
Add operations to vm-details views

* vm-detail context
* vm-detail templates
* replace op buttons at ajax status update
* add tests
* re-implement migrate op
```
  Őry Máté committed Apr 19, 2014
  21a68f69 Browse Files
- dashboard: skip test_permitted_vm_disk_add · 61c537bd
  Őry Máté committed Apr 19, 2014
  
  61c537bd Browse Files
- dashboard: fix VmMigrateView.post · e9c09351
  Őry Máté committed Apr 19, 2014
  
  e9c09351 Browse Files
- dashboard: test vm migration · bd6ed339
  Őry Máté committed Apr 19, 2014
  
  bd6ed339 Browse Files
18 Apr, 2014 9 commits
- dashboard: test destroy VmOperationView · 15251ae3
  Őry Máté committed Apr 18, 2014
  
  15251ae3 Browse Files
- dashboard: reimplement VmMigrateView as OperationView · e2a771fd
  Őry Máté committed Apr 18, 2014
  
  e2a771fd Browse Files
- dashboard: support extra Operation args in OperationView · 052cee88
  Őry Máté committed Apr 18, 2014
  
  052cee88 Browse Files
- dashboard: make operate template more generic · 3f7f0833
  Őry Máté committed Apr 18, 2014
  
  3f7f0833 Browse Files
- dashboard: fix operations' event handlers after update · 9168b2bd
  Őry Máté committed Apr 18, 2014
  
  9168b2bd Browse Files
- common, vm: register operations based on their 'host_cls' attribute by default · a264fdc7
  Dudás Ádám committed Apr 18, 2014
  
  a264fdc7 Browse Files
- common: better error on missing attribute · 50fb8a87
  Dudás Ádám committed Apr 18, 2014
  
  50fb8a87 Browse Files
- vm: better name of local var · 32065c91
  Dudás Ádám committed Apr 18, 2014
  
  32065c91 Browse Files
- docs: use syncdb --all and migrate --fake to init db · 4bf7ec58
  Őry Máté committed Apr 18, 2014
  
  4bf7ec58 Browse Files
17 Apr, 2014 6 commits
- dashboard: update tests · 404d3603
  Őry Máté committed Apr 17, 2014
  
  404d3603 Browse Files
- dashboard: add generic vm-operation js · e7d82c3f
  Őry Máté committed Apr 17, 2014
  
  e7d82c3f Browse Files
- dashboard: remove old operation view code · f3e07864
  Őry Máté committed Apr 17, 2014
  
  f3e07864 Browse Files
- dashboard: add operation templates · 0613eec6
  Őry Máté committed Apr 17, 2014
  
  0613eec6 Browse Files
- dashboard: add OperationView · 43ab9d9b
  Őry Máté committed Apr 17, 2014
  
  43ab9d9b Browse Files
- dashboard: use absolute_import in dashboard modules · 98cc1e3e
```
needed to add module dashboard.vm and sensibly import circle.vm
```
  Őry Máté committed Apr 17, 2014
  98cc1e3e Browse Files