Commits · aaa3e50b68a7a3ac24d4b2ff4a8e3948f2134da0 · CIRCLE / cloud · GitLab

08 Sep, 2014 5 commits
- Merge branch 'issue-272' into 'master' · aaa3e50b
```
Make some errors human readable
```
  Bach Dániel committed Sep 08, 2014
  aaa3e50b Browse Files
- manager: make scheduler errors human readable · 7cd242ed
```
fixes #272
```
  Őry Máté committed Sep 08, 2014
  7cd242ed Browse Files
- vm: handle TimeLimitExceeded in ShutdownOperation · eb5c95c3
```
fixes #278
```
  Őry Máté committed Sep 08, 2014
  eb5c95c3 Browse Files
- common: don't force setting HRE level · 56542470
  Őry Máté committed Sep 08, 2014
  
  56542470 Browse Files
- Merge branch 'issue-267' into 'master' · c766e690
```
Fix vm customization dialog's error handling

Closes #267
```
  Őry Máté committed Sep 08, 2014
  c766e690 Browse Files
05 Sep, 2014 5 commits
- Merge branch 'issue-249' into 'master' · 06018f2d
```
Save blank Profile.org_id as NULL #249
```
  Őry Máté committed Sep 05, 2014
  06018f2d Browse Files
- dashboard: allow saving Profile if store timeouts · 95d3b15c
  Őry Máté committed Sep 05, 2014
  
  95d3b15c Browse Files
- dashboard: add migration to resave Profiles w blank org_id · 5c732fe0
  Őry Máté committed Sep 05, 2014
  
  5c732fe0 Browse Files
- dashboard: save blank org_id as NULL to bypass unique check · 3e153d13
```
closes #249
```
  Őry Máté committed Sep 05, 2014
  3e153d13 Browse Files
- Merge branch 'fix-scheduler' into 'master' · 30c3b225
```
Fix Scheduler
```
  Bach Dániel committed Sep 05, 2014
  30c3b225 Browse Files
04 Sep, 2014 1 commit
- manager: fix has_enough_ram() · 0bb3f328
  Bach Dániel committed Sep 04, 2014
  
  0bb3f328 Browse Files
03 Sep, 2014 22 commits
- Merge branch 'connect-via-client' into 'master' · ac5f3142
```
Connect via Client support

fixes #222
```
  Őry Máté committed Sep 03, 2014
  ac5f3142 Browse Files
- locale: update Hungarian translation · 19408a06
  Őry Máté committed Sep 03, 2014
  
  19408a06 Browse Files
- update PO templates · 1281c6c6
  Őry Máté committed Sep 03, 2014
  
  1281c6c6 Browse Files
- dashboard: clearer connect buttons · 69822066
  Őry Máté committed Sep 03, 2014
  
  69822066 Browse Files
- dashboard: always use js to connect w/ client · 698fcc72
  Őry Máté committed Sep 03, 2014
  
  698fcc72 Browse Files
- vm: use common circle: url scheme for connection · 9b48cc0c
  Őry Máté committed Sep 03, 2014
  
  9b48cc0c Browse Files
- Merge branch 'issue-270' into 'master' · dd87b7e7
```
Template list all doesn't work for regular users

Closes #270
```
  Kálmán Viktor committed Sep 03, 2014
  dd87b7e7 Browse Files
- dashboard: fix vm/template list · 5a6658de
```
If the template/vm was shared via group they weren't shown in "all"
```
  Kálmán Viktor committed Sep 03, 2014
  5a6658de Browse Files
- Merge branch 'master' into connect-via-client · 08a3542b
```
Conflicts:
	circle/dashboard/templates/dashboard/vm-detail.html
	circle/dashboard/views.py
```
  Őry Máté committed Sep 03, 2014
  08a3542b Browse Files
- dashboard: fix vm customization · f4539967
```
- users without customize privilige can change name, also the form
  will validate correctly
- if we open it without modal, on error the modal will not be shown
  again
```
  Kálmán Viktor committed Sep 03, 2014
  f4539967 Browse Files
- fix msgfmt error · 8eea8de7
  Őry Máté committed Sep 03, 2014
  
  8eea8de7 Browse Files
- locale: update Hungarian translation · 74f52a6c
  Őry Máté committed Sep 03, 2014
  
  74f52a6c Browse Files
- update PO templates · 79092f48
  Őry Máté committed Sep 03, 2014
  
  79092f48 Browse Files
- Merge branch 'feature-template-list' into 'master' · 90122b75
```
Template list upgrade and show deleted vms

Closes #234
Closes #258
```
  Őry Máté committed Sep 03, 2014
  90122b75 Browse Files
- Merge branch 'master' into feature-template-list · 986782b5
```
Conflicts:
	circle/dashboard/views.py
```
  Őry Máté committed Sep 03, 2014
  986782b5 Browse Files
- dashboard: more compact doctest · 6ad5c00e
  Őry Máté committed Sep 03, 2014
  
  6ad5c00e Browse Files
- Merge branch 'custom-connect-command' into 'master' · 0963fa06
```
Custom Connect Command
```
  Őry Máté committed Sep 03, 2014
  0963fa06 Browse Files
- dashboard: rephrase ConnectCommandListTable empty text · 09959441
  Őry Máté committed Sep 03, 2014
  
  09959441 Browse Files
- dashboard: add doctest to connect_command_template_validator · d5336b37
  Őry Máté committed Sep 03, 2014
  
  d5336b37 Browse Files
- Merge branch 'feature-improve-inline-helps' into 'master' · 7a3602eb
```
Feature Improve Inline Helps

🚧 halp!
```
  Őry Máté committed Sep 03, 2014
  7a3602eb Browse Files
- Merge branch 'feature-vm-ipv6' into 'master' · 6278f2fc
```
Feature Vm Ipv6
```
  Bach Dániel committed Sep 03, 2014
  6278f2fc Browse Files
- dashboard: mark missing string for translation · a7b16627
  Őry Máté committed Sep 03, 2014
  
  a7b16627 Browse Files
02 Sep, 2014 7 commits
- dashboard: fix flake8 · cdf10bc0
  Kálmán Viktor committed Sep 02, 2014
  
  cdf10bc0 Browse Files
- dashboard: add ip and lease for vm list · 045df7bb
  Kálmán Viktor committed Sep 02, 2014
  
  045df7bb Browse Files
- dashboard: fix doctests (again) · 2fc29987
```
Dict order
```
  Kálmán Viktor committed Sep 02, 2014
  2fc29987 Browse Files
- dashboard: fix filtermixin doctest · 9a6fa0e9
  Kálmán Viktor committed Sep 02, 2014
  
  9a6fa0e9 Browse Files
- firewall: fix copypaste error :( · 06519506
  Bach Dániel committed Sep 02, 2014
  
  06519506 Browse Files
- dashboard: add doctest for magic method · 221785a7
  Kálmán Viktor committed Sep 02, 2014
  
  221785a7 Browse Files
- dashboard: change span to label · 49359325
  Kálmán Viktor committed Sep 02, 2014
  
  49359325 Browse Files