Commits · voms-occi · Gelencsér Szabolcs / cloud

22 Jan, 2015 4 commits
- occi: handle wrong templates · b5916e57
```
rOCCI actually checks for these
```
  Kálmán Viktor committed Jan 22, 2015
  b5916e57 Browse Files
- occi: look for missing attributes · 0f34885e
  Kálmán Viktor committed Jan 22, 2015
  
  0f34885e Browse Files
- occi: remove public key creation · d61fb9f3
  Kálmán Viktor committed Jan 22, 2015
  
  d61fb9f3 Browse Files
- occi: remove OCCI_ADDR · 9cf1ac9f
  Kálmán Viktor committed Jan 22, 2015
  
  9cf1ac9f Browse Files
21 Jan, 2015 2 commits
- Merge branch 'master' into feature-voms-occi · 4c94d47f
```
Conflicts:
	requirements/base.txt
```
  Kálmán Viktor committed Jan 21, 2015
  4c94d47f Browse Files
- dashboard: i18n · bd2667df
  Kálmán Viktor committed Jan 21, 2015
  
  bd2667df Browse Files
20 Jan, 2015 8 commits
- network: order hosts by noramlized hostname · 30d8fe06
  Kálmán Viktor committed Jan 20, 2015
  
  30d8fe06 Browse Files
- Revert "update requirements.txt" · 07195cac
```
This reverts commit f8759446.
```
  Bach Dániel committed Jan 20, 2015
  07195cac Browse Files
- network: fix flake8 warning · dd51b502
  Bach Dániel committed Jan 20, 2015
  
  dd51b502 Browse Files
- Merge branch 'feature-django-1.7' · 3d40e5f4
```
Conflicts:
	circle/dashboard/forms.py
```
  Bach Dániel committed Jan 20, 2015
  3d40e5f4 Browse Files
- Merge branch 'feature-jshint' into 'master' · 892f1470
```
Feature jshint

closes #376

See merge request !288
```
  Bach Dániel committed Jan 20, 2015
  892f1470 Browse Files
- update requirements.txt · f8759446
  Bach Dániel committed Jan 20, 2015
  
  f8759446 Browse Files
- Merge branch 'master' into feature-jshint · c5f2291b
```
Conflicts:
	circle/dashboard/static/dashboard/group-details.js
```
  Kálmán Viktor committed Jan 20, 2015
  c5f2291b Browse Files
- dashboard: fix jshint warnings · f47965c1
  Kálmán Viktor committed Jan 20, 2015
  
  f47965c1 Browse Files
19 Jan, 2015 2 commits
- Merge branch 'feature-group-rename' into 'master' · bd898707
```
Group rename without js

See merge request !287
```
  Kálmán Viktor committed Jan 19, 2015
  bd898707 Browse Files
- Merge branch 'issue-291' into 'master' · acfa3715
```
Trait fixes

closes #291

See merge request !284
```
  Kálmán Viktor committed Jan 19, 2015
  acfa3715 Browse Files
16 Jan, 2015 8 commits
- dashboard: group rename without js · bb4dfc17
  Kálmán Viktor committed Jan 16, 2015
  
  bb4dfc17 Browse Files
- firewall: add migration · c4cd703c
  Bach Dániel committed Jan 16, 2015
  
  c4cd703c Browse Files
- dashboard: migrate form fields · aed286e6
  Bach Dániel committed Jan 16, 2015
  
  aed286e6 Browse Files
- vm: fix migration dependencies · 37c1c52d
  Bach Dániel committed Jan 16, 2015
  
  37c1c52d Browse Files
- circle: add new migrations · 73844bcc
  Bach Dániel committed Jan 16, 2015
  
  73844bcc Browse Files
- circle: fix tests · e9b63096
  Bach Dániel committed Jan 16, 2015
  
  e9b63096 Browse Files
- common: fix HumanSortField · 668c2659
  Bach Dániel committed Jan 16, 2015
  
  668c2659 Browse Files
- dashboard: trivial fixes · 1e26bc6e
  Bach Dániel committed Jan 16, 2015
  
  1e26bc6e Browse Files
15 Jan, 2015 4 commits
- dashboard: fix disk remove missing method · ebdf3b7e
  Kálmán Viktor committed Jan 15, 2015
  
  ebdf3b7e Browse Files
- vm: fix saving vms as templates with deleted parent · 80695e1f
  Kálmán Viktor committed Jan 15, 2015
  
  80695e1f Browse Files
- circle: update settings · cafadff8
  Bach Dániel committed Jan 15, 2015
  
  cafadff8 Browse Files
- update requirements · 10adcce0
  Bach Dániel committed Jan 15, 2015
  
  10adcce0 Browse Files
13 Jan, 2015 3 commits
- Merge branch 'master' into issue-291 · 921944e9
  Kálmán Viktor committed Jan 13, 2015
  
  921944e9 Browse Files
- dashboard: node/trait fix · 7c5eae88
```
- use node_exact on vmlist (mega1 vs mega10)
- remove trait object if there is no more reference to it
```
  Kálmán Viktor committed Jan 13, 2015
  7c5eae88 Browse Files
- dashboard: warn user about missing traits on migrate/deploy · f4df866a
  Kálmán Viktor committed Jan 13, 2015
  
  f4df866a Browse Files
12 Jan, 2015 2 commits
- Merge branch 'notifications-enhancement' · db42d716
```
Conflicts:
	circle/dashboard/static/dashboard/dashboard.less
```
  Bach Dániel committed Jan 12, 2015
  db42d716 Browse Files
- Merge branch 'issue-364' into 'master' · 79e445c6
```
Small resolution glitches

Closes #364

🚧

See merge request !276
```
  Bach Dániel committed Jan 12, 2015
  79e445c6 Browse Files
09 Jan, 2015 4 commits
- dashboard: async vm search · 154839c7
  Kálmán Viktor committed Jan 09, 2015
  
  154839c7 Browse Files
- dashboard: small screen fixes · 04ac0b01
```
- add top margin on mobile too
- margin to floating buttons
- change text to icon on port open
- vm connection infos
```
  Kálmán Viktor committed Jan 09, 2015
  04ac0b01 Browse Files
- dashboard: menu font size · 7654ab6b
  Kálmán Viktor committed Jan 09, 2015
  
  7654ab6b Browse Files
- dashboard: fix dashboard file · 7acc6a70
  Kálmán Viktor committed Jan 09, 2015
  
  7acc6a70 Browse Files
08 Jan, 2015 1 commit

Merge branch 'master' into issue-364 · 1a9d84cd

Conflicts:
	circle/dashboard/static/dashboard/vm-common.js
	circle/dashboard/templates/dashboard/store/index-files.html

committed Jan 08, 2015

1a9d84cd Browse Files

07 Jan, 2015 2 commits
- Merge branch 'gui-fixes' into 'master' · e70e03b7
```
Gui fixes

See merge request !281
```
  Bach Dániel committed Jan 07, 2015
  e70e03b7 Browse Files
- dashboard: fix xss in notifications · 111d424d
```
Closes #374
```
  Bach Dániel committed Jan 07, 2015
  111d424d Browse Files