Commits · 16534e862a93be113b8be28e17e06f2520cc5f0d · Gelencsér Szabolcs / circlestack · GitLab

24 Apr, 2014 12 commits
- requirements: remove django-discover-runner · 16534e86
```
Django 1.6 bundles it.
```
  Őry Máté committed Apr 24, 2014
  16534e86 Browse Files
- dashboard: small changes to match django1.6 · 6fe20d19
  Őry Máté committed Apr 24, 2014
  
  6fe20d19 Browse Files
- remove __init__.py to let the new DiscoverRunner find the project · 9741b9ed
```
Django 1.6 integrated DiscoverRunner but removed its config options. If
discover_root is not set, it finds out the project root by starting to step
to parent directories until a directory without an __init__ file is found.
```
  Őry Máté committed Apr 24, 2014
  9741b9ed Browse Files
- requirements: update ALL requirements to stable · fc039e60
  Őry Máté committed Apr 24, 2014
  
  fc039e60 Browse Files
- requirements: remove nose · a85243e7
  Őry Máté committed Apr 24, 2014
  
  a85243e7 Browse Files
- requirements: sort · 4e09cdab
  Őry Máté committed Apr 24, 2014
  
  4e09cdab Browse Files
- vm: remove unnecessary icon defs from operations · 26de7f0c
  Őry Máté committed Apr 24, 2014
  
  26de7f0c Browse Files
- Merge branch 'issue-vm-detail-fixes' into 'master' · a4d01e2b
```
Issue Vm Detail Fixes

- Rename virtual machines and update description
- Remove interfaces

🚧
```
  Kálmán Viktor committed Apr 24, 2014
  a4d01e2b Browse Files
- Merge branch 'feature-filter-su-perms' into 'master' · 1be19049
```
Filter out not owned VM-s for superuser
```
  Kálmán Viktor committed Apr 24, 2014
  1be19049 Browse Files
- acl: add test for disregard_superuser · 73218bb7
  Kálmán Viktor committed Apr 24, 2014
  
  73218bb7 Browse Files
- acl: return list instead of Manager when superuser · df166ac7
  Kálmán Viktor committed Apr 24, 2014
  
  df166ac7 Browse Files
- acl: disregard superuser in get objects with lvl · 428c391f
  Kálmán Viktor committed Apr 24, 2014
  
  428c391f Browse Files
22 Apr, 2014 11 commits
- network: link to dashboard · 451790d6
  Bach Dániel committed Apr 22, 2014
  
  451790d6 Browse Files
- network: remove hard-coded company name · 7aca4388
  Bach Dániel committed Apr 22, 2014
  
  7aca4388 Browse Files
- dashboard: interface delete tests · 44aed6e2
  Kálmán Viktor committed Apr 22, 2014
  
  44aed6e2 Browse Files
- dashboard: change interface remove level · c8337a04
  Kálmán Viktor committed Apr 22, 2014
  
  c8337a04 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
- dashboard: acl for interface delete · b38f73a5
  Kálmán Viktor committed Apr 22, 2014
  
  b38f73a5 Browse Files
- dashboard: add vlan to new network options after removing the interface · 4860ad07
  Kálmán Viktor committed Apr 22, 2014
  
  4860ad07 Browse Files
- dashboard: remove interfaces with operations · aa53508e
  Kálmán Viktor committed Apr 22, 2014
  
  aa53508e Browse Files
- Merge branch 'master' into issue-vm-detail-fixes · 269d97c7
  Kálmán Viktor committed Apr 22, 2014
  
  269d97c7 Browse Files
- Merge branch 'issue-154' · a9cb4a8f
```
Conflicts:
	circle/vm/operations.py
```
  Bach Dániel committed Apr 22, 2014
  a9cb4a8f Browse Files
- Merge branch 'master' into issue-vm-detail-fixes · dedcfc62
```
Conflicts:
	circle/dashboard/tests/test_views.py
```
  Kálmán Viktor committed Apr 22, 2014
  dedcfc62 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