Commits · 8e1635ef314137528694c399839f51a2590870c5 · CIRCLE / cloud

16 Sep, 2014 1 commit

Merge branch 'master' into feature-pipeline · 8e1635ef

Conflicts:
	circle/dashboard/static/dashboard/dashboard.css
	circle/dashboard/static/dashboard/vm-details.js
	circle/dashboard/templates/base.html
	circle/dashboard/templates/dashboard/index-vm.html

committed Sep 16, 2014

8e1635ef Browse Files

15 Sep, 2014 1 commit
- Merge branch 'issue-282' into 'master' · ea3039d6
```
Make request.user the initial owner in network.* forms

Closes #282
```
  Kálmán Viktor committed Sep 15, 2014
  ea3039d6 Browse Files
12 Sep, 2014 2 commits
- Merge branch 'feature-wait-for-agent' into 'master' · 1138a614
```
Feature Wait For Agent

closes #280
```
  Őry Máté committed Sep 12, 2014
  1138a614 Browse Files
- dashboard: fix VmCustomizeForm for privileged non-superusers · 8045b135
  Őry Máté committed Sep 12, 2014
  
  8045b135 Browse Files
11 Sep, 2014 17 commits
- Merge branch 'issue-286' into 'master' · 35b23301
```
Issue 286
```
  Őry Máté committed Sep 11, 2014
  35b23301 Browse Files
- storage: fix creating non-ascii named disks · 774926cb
```
closes #286
```
  Őry Máté committed Sep 11, 2014
  774926cb Browse Files
- Merge branch 'issue-269' into 'master' · a5641c4d
```
Issue #269
```
  Őry Máté committed Sep 11, 2014
  a5641c4d Browse Files
- dashboard: create user profile on creation · b4aca32d
```
closes #269
```
  Őry Máté committed Sep 11, 2014
  b4aca32d Browse Files
- network: fix flake8 error · 9a062596
  Kálmán Viktor committed Sep 11, 2014
  
  9a062596 Browse Files
- network: use mixin in record create view to set owner · 961a5f71
  Kálmán Viktor committed Sep 11, 2014
  
  961a5f71 Browse Files
- Merge branch 'master' into issue-282 · 338c3960
```
Conflicts:
	circle/network/views.py
```
  Kálmán Viktor committed Sep 11, 2014
  338c3960 Browse Files
- Merge branch 'issue-253' into 'master' · 65fd2ea6
```
Make it easy to add a cname to changed hostname

Closes #253
```
  Kálmán Viktor committed Sep 11, 2014
  65fd2ea6 Browse Files
- network: i18n for forms · 999a46e0
  Kálmán Viktor committed Sep 11, 2014
  
  999a46e0 Browse Files
- network: add owner to vlan form · 2bfa1d25
  Kálmán Viktor committed Sep 11, 2014
  
  2bfa1d25 Browse Files
- vm: make buildbot happy · d932325c
  Őry Máté committed Sep 11, 2014
  
  d932325c Browse Files
- vm: finish os_boot subactivities if agent starts · 443b387e
  Őry Máté committed Sep 11, 2014
  
  443b387e Browse Files
- vm: add os_boot subactivity to operations that boot a vm · adb2d8e2
  Őry Máté committed Sep 11, 2014
  
  adb2d8e2 Browse Files
- vm: allow InstanceActivities to be interruptible · 5887df63
  Őry Máté committed Sep 11, 2014
  
  5887df63 Browse Files
- vm: refactor activity code construction · be81cdd9
  Őry Máté committed Sep 11, 2014
  
  be81cdd9 Browse Files
- dashboard: support template has_agent · 78b8228f
  Őry Máté committed Sep 11, 2014
  
  78b8228f Browse Files
- vm: add Instance*.has_agent attribute · 8b31f066
  Őry Máté committed Sep 11, 2014
  
  8b31f066 Browse Files
10 Sep, 2014 9 commits
- network: add default owners for network forms · a86d7f52
```
Also remove copypasted SuccessMessageMixin
```
  Kálmán Viktor committed Sep 10, 2014
  a86d7f52 Browse Files
- Merge branch 'fix-autocomplete' into 'master' · 0136016f
```
Fix Autocomplete

Closes #273
```
  Bach Dániel committed Sep 10, 2014
  0136016f Browse Files
- network: new CNAME button for host edit · 7bb777ef
  Kálmán Viktor committed Sep 10, 2014
  
  7bb777ef Browse Files
- network: enhance host edit page · efdebdff
```
- fix some bugs
- add vlans to vlan groups
- add proto
```
  Kálmán Viktor committed Sep 10, 2014
  efdebdff Browse Files
- Merge branch 'issue-251' into 'master' · 8b236652
```
Show relevant records on hosts page

Closes #251
```
  Kálmán Viktor committed Sep 10, 2014
  8b236652 Browse Files
- dashboard: doctest for autocomplete.highlight · 3c056c38
  Bach Dániel committed Sep 10, 2014
  
  3c056c38 Browse Files
- Merge branch 'issue-215' into 'master' · 7ab98d6f
```
vm search by hostname

Closes #215
```
  Kálmán Viktor committed Sep 10, 2014
  7ab98d6f Browse Files
- dashboard: fix xss in autocomplete · 0b7b8883
  Bach Dániel committed Sep 10, 2014
  
  0b7b8883 Browse Files
- Merge branch 'fix-wakeup' into 'master' · 4a6dd476
```
Handle wake up errors v2

Closes #272
```
  Őry Máté committed Sep 10, 2014
  4a6dd476 Browse Files
09 Sep, 2014 10 commits
- vm: handle wake up errors · 6cac7bbe
  Bach Dániel committed Sep 09, 2014
  
  6cac7bbe Browse Files
- dashboard: fix tests · 832cfdce
  Bach Dániel committed Sep 09, 2014
  
  832cfdce Browse Files
- dashboard: improve transfer ownership view · 04305fa9
  Bach Dániel committed Sep 09, 2014
  
  04305fa9 Browse Files
- dashboard: autocomplete for group members · ab87f4fc
  Bach Dániel committed Sep 09, 2014
  
  ab87f4fc Browse Files
- dashboard: improve autocomplete · b61a5728
  Bach Dániel committed Sep 09, 2014
  
  b61a5728 Browse Files
- dashboard: rename AclUserAddForm · c79a3431
  Bach Dániel committed Sep 09, 2014
  
  c79a3431 Browse Files
- dashboard: rename AclUserAutocomplete · 1ba46618
  Bach Dániel committed Sep 09, 2014
  
  1ba46618 Browse Files
- dashboard: minor fixes to activity detail · 229225d0
```
- fix bootstrap class name
- make the activity timeline more readable on smaller screen
```
  Kálmán Viktor committed Sep 09, 2014
  229225d0 Browse Files
- dashboard: update font awesome version · 7bcde780
  Kálmán Viktor committed Sep 09, 2014
  
  7bcde780 Browse Files
- dashboard: filter vm search by host too on dashboard · 11ba26c2
  Kálmán Viktor committed Sep 09, 2014
  
  11ba26c2 Browse Files