Commits · 3382755642e95cadd46910d66294593fa09ec23a · CIRCLE / cloud

28 May, 2014 4 commits
- vm: rollback shutdown_net if migrate_vm fails · 33827556
```
fixes #156
```
  Bach Dániel committed May 28, 2014
  33827556 Browse Files
- Merge branch 'feature-create-user' into 'master' · a0a784e7
```
Feature Create User

tests 🆗 ~~👷 👷 ~~
```
  Bach Dániel committed May 28, 2014
  a0a784e7 Browse Files
- dashboard: update tests · ea6124b3
  Bach Dániel committed May 28, 2014
  
  ea6124b3 Browse Files
- dashboard: use PermissionRequiredMixin in UserCreationView · fcf7744c
  Bach Dániel committed May 28, 2014
  
  fcf7744c Browse Files
27 May, 2014 3 commits
- dashboard: add tests · fbb9f2aa
  Bach Dániel committed May 27, 2014
  
  fbb9f2aa Browse Files
- dashboard: add UserCreationView · a7ae6242
  Bach Dániel committed May 27, 2014
  
  a7ae6242 Browse Files
- dashboard: add missing permission check · e6f7e48a
  Bach Dániel committed May 27, 2014
  
  e6f7e48a Browse Files
26 May, 2014 2 commits
- Merge branch 'box-search' · 53386bcc
```
Conflicts:
	circle/dashboard/static/dashboard/dashboard.js
	circle/dashboard/templates/dashboard/index-nodes.html
```
  Bach Dániel committed May 26, 2014
  53386bcc Browse Files
- vm: fix pwgen · 5034085b
  Bach Dániel committed May 26, 2014
  
  5034085b Browse Files
16 May, 2014 1 commit

Merge branch 'feature-indexview-fixes' into 'master' · ad1519f3

Few fixes in index view

