Commits · 3692fb68b5cdec01ff967f5f6d31c5bdcf546d34 · CIRCLE / cloud · GitLab

07 Jun, 2014 1 commit
- Merge branch 'feature-new-macfield' into 'master' · 3692fb68
```
Feature New Macfield
```
  Bach Dániel committed Jun 07, 2014
  3692fb68 Browse Files
06 Jun, 2014 8 commits
- Merge remote-tracking branch 'origin/feature-new-saml-group' · e4141022
  Őry Máté committed Jun 06, 2014
  
  e4141022 Browse Files
- dashboard: refactor GroupCodeMixin · 94e3de4b
  Őry Máté committed Jun 06, 2014
  
  94e3de4b Browse Files
- dashboard: add SuccessMessageMixin to GroupProfileUpdate · 932297bf
  Őry Máté committed Jun 06, 2014
  
  932297bf Browse Files
- dashboard: use proper FormMixin methods in GroupProfileUpdate · 5f741f60
  Őry Máté committed Jun 06, 2014
  
  5f741f60 Browse Files
- dashboard: nicer groupprofile form template · cd464162
  Őry Máté committed Jun 06, 2014
  
  cd464162 Browse Files
- dashboard: groupless users can see their own email · a499689c
  Kálmán Viktor committed Jun 06, 2014
  
  a499689c Browse Files
- dashboard: fix pep8 · a2515fe0
  Őry Máté committed Jun 06, 2014
  
  a2515fe0 Browse Files
- dashboard: allow arbitrary GroupProfile.org_id values for admin · 9fb9dfc6
  Őry Máté committed Jun 06, 2014
  
  9fb9dfc6 Browse Files
05 Jun, 2014 24 commits
- dashboard: fix profile regexps · 5a55ce9d
  Bach Dániel committed Jun 05, 2014
  
  5a55ce9d Browse Files
- network: fix queues names · 8881848f
  Guba Sándor committed Jun 05, 2014
  
  8881848f Browse Files
- Merge branch 'feature-priority-queues' · 2d99cd14
```
Conflicts:
	circle/vm/models/instance.py
```
  Guba Sándor committed Jun 05, 2014
  2d99cd14 Browse Files
- dashboard: use x not in instead not x in · 240e00f7
  Őry Máté committed Jun 05, 2014
  
  240e00f7 Browse Files
- Merge branch 'feature-profile-view' · 5531552b
```
Conflicts:
	circle/dashboard/static/dashboard/dashboard.css
	circle/dashboard/urls.py
	circle/dashboard/views.py
```
  Kálmán Viktor committed Jun 05, 2014
  5531552b Browse Files
- dashboard: handle keyerrors in saml attributes · a931fe31
  Őry Máté committed Jun 05, 2014
  
  a931fe31 Browse Files
- dashboard: minor fixes · fea2c505
  Kálmán Viktor committed Jun 05, 2014
  
  fea2c505 Browse Files
- Merge branch 'feature-connection-details' · 1acfd3ea
```
Conflicts:
	circle/dashboard/static/dashboard/dashboard.css
```
  Kálmán Viktor committed Jun 05, 2014
  1acfd3ea Browse Files
- Merge branch 'feature-vm-list-filtering' · bbd8020b
```
Conflicts:
	circle/dashboard/static/dashboard/dashboard.css
```
  Kálmán Viktor committed Jun 05, 2014
  bbd8020b Browse Files
- settings: propagate exceptions from signals if DEBUG · bd781d07
  Őry Máté committed Jun 05, 2014
  
  bd781d07 Browse Files
- settings: accept HTTP_X_FORWARDED_PROTOCOL · e6d9359f
  Guba Sándor committed Jun 05, 2014
  
  e6d9359f Browse Files
- dashboard: display real name in base.html · e79acf21
  Kálmán Viktor committed Jun 05, 2014
  
  e79acf21 Browse Files
- dashboard: ipv6 and handling no open ports · bfe7a9b3
  Kálmán Viktor committed Jun 05, 2014
  
  bfe7a9b3 Browse Files
- dashboard: add connection details · 1d7255f3
  Kálmán Viktor committed Jun 05, 2014
  
  1d7255f3 Browse Files
- network: make ip addresses str · a9f165ca
  Kálmán Viktor committed Jun 05, 2014
  
  a9f165ca Browse Files
- dashboard: add comment to the create_fake_get method · 11bf4569
  Kálmán Viktor committed Jun 05, 2014
  
  11bf4569 Browse Files
- dashboard: email permissions · 1e0fd692
  Kálmán Viktor committed Jun 05, 2014
  
  1e0fd692 Browse Files
- dashboard: replace get_object calls with a single variable · 6cc64519
  Kálmán Viktor committed Jun 05, 2014
  
  6cc64519 Browse Files
- dashboard: access user profiles by username · 0fbdc363
  Kálmán Viktor committed Jun 05, 2014
  
  0fbdc363 Browse Files
- dashboard: better group filtering in profile · 89dc52ae
  Kálmán Viktor committed Jun 05, 2014
  
  89dc52ae Browse Files
- Merge branch 'feature-improve-agent' into 'master' · 9bd69e0a
```
Feature Improve Agent
```
  Bach Dániel committed Jun 05, 2014
  9bd69e0a Browse Files
- vm: rename agent.start_ssh celery task · 492a0407
  Bach Dániel committed Jun 05, 2014
  
  492a0407 Browse Files
- vm: use queryset.exists() instead of count() · c47d3949
  Bach Dániel committed Jun 05, 2014
  
  c47d3949 Browse Files
- update .gitignore · 8e898f22
  Bach Dániel committed Jun 05, 2014
  
  8e898f22 Browse Files
04 Jun, 2014 7 commits
- dashboard: i18n for profile · c294526f
  Kálmán Viktor committed Jun 04, 2014
  
  c294526f Browse Files
- dashboard: fix tests · 9298448a
  Kálmán Viktor committed Jun 04, 2014
  
  9298448a Browse Files
- dashboard: update profile absolute url · e6764922
  Kálmán Viktor committed Jun 04, 2014
  
  e6764922 Browse Files
- dashboard: edit user preferences · cdd0662c
  Kálmán Viktor committed Jun 04, 2014
  
  cdd0662c Browse Files
- vm: add new agent tasks · 41ec590a
  Bach Dániel committed Jun 04, 2014
  
  41ec590a Browse Files
- vm: refactor agent tasks · 1c558830
  Bach Dániel committed Jun 04, 2014
  
  1c558830 Browse Files
- dashboard: use gravatar avatar option · 33262020
  Kálmán Viktor committed Jun 04, 2014
  
  33262020 Browse Files