Commits · e14a1b89f4666d783b1ccd09f5f7adc50ad13942 · Gelencsér Szabolcs / cloud · GitLab

13 Feb, 2013 19 commits
- Merge branch 'master' of ssh://giccero.cloud.ik.bme.hu/cloud · e14a1b89
  Dudás Ádám committed Feb 13, 2013
  
  e14a1b89 Browse Files
- erőltetem a szabályokat · 30a50ad7
  Dudás Ádám committed Feb 13, 2013
  
  30a50ad7 Browse Files
- firewall: changed variable name not merged · 11c061d4
  Őry Máté committed Feb 13, 2013
  
  11c061d4 Browse Files
- firewall: fix white space 2 · cd9a353d
  Őry Máté committed Feb 13, 2013
  
  cd9a353d Browse Files
- firewall: fix white space · 4f31396d
  Őry Máté committed Feb 13, 2013
  
  4f31396d Browse Files
- Merge branch 'master' of ssh://giccero.cloud.ik.bme.hu/cloud · 61dac5d1
```
Conflicts:
	firewall/fw.py
```
  Dudás Ádám committed Feb 13, 2013
  61dac5d1 Browse Files
- Merge branch 'master' into dev-siliconbrain · 3cf01a3e
```
Conflicts:
	cloud/urls.py
	firewall/fw.py
```
  Dudás Ádám committed Feb 13, 2013
  3cf01a3e Browse Files
- firewall: ssh replaced with rabbitmq · e21437b1
  Bach Dániel committed Feb 13, 2013
  
  e21437b1 Browse Files
- one: set default share quota to 0 · fe568466
  Őry Máté committed Feb 13, 2013
  
  fe568466 Browse Files
- webui: remove teacher functions if no share quota · f2a936b5
  Őry Máté committed Feb 13, 2013
  
  f2a936b5 Browse Files
- webui: add lock icon to common templates · 266d863e
  Őry Máté committed Feb 13, 2013
  
  266d863e Browse Files
- one: add transient (waiting) state for Instance · e72eb8cc
```
fixes #48
```
  Őry Máté committed Feb 13, 2013
  e72eb8cc Browse Files
- webui: new template infobox step5 gray if vm done · d6721c9c
  Őry Máté committed Feb 13, 2013
  
  d6721c9c Browse Files
- one: allow new template creation from own images · 12612824
  Őry Máté committed Feb 13, 2013
  
  12612824 Browse Files
- one: keep vm delete message also if ajax · f9793aa0
  Őry Máté committed Feb 13, 2013
  
  f9793aa0 Browse Files
- webui: remove conflict mark left in 33c6219a :( · 8cb0c931
  Őry Máté committed Feb 13, 2013
  
  8cb0c931 Browse Files
- webui: fix css property name · c4b1f23b
  Őry Máté committed Feb 13, 2013
  
  c4b1f23b Browse Files
- one: also delete new template with master vm · 92e96528
  Őry Máté committed Feb 13, 2013
  
  92e96528 Browse Files
- one: admin lists more columns · fe11154a
  Őry Máté committed Feb 13, 2013
  
  fe11154a Browse Files
12 Feb, 2013 21 commits
- one: remove new template if vm submission failed · 01b6960b
  Őry Máté committed Feb 12, 2013
  
  01b6960b Browse Files
- one: error message for nonunique template creation · d0abde5e
  Őry Máté committed Feb 12, 2013
  
  d0abde5e Browse Files
- webui: prevent submitting not unique template wizard · b75f7687
  Őry Máté committed Feb 12, 2013
  
  b75f7687 Browse Files
- webui: add translation to inline js · b7bb958e
  Őry Máté committed Feb 12, 2013
  
  b7bb958e Browse Files
- one: make default template name unique · 5dfb3014
  Őry Máté committed Feb 12, 2013
  
  5dfb3014 Browse Files
- webui: fix django template bug introduced in a8bc5968 · 8ac3399f
  Őry Máté committed Feb 12, 2013
  
  8ac3399f Browse Files
- django: translation update (full) · 00375e12
  Őry Máté committed Feb 12, 2013
  
  00375e12 Browse Files
- one: add renew function · 340d9070
  Őry Máté committed Feb 12, 2013
  
  340d9070 Browse Files
- school: temporarily disable admin add fields · 47e39346
  Őry Máté committed Feb 12, 2013
  
  47e39346 Browse Files
- django: update Hungarian translation (full) · 3cd384b3
  Őry Máté committed Feb 12, 2013
  
  3cd384b3 Browse Files
- django: update po templates · d816b50d
  Őry Máté committed Feb 12, 2013
  
  d816b50d Browse Files
- webui: add details to new-vm dialog · 33c6219a
  Őry Máté committed Feb 12, 2013
  
  33c6219a Browse Files
- one: implement quota on vm_add · d9e3534b
  Őry Máté committed Feb 12, 2013
  
  d9e3534b Browse Files
- school: fix Person.__unicode__ · 658889da
  Őry Máté committed Feb 12, 2013
  
  658889da Browse Files
- webui: display more details about group members/owners · c2b89554
  Dányi Bence committed Feb 12, 2013
  
  c2b89554 Browse Files
- webui: padding fixed · b19ddd54
  Dányi Bence committed Feb 12, 2013
  
  b19ddd54 Browse Files
- webui: new-share label reference fixed · 897009e0
  Dányi Bence committed Feb 12, 2013
  
  897009e0 Browse Files
- webui: more simple template share display · 3019fd42
  Dányi Bence committed Feb 12, 2013
  
  3019fd42 Browse Files
- webui: fix background color · 4b4d4733
  Dányi Bence committed Feb 12, 2013
  
  4b4d4733 Browse Files
- webui: better template share display · cae34f99
  Dányi Bence committed Feb 12, 2013
  
  cae34f99 Browse Files
- school: group owners displayed · 1e29781e
  Dányi Bence committed Feb 12, 2013
  
  1e29781e Browse Files