- fix vm list height
- permanent vm list button
- mark %d more buttons for translation (fixes #133)

committed May 16, 2014

ad1519f3 Browse Files

15 May, 2014 2 commits
- Merge remote-tracking branch 'origin/group-search' into feature-indexview-fixes · c2b0ca67
```
Conflicts:
	circle/dashboard/templates/dashboard/index-groups.html
	circle/dashboard/tests/test_views.py
	circle/dashboard/views.py
```
  Bach Dániel committed May 15, 2014
  c2b0ca67 Browse Files
- vm: fix save_as · e1827d58
```
https://git.ik.bme.hu/circle/cloud/snippets/34
```
  Bach Dániel committed May 15, 2014
  e1827d58 Browse Files
13 May, 2014 2 commits
- dashboard: add help text for index boxes · 87ae1cb3
  Kálmán Viktor committed May 13, 2014
  
  87ae1cb3 Browse Files
- dashboard: min-height for all boxes on index · 5df31d05
  Kálmán Viktor committed May 13, 2014
  
  5df31d05 Browse Files
12 May, 2014 10 commits
- acl: fix get_objects_with_level returning duplicated results · 9bc7790d
  Őry Máté committed May 12, 2014
  
  9bc7790d Browse Files
- dashboard: add plural to blocktrans · 34c98135
  Kálmán Viktor committed May 12, 2014
  
  34c98135 Browse Files
- dashboard: plural gettext for mass create / mass delete · a30545c1
  Kálmán Viktor committed May 12, 2014
  
  a30545c1 Browse Files
- dashboard: change exclamation points · 577130c4
  Kálmán Viktor committed May 12, 2014
  
  577130c4 Browse Files
- dashboard: more annoying notifications · d229de28
  Kálmán Viktor committed May 12, 2014
  
  d229de28 Browse Files
- dashboard: add favicon · d61b84b0
  Kálmán Viktor committed May 12, 2014
  
  d61b84b0 Browse Files
- Merge remote-tracking branch 'origin/master' into feature-indexview-fixes · 9148d878
```
Conflicts:
	circle/dashboard/static/dashboard/dashboard.css
	circle/dashboard/templates/dashboard/index-groups.html
```
  Kálmán Viktor committed May 12, 2014
  9148d878 Browse Files
- change new group icon · 3af145ab
  Kálmán Viktor committed May 12, 2014
  
  3af145ab Browse Files
- dashboard: text for no vms · cb623f2d
  Kálmán Viktor committed May 12, 2014
  
  cb623f2d Browse Files
- dashboard: add groupprofile to admin · 00e6d851
  Bach Dániel committed May 12, 2014
  
  00e6d851 Browse Files
08 May, 2014 1 commit
- Merge branch 'feature-group-details-fixed' · 3cf09597
```
Conflicts:
	circle/dashboard/static/dashboard/dashboard.js
	circle/dashboard/urls.py
```
  Bach Dániel committed May 08, 2014
  3cf09597 Browse Files
07 May, 2014 13 commits
- dashboard: make template coulmns not orderable · 9871de77
  Kálmán Viktor committed May 07, 2014
  
  9871de77 Browse Files
- dashboard: minor fixes to group detail · 19ff3675
  Kálmán Viktor committed May 07, 2014
  
  19ff3675 Browse Files
- locale: update Hungarian translation · 2d8071b0
  Őry Máté committed May 07, 2014
  
  2d8071b0 Browse Files
- dashboard: clean up index template · fc0de7f8
```
- fix vm list height
- permanent vm list button
- mark %d more buttons for translation (fixes #133)
```
  Kálmán Viktor committed May 07, 2014
  fc0de7f8 Browse Files
- locale: update templates · 4cd25019
  Őry Máté committed May 07, 2014
  
  4cd25019 Browse Files
- Merge branch 'feature-template-wizard' into 'master' · e00e2679
```
Feature Template Wizard

⚠  pip install and migrate required

django-admin.py makemessages -d djangojs -l hu --settings=circle.settings.local --ignore=jsi18n/*
python manage.py compilejsi18n --settings=circle.settings.local -o dashboard/static/jsi18n -l hu
python manage.py compilejsi18n --settings=circle.settings.local -o dashboard/static/jsi18n -l en
```
  Kálmán Viktor committed May 07, 2014
  e00e2679 Browse Files
- dashboard: fix mass vm delete · c9d678ce
  Kálmán Viktor committed May 07, 2014
  
  c9d678ce Browse Files
- Merge remote-tracking branch 'origin/master' into feature-template-wizard · 536b16d6
```
Conflicts:
	circle/dashboard/static/dashboard/dashboard.css
```
  Kálmán Viktor committed May 07, 2014
  536b16d6 Browse Files
- circle: update gitignore for jsi18n files · 7af77c17
  Kálmán Viktor committed May 07, 2014
  
  7af77c17 Browse Files
- dashboard: remove generated jsi18n · f3427d85
  Kálmán Viktor committed May 07, 2014
  
  f3427d85 Browse Files
- circle: move statici18n from local to base settings · 605c98d5
  Kálmán Viktor committed May 07, 2014
  
  605c98d5 Browse Files
- dashboard: set acl level for template creation · dfe79e0e
  Kálmán Viktor committed May 07, 2014
  
  dfe79e0e Browse Files
- dashboard: fix base vm creation · f42dd1df
  Kálmán Viktor committed May 07, 2014
  
  f42dd1df Browse Files
06 May, 2014 2 commits

dashboard: fix indention · fd4f9c31
Bach Dániel committed May 06, 2014

fd4f9c31 Browse Files

Merge branch 'feature-group-details-rebased' · 450f75cf

Conflicts:
	circle/dashboard/static/dashboard/group-details.js
	circle/dashboard/templates/dashboard/index-groups.html
	circle/dashboard/templates/dashboard/index.html
	circle/dashboard/urls.py
	circle/dashboard/views.py

committed May 06, 2014

450f75cf Browse Files