Commits · fda830b485991651ced89a12d552291652164572 · CIRCLE / cloud

19 Jul, 2014 8 commits
- 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 6 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
- 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 9 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
- dashboard: fix migration · 55773d3c
```
datamigration made var substituion fail if original rendered text contained
percent char. now these are escaped
```
  Őry Máté committed Jul 16, 2014
  55773d3c Browse Files
- dashboard: use new notify method · 4df81053
  Őry Máté committed Jul 16, 2014
  
  4df81053 Browse Files
- dashboard: use HumanReadableObject for Notifications · 9ffe5f16
  Őry Máté committed Jul 16, 2014
  
  9ffe5f16 Browse Files
- common: force unicode() on nonserializable objs for HROs · 82af31c5
  Őry Máté committed Jul 16, 2014
  
  82af31c5 Browse Files
15 Jul, 2014 2 commits
- common: add HumanReadableObject.__unicode__ · b37ca46b
  Őry Máté committed Jul 15, 2014
  
  b37ca46b Browse Files
- Merge branch 'feature-firewall-fixes' into 'master' · b4b966f0
```
Feature Firewall Fixes
```
  Bach Dániel committed Jul 15, 2014
  b4b966f0 Browse Files
14 Jul, 2014 9 commits
- Merge branch 'feature-base-template' into 'master' · 98449110
```
Common base template for dashboard, network, registration

Closes #191
Closes #173

Also Font Awesome 4.1 upgrade

https://miskolc.cloud.bme.hu:18525/dashboard/
```
  Kálmán Viktor committed Jul 14, 2014
  98449110 Browse Files
- vm: use HRO for result strings · 7c658a86
  Őry Máté committed Jul 14, 2014
  
  7c658a86 Browse Files
- common: allow omitting admin_text_template in create_readable · dbe6fd36
  Őry Máté committed Jul 14, 2014
  
  dbe6fd36 Browse Files
- common: show proper warnings for result compat iface · 205ea343
  Őry Máté committed Jul 14, 2014
  
  205ea343 Browse Files
- Merge branch 'master' into issue-139 · d0dc1ed8
```
Conflicts:
	circle/vm/models/activity.py
```
  Őry Máté committed Jul 14, 2014
  d0dc1ed8 Browse Files
- Merge branch 'master' into feature-base-template · 325b8bba
```
Conflicts:
	circle/dashboard/templates/dashboard/template-list.html
	circle/dashboard/templates/dashboard/vm-detail/home.html
	circle/dashboard/views.py
```
  Őry Máté committed Jul 14, 2014
  325b8bba Browse Files
- dashboard: remove trailing whitespaces · c073030c
  Őry Máté committed Jul 14, 2014
  
  c073030c Browse Files
- Merge branch 'feature-improve-docs-rebased' into 'master' · 2ca7eb56
```
Improve Docs

🚧
```
  Őry Máté committed Jul 14, 2014
  2ca7eb56 Browse Files
- vm: allow deploying in PAUSED state · f7d7d5ac
  Bach Dániel committed Jul 14, 2014
  
  f7d7d5ac Browse Files