Commits · 08b9e86b4296b9ac8e361482bdffe95ab3e11e5a · CIRCLE / cloud · GitLab

05 Mar, 2015 5 commits
- Merge remote-tracking branch 'origin/master' into issue-218 · 08b9e86b
  Csók Tamás committed Mar 05, 2015
  
  08b9e86b Browse Files
- updated fab selenium command · 4ec135f9
  Csók Tamás committed Mar 05, 2015
  
  4ec135f9 Browse Files
- solved countless issues and made tests more reliable · 0922e15c
  Csók Tamás committed Mar 05, 2015
  
  0922e15c Browse Files
- updated help texts and translations · 0fd140e8
  Bach Dániel committed Mar 05, 2015
  
  0fd140e8 Browse Files
- Merge remote-tracking branch 'origin/feature-helptexts' · 9c802a59
```
Conflicts:
	circle/dashboard/static/dashboard/dashboard.less
```
  Bach Dániel committed Mar 05, 2015
  9c802a59 Browse Files
03 Mar, 2015 4 commits
- dashboard: fix click new vm text position · 9075b023
  Kálmán Viktor committed Mar 03, 2015
  
  9075b023 Browse Files
- Merge branch 'feature-fix-celery' into 'master' · cfa1e837
```
Feature fix celery ✅

See merge request !299
```
  Bach Dániel committed Mar 03, 2015
  cfa1e837 Browse Files
- Merge branch 'issue-remove-south' into 'master' · 871a5a23
```
Issue remove south ✅

See merge request !298
```
  Bach Dániel committed Mar 03, 2015
  871a5a23 Browse Files
- Merge branch 'feature-fw-api' into 'master' · 9fb5f44b
```
Feature fw api ✅

See merge request !297
```
  Bach Dániel committed Mar 03, 2015
  9fb5f44b Browse Files
27 Feb, 2015 14 commits
- manager: change celery result backend · 31e4886b
```
Closes #380
```
  Bach Dániel committed Feb 27, 2015
  31e4886b Browse Files
- update requirements · 72024042
  Bach Dániel committed Feb 27, 2015
  
  72024042 Browse Files
- modifications based on issue385 · d27ab5b9
  Csók Tamás committed Feb 27, 2015
  
  d27ab5b9 Browse Files
- requirements updated · b68f4fe8
  Csók Tamás committed Feb 27, 2015
  
  b68f4fe8 Browse Files
- circle: remove south migrations · 22d14a10
```
Closes #384
```
  Bach Dániel committed Feb 27, 2015
  22d14a10 Browse Files
- circle: add ADMINS to settings · 59cb3f57
  Bach Dániel committed Feb 27, 2015
  
  59cb3f57 Browse Files
- network: add new fields to blacklisttable · 4a0abb1e
  Bach Dániel committed Feb 27, 2015
  
  4a0abb1e Browse Files
- firewall: fix TypeError in add_blacklist_item() · 704027af
  Bach Dániel committed Feb 27, 2015
  
  704027af Browse Files
- firewall: handle blacklistitem in reloadtask() · 9a6884bf
  Bach Dániel committed Feb 27, 2015
  
  9a6884bf Browse Files
- firewall: add blacklist hook support · 1de90b85
  Bach Dániel committed Feb 27, 2015
  
  1de90b85 Browse Files
- firewall: rewrite blacklist api · 9f8191f1
```
Closes #359
```
  Bach Dániel committed Feb 27, 2015
  9f8191f1 Browse Files
- firewall: update Blacklist model · 10d51ec8
  Bach Dániel committed Feb 27, 2015
  
  10d51ec8 Browse Files
- network: remove exclamation marks · 9fd1d4fe
  Bach Dániel committed Feb 27, 2015
  
  9fd1d4fe Browse Files
- circle: remove garbage · 5456e8b3
  Bach Dániel committed Feb 27, 2015
  
  5456e8b3 Browse Files
26 Feb, 2015 6 commits
- circle: update hungarian translation · eb736545
  Kálmán Viktor committed Feb 26, 2015
  
  eb736545 Browse Files
- Merge branch 'feature-user-friendly' into 'master' · 24d236ec
```
Feature user friendly

See merge request !296
```
  Kálmán Viktor committed Feb 26, 2015
  24d236ec Browse Files
- Merge branch 'issue-381' into 'master' · 47647722
```
Fix can't reach perms

Closes #381

See merge request !295
```
  Kálmán Viktor committed Feb 26, 2015
  47647722 Browse Files
- dashboard: add you can connect now text to vm details · 84e2a209
  Kálmán Viktor committed Feb 26, 2015
  
  84e2a209 Browse Files
- dashboard: fix button stacking on lower res · e1084ff6
  Kálmán Viktor committed Feb 26, 2015
  
  e1084ff6 Browse Files
- dashboard: add help text to use new vm button · 4c1b0628
  Kálmán Viktor committed Feb 26, 2015
  
  4c1b0628 Browse Files
24 Feb, 2015 3 commits
- dashboard: exclude permissions better · a22a7c66
  Kálmán Viktor committed Feb 24, 2015
  
  a22a7c66 Browse Files
- Merge branch 'feature-disable-admin' into 'master' · 211e28fe
```
Feature disable admin ✅

See merge request !291
```
  Bach Dániel committed Feb 24, 2015
  211e28fe Browse Files
- Merge remote-tracking branch 'origin/feature-datastore' · cbbcfb7b
```
Conflicts:
	circle/dashboard/forms.py
	circle/dashboard/tables.py
	circle/dashboard/urls.py
```
  Bach Dániel committed Feb 24, 2015
  cbbcfb7b Browse Files
23 Feb, 2015 7 commits
- updated test requirements · a44ab6eb
  Csók Tamás committed Feb 23, 2015
  
  a44ab6eb Browse Files
- corrected template create and delete tests · b805a147
  Csók Tamás committed Feb 23, 2015
  
  b805a147 Browse Files
- vm: add e1000, rtl8139, pcnet, ne2k_pci support · 84488ced
  Bach Dániel committed Feb 23, 2015
  
  84488ced Browse Files
- Merge branch 'feature-ide-bus' into 'master' · 2da6b728
```
Feature ide bus

See merge request !294
```
  Bach Dániel committed Feb 23, 2015
  2da6b728 Browse Files
- storage: add ide bus support · fb2bd674
  Bach Dániel committed Feb 23, 2015
  
  fb2bd674 Browse Files
- commit before update · 1426611d
  Csók Tamás committed Feb 23, 2015
  
  1426611d Browse Files
- Merge remote-tracking branch 'origin/master' into issue-218 · 9d40ae4f
```
Conflicts:
	requirements/test.txt
```
  Csók Tamás committed Feb 23, 2015
  9d40ae4f Browse Files
20 Feb, 2015 1 commit
- dashboard: fix pagination in user list · 082389aa
  Kálmán Viktor committed Feb 20, 2015
  
  082389aa Browse Files