Commits · 91843cc1148b51a3f998de754a905505b5505711 · CIRCLE / cloud · GitLab

22 Sep, 2014 4 commits
- Merge branch 'feature-refactor-views' into 'master' · 91843cc1
```
Feature Refactor Views
```
  Őry Máté committed Sep 22, 2014
  91843cc1 Browse Files
- Merge branch 'master' into feature-refactor-views · 154902de
```
Conflicts:
	circle/dashboard/views.py
```
  Őry Máté committed Sep 22, 2014
  154902de Browse Files
- dashboard: fix redirects · 2fd40158
  Őry Máté committed Sep 22, 2014
  
  2fd40158 Browse Files
- dashboard: fix tests · 9c93356a
  Őry Máté committed Sep 22, 2014
  
  9c93356a Browse Files
18 Sep, 2014 1 commit
- dashboard: refactor views · 113ce3d5
```
(tests coming soon)
```
  Őry Máté committed Sep 18, 2014
  113ce3d5 Browse Files
17 Sep, 2014 1 commit
- Merge branch 'issue-293' into 'master' · 753691c4
```
Issue 293
```
  Őry Máté committed Sep 17, 2014
  753691c4 Browse Files
16 Sep, 2014 10 commits
- Merge branch 'issue-268' into 'master' · b42a5745
```
Issue 268
```
  Őry Máté committed Sep 16, 2014
  b42a5745 Browse Files
- dashboard: Allow transferring ownership while activity in progress · e8ca9249
```
closes #293
```
  Őry Máté committed Sep 16, 2014
  e8ca9249 Browse Files
- update django to 1.6.7 (security fix) · 9831b9b0
  Őry Máté committed Sep 16, 2014
  
  9831b9b0 Browse Files
- dashboard: show owner in place of hostname if it's not me · b640ae3d
```
closes #268
```
  Őry Máté committed Sep 16, 2014
  b640ae3d Browse Files
- Merge branch 'issue-287' into 'master' · a4a15f95
```
Issue 287 deny saving pending machine
```
  Őry Máté committed Sep 16, 2014
  a4a15f95 Browse Files
- Merge branch 'feature-titles' into 'master' · 03825c38
```
Feature Titles

Closes #283
```
  Kálmán Viktor committed Sep 16, 2014
  03825c38 Browse Files
- Merge branch 'issue-290' into 'master' · 3a90c680
```
Add a non-finished subactivity after updating agent

🚧 needs manual test
```
  Őry Máté committed Sep 16, 2014
  3a90c680 Browse Files
- update Hungarian translation · dd40e8ab
  Őry Máté committed Sep 16, 2014
  
  dd40e8ab Browse Files
- update PO templates · c0762c39
  Őry Máté committed Sep 16, 2014
  
  c0762c39 Browse Files
- Merge branch 'master' into feature-titles · 04bbf626
  Őry Máté committed Sep 16, 2014
  
  04bbf626 Browse Files
15 Sep, 2014 3 commits
- vm: add a non-finished subactivity after updating agent · 0407bfa4
```
closes #290
```
  Őry Máté committed Sep 15, 2014
  0407bfa4 Browse Files
- network: add titles · 60fedbfc
  Kálmán Viktor committed Sep 15, 2014
  
  60fedbfc Browse Files
- 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 3 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
- vm: deny saving pending machine · 9108e20a
```
closes #287
```
  Őry Máté committed Sep 12, 2014
  9108e20a Browse Files
- dashboard: fix VmCustomizeForm for privileged non-superusers · 8045b135
  Őry Máté committed Sep 12, 2014
  
  8045b135 Browse Files
11 Sep, 2014 18 commits
- dashboard: missing titles in dashboard · 3df21e20
  Kálmán Viktor committed Sep 11, 2014
  
  3df21e20 Browse Files
- 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