Commits · 5e496201ee50dd50fa684379dd8dd6cbdc6a5300 · Fukász Rómeó Ervin / cloud

22 Jul, 2014 4 commits
- Merge branch 'master' into nostate-operation · 5e496201
```
Conflicts:
	circle/vm/models/instance.py
```
  Guba Sándor committed Jul 22, 2014
  5e496201 Browse Files
- dashboard: remove boldness from renew and disk buttons · 6170f914
  Kálmán Viktor committed Jul 22, 2014
  
  6170f914 Browse Files
- dashboard: renew modal · b5772661
```
Closes #199
```
  Kálmán Viktor committed Jul 22, 2014
  b5772661 Browse Files
- common: handle missing params for HumanReadableObject.get_*_text() · 3c30d07d
  Őry Máté committed Jul 22, 2014
  
  3c30d07d Browse Files
21 Jul, 2014 6 commits
- dashboard: fix new template button on vm list · 6474d40a
```
Closes #209
```
  Kálmán Viktor committed Jul 21, 2014
  6474d40a Browse Files
- dashboard: added state change button · 38e373e3
  Guba Sándor committed Jul 21, 2014
  
  38e373e3 Browse Files
- vm: rewrite manual_state_change · c342b6da
  Guba Sándor committed Jul 21, 2014
  
  c342b6da Browse Files
- activity: added pk to the ActivityInProgress exception · dc0fd302
  Guba Sándor committed Jul 21, 2014
  
  dc0fd302 Browse Files
- operation: added ChangeStateOperation · 6c725c6d
  Guba Sándor committed Jul 21, 2014
  
  6c725c6d Browse Files
- vm: fix migrations · d0891d38
  Őry Máté committed Jul 21, 2014
  
  d0891d38 Browse Files
20 Jul, 2014 3 commits
- Merge branch 'feature-hot-plug' into 'master' · f19b455c
```
Feature Hot Plug

Fixes #170, #171

✅ qcow2 image hot-attach/detach
🚫 CD-ROM hot attach/detach not possible in current libvirt/kvm
✅ NIC hot-attach/detach
```
  Őry Máté committed Jul 20, 2014
  f19b455c Browse Files
- vm: fix style · f669d51e
  Őry Máté committed Jul 20, 2014
  
  f669d51e Browse Files
- Merge branch 'master' into feature-hot-plug · 5afb9149
```
Conflicts:
	circle/vm/operations.py
```
  Őry Máté committed Jul 20, 2014
  5afb9149 Browse Files
19 Jul, 2014 9 commits
- dashboard: fix VmResourcesChangeView · fe84d9e6
  Bach Dániel committed Jul 19, 2014
  
  fe84d9e6 Browse Files
- circle: fix password reset url · fda830b4
  Bach Dániel committed Jul 19, 2014
  
  fda830b4 Browse Files
- Merge branch 'issue-196' into 'master' · 48d55f62
```
Issue 196
```
  Bach Dániel committed Jul 19, 2014
  48d55f62 Browse Files
- Merge branch 'issue-198' into 'master' · f1075d52
```
Issue 198
```
  Bach Dániel committed Jul 19, 2014
  f1075d52 Browse Files
- dashboard: show success messages in alert-success instead of danger · 4e00628c
```
fixes #198
```
  Bach Dániel committed Jul 19, 2014
  4e00628c Browse Files
- dashboard: fix fix of renew · 9703cb54
  Őry Máté committed Jul 19, 2014
  
  9703cb54 Browse Files
- dashboard: use queryset for renew choices · 9977cf86
```
fixes #196
```
  Őry Máté committed Jul 19, 2014
  9977cf86 Browse Files
- Merge branch 'issue-139' into 'master' · 409e0069
```
Make activities translatable/human readable

Human-readable names and results for activites, notifications and exceptions.

fixes #139, #187
```
  Őry Máté committed Jul 19, 2014
  409e0069 Browse Files
- *: add missing readable_names · 8d77978d
  Őry Máté committed Jul 19, 2014
  
  8d77978d Browse Files
18 Jul, 2014 7 commits
- dashboard: fix mocked tests · 5432a550
  Őry Máté committed Jul 18, 2014
  
  5432a550 Browse Files
- common: don't try to translate empty string · 8ef3f54f
```
_("") is the metadata of the translation
```
  Őry Máté committed Jul 18, 2014
  8ef3f54f Browse Files
- vm: fix notifications · 095b49ad
  Őry Máté committed Jul 18, 2014
  
  095b49ad Browse Files
- dashboard: show unhandled HumanReadableExceptions on http500 page · 4c85c0e6
  Őry Máté committed Jul 18, 2014
  
  4c85c0e6 Browse Files
- vm: add missing disk.save() to CreateDiskOperation · 2562ea1f
  Bach Dániel committed Jul 18, 2014
  
  2562ea1f Browse Files
- common: add HumanReadableException and humanize_exception · 79712693
  Őry Máté committed Jul 18, 2014
  
  79712693 Browse Files
- common: add HumanReadableObject.set() · bf391e07
  Őry Máté committed Jul 18, 2014
  
  bf391e07 Browse Files
17 Jul, 2014 6 commits
- Merge branch 'feature-session-cookie' into 'master' · bbc9a44c
```
Feature Session Cookie
```
  Őry Máté committed Jul 17, 2014
  bbc9a44c Browse Files
- circle: set unique session cookie name for different hosts · 4ef135b1
```
cookies of devenvs with the same domain (eg forwarded to different ports)
collide otherwise
```
  Őry Máté committed Jul 17, 2014
  4ef135b1 Browse Files
- vm: fix tests · 3f60bd73
```
MagicMock.__init__'s name parameter doesnt set the name attribute.
```
  Őry Máté committed Jul 17, 2014
  3f60bd73 Browse Files
- vm: fix tests · 3c6a1b3e
  Őry Máté committed Jul 17, 2014
  
  3c6a1b3e Browse Files
- vm: use activity name interface · 74c3886a
  Őry Máté committed Jul 17, 2014
  
  74c3886a Browse Files
- dashboard: fix node timeline icons · 742d5f7f
  Őry Máté committed Jul 17, 2014
  
  742d5f7f Browse Files
16 Jul, 2014 5 commits
- vm: fix migrations to preserve activity details · 87dd7bb1
  Őry Máté committed Jul 16, 2014
  
  87dd7bb1 Browse Files
- dashboard: allow showing activity details for everyone · 4780b59c
  Őry Máté committed Jul 16, 2014
  
  4780b59c Browse Files
- vm: add readable name to activities · 66ddb1a9
  Őry Máté committed Jul 16, 2014
  
  66ddb1a9 Browse Files
- Merge branch 'master' into issue-139 · 96f1d71c
```
Conflicts:
	circle/dashboard/templates/dashboard/_notifications-timeline.html
	circle/dashboard/templates/dashboard/node-detail/_activity-timeline.html
	circle/dashboard/templates/dashboard/notifications/ownership-offer.html
	circle/dashboard/templates/dashboard/notifications/vm-destroyed.html
	circle/dashboard/templates/dashboard/notifications/vm-expiring.html
	circle/dashboard/templates/dashboard/notifications/vm-suspended.html
	circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html
```
  Őry Máté committed Jul 16, 2014
  96f1d71c Browse Files
- dashboard: update notification view · 66805404
  Őry Máté committed Jul 16, 2014
  
  66805404 Browse Files