Commits · caf8f0333c4bab0b480c7c846ef4b73bb388d7d5 · CIRCLE / cloud · GitLab

07 May, 2015 2 commits
- Merge branch 'master' into feature-django18 · caf8f033
```
Conflicts:
	requirements/base.txt
```
  Kálmán Viktor committed May 07, 2015
  caf8f033 Browse Files
- dashboard: fix template tester test · a43c9ead
  Kálmán Viktor committed May 07, 2015
  
  a43c9ead Browse Files
05 May, 2015 10 commits
- circle: remove South · 0aa83f04
  Kálmán Viktor committed May 05, 2015
  
  0aa83f04 Browse Files
- circle: Django 1.8 · b0f6b7df
  Kálmán Viktor committed May 05, 2015
  
  b0f6b7df Browse Files
- Merge branch 'pipeline14' into 'master' · 0ac5aa0b
```
Pipeline 1.4 ✅

See merge request !330
```
  Bach Dániel committed May 05, 2015
  0ac5aa0b Browse Files
- dashboard: fix EncodeError in VmCreate · 406a837a
  Bach Dániel committed May 05, 2015
  
  406a837a Browse Files
- acl: add prefetch_related() · b8d4d226
  Bach Dániel committed May 05, 2015
  
  b8d4d226 Browse Files
- Merge remote-tracking branch 'origin/feature-gitlabheader' · f0d0b01b
```
Conflicts:
	circle/dashboard/static/dashboard/dashboard.less
```
  Bach Dániel committed May 05, 2015
  f0d0b01b Browse Files
- Merge remote-tracking branch 'origin/issue-404' · 00fa79a8
```
Conflicts:
	circle/dashboard/templates/dashboard/vm-detail/console.html
```
  Bach Dániel committed May 05, 2015
  00fa79a8 Browse Files
- Merge branch 'fix-network-graph' into 'master' · 91de7d41
```
fix issue #407 (Network graph error for VMs without network) ✅

See merge request !327
```
  Bach Dániel committed May 05, 2015
  91de7d41 Browse Files
- Merge remote-tracking branch 'origin/html-fixes' · d4205acc
```
Conflicts:
	circle/templates/registration/login.html
```
  Bach Dániel committed May 05, 2015
  d4205acc Browse Files
- dashboard: switch back to main pipeline 1.4 · 030eb440
  Kálmán Viktor committed May 05, 2015
  
  030eb440 Browse Files
04 May, 2015 3 commits
- dashboard: improve vnc console · 94279c56
```
- fix screenshot button
- add warning message if user has no perm to see the console
```
  Kálmán Viktor committed May 04, 2015
  94279c56 Browse Files
- dashboard: change fa-users to profile pictures · 4fbdb358
  Kálmán Viktor committed May 04, 2015
  
  4fbdb358 Browse Files
- Merge branch 'issue-397' into 'master' · 8ebf4214
```
Open graph ✅

![bme](https://git.ik.bme.hu/uploads/circle/cloud/ba6f0686a7/bme.png)

Closes #397

See merge request !316
```
  Kálmán Viktor committed May 04, 2015
  8ebf4214 Browse Files
29 Apr, 2015 3 commits
- dashboard: fix issue #407 (Network graph error for VMs without network) · 626244ad
```
closes #407
```
  Bach Dániel committed Apr 29, 2015
  626244ad Browse Files
- dashboard: add rosetta url · 1a51d380
  Bach Dániel committed Apr 29, 2015
  
  1a51d380 Browse Files
- locale: update hu translation · d3577a43
  Bach Dániel committed Apr 29, 2015
  
  d3577a43 Browse Files
27 Apr, 2015 12 commits
- dashboard: 💻 🐕 · 25273bd4
  Bach Dániel committed Apr 27, 2015
  
  25273bd4 Browse Files
- Merge branch 'feature-copy-keys' into 'master' · 29574622
```
Add InstallKeysOperation ✅

See merge request !323
```
  Bach Dániel committed Apr 27, 2015
  29574622 Browse Files
- Merge branch 'feature-broadcast-messages' into 'master' · 151c90c6
```
Broadcast msg ✅

See merge request !326
```
  Bach Dániel committed Apr 27, 2015
  151c90c6 Browse Files
- dashboard: remove @permalink · 257106ae
  Bach Dániel committed Apr 27, 2015
  
  257106ae Browse Files
- dashboard: add preview · 4c7d268c
  Bach Dániel committed Apr 27, 2015
  
  4c7d268c Browse Files
- dashboard: invalidate template fragment cache in Message*Views · b8e19b76
  Bach Dániel committed Apr 27, 2015
  
  b8e19b76 Browse Files
- dashboard: fix pagination · c6ef1eb4
  Bach Dániel committed Apr 27, 2015
  
  c6ef1eb4 Browse Files
- dashboard: use TimeFramedModel in Message · 08abf4b5
  Bach Dániel committed Apr 27, 2015
  
  08abf4b5 Browse Files
- dashboard: set cache timeout · c1e8f14e
  Bach Dániel committed Apr 27, 2015
  
  c1e8f14e Browse Files
- dashboard: add license · ef52be8d
  Bach Dániel committed Apr 27, 2015
  
  ef52be8d Browse Files
- dashboard: add missing semicolon · 8130782b
  Bach Dániel committed Apr 27, 2015
  
  8130782b Browse Files
- dashboard: add broadcast message support · c10c1a49
  Bach Dániel committed Apr 27, 2015
  
  c10c1a49 Browse Files
20 Apr, 2015 10 commits
- Merge branch 'master' into feature-gitlabheader · fddee865
  Kálmán Viktor committed Apr 20, 2015
  
  fddee865 Browse Files
- Merge branch 'master' into issue-397 · f5eb9edb
  Kálmán Viktor committed Apr 20, 2015
  
  f5eb9edb Browse Files
- dashboard: move open graph to login page · 925cd76e
  Kálmán Viktor committed Apr 20, 2015
  
  925cd76e Browse Files
- Merge branch 'request-fixes' into 'master' · ff91b0ff
```
Request fixes

Closes #403
Closes #406

See merge request !325
```
  Kálmán Viktor committed Apr 20, 2015
  ff91b0ff Browse Files
- Merge branch 'feature-vnc-port-range' into 'master' · c0d9098f
```
Make VNC port range configurable from settings ✅

closes #97

See merge request !324
```
  Bach Dániel committed Apr 20, 2015
  c0d9098f Browse Files
- dashboard: fix a weird title issue · ef73c27c
  Kálmán Viktor committed Apr 20, 2015
  
  ef73c27c Browse Files
- request: update hu translation · b5d8534d
  Kálmán Viktor committed Apr 20, 2015
  
  b5d8534d Browse Files
- vm: add InstallKeysOperation · bf92aeee
  Bach Dániel committed Apr 20, 2015
  
  bf92aeee Browse Files
- dashboard: fix resources slider save button · 302a9fd0
  Kálmán Viktor committed Apr 20, 2015
  
  302a9fd0 Browse Files
- request: hide lease request button if no lease types are present · 0f995dc5
  Kálmán Viktor committed Apr 20, 2015
  
  0f995dc5 Browse Files