cloud:5afb91498265af52c1b5b5e1985fae4c7ef89353 commitshttps://git.ik.bme.hu/circle/cloud/commits/5afb91498265af52c1b5b5e1985fae4c7ef893532014-07-20T10:42:25+02:00https://git.ik.bme.hu/circle/cloud/commit/5afb91498265af52c1b5b5e1985fae4c7ef89353Merge branch 'master' into feature-hot-plug2014-07-20T10:42:25+02:00Őry Mátéory.mate@cloud.bme.hu
Conflicts:
 circle/vm/operations.pyhttps://git.ik.bme.hu/circle/cloud/commit/fe84d9e6b4d7e9d6c7d683e61f6aa45d09dde5eedashboard: fix VmResourcesChangeView2014-07-19T11:58:00+02:00Bach Dánielbd@ik.bme.huhttps://git.ik.bme.hu/circle/cloud/commit/fda830b485991651ced89a12d552291652164572circle: fix password reset url2014-07-19T11:56:49+02:00Bach Dánielbd@ik.bme.huhttps://git.ik.bme.hu/circle/cloud/commit/48d55f626ed6e6fc6c0b42bf583433a68ea1b1ba Merge branch 'issue-196' into 'master'2014-07-19T11:12:17+02:00Bach Dánielbach.daniel@cloud.bme.hu
Issue 196https://git.ik.bme.hu/circle/cloud/commit/f1075d528b6e6b46636016970c2a4ebaaf339046 Merge branch 'issue-198' into 'master'2014-07-19T11:11:41+02:00Bach Dánielbach.daniel@cloud.bme.hu
Issue 198https://git.ik.bme.hu/circle/cloud/commit/4e00628c2fa67a3c338e691d35d8a7eb60073e5cdashboard: show success messages in alert-success instead of danger2014-07-19T10:48:53+02:00Bach Dánielbd@ik.bme.hu
fixes <a href="/circle/cloud/issues/198" data-original="#198" data-link="false" data-project="11" data-issue="229" data-reference-type="issue" data-container="body" data-placement="bottom" title="operation success messages are shown in alert-danger" class="gfm gfm-issue has-tooltip">#198</a>https://git.ik.bme.hu/circle/cloud/commit/9703cb54e59f50acb08e3a3360a6f9a613fa69e7dashboard: fix fix of renew2014-07-19T10:41:24+02:00Őry Mátéory.mate@cloud.bme.huhttps://git.ik.bme.hu/circle/cloud/commit/9977cf867d70a158dc81d0b037505bad2dec5acbdashboard: use queryset for renew choices2014-07-19T10:35:27+02:00Őry Mátéory.mate@cloud.bme.hu
fixes <a href="/circle/cloud/issues/196" data-original="#196" data-link="false" data-project="11" data-issue="227" data-reference-type="issue" data-container="body" data-placement="bottom" title="Renew doesnt work if user has no direct access to lease" class="gfm gfm-issue has-tooltip">#196</a>https://git.ik.bme.hu/circle/cloud/commit/409e00696779f397193a855b925185ea3217c988 Merge branch 'issue-139' into 'master'2014-07-19T00:30:09+02:00Őry Mátéory.mate@cloud.bme.hu
Make activities translatable/human readable

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

fixes <a href="/circle/cloud/issues/139" data-original="#139" data-link="false" data-project="11" data-issue="155" data-reference-type="issue" data-container="body" data-placement="bottom" title="Make activities translatable/human readable" class="gfm gfm-issue has-tooltip">#139</a>, <a href="/circle/cloud/issues/187" data-original="#187" data-link="false" data-project="11" data-issue="217" data-reference-type="issue" data-container="body" data-placement="bottom" title="Missing (user)name in notification" class="gfm gfm-issue has-tooltip">#187</a>https://git.ik.bme.hu/circle/cloud/commit/8d77978d0e93cd3aafe961e6edea932658984b35*: add missing readable_names2014-07-19T00:27:01+02:00Őry Mátéory.mate@cloud.bme.huhttps://git.ik.bme.hu/circle/cloud/commit/5432a55031d0f79cf52f762be3d1c1c18dc583cadashboard: fix mocked tests2014-07-18T23:56:13+02:00Őry Mátéory.mate@cloud.bme.huhttps://git.ik.bme.hu/circle/cloud/commit/8ef3f54f329d1f781f622afaea7a1392634d481bcommon: don't try to translate empty string2014-07-18T23:39:52+02:00Őry Mátéory.mate@cloud.bme.hu
_("") is the metadata of the translationhttps://git.ik.bme.hu/circle/cloud/commit/095b49ad8b13a1435e3360fb1e89fa9d7cdd58b3vm: fix notifications2014-07-18T23:29:44+02:00Őry Mátéory.mate@cloud.bme.huhttps://git.ik.bme.hu/circle/cloud/commit/4c85c0e6949e2747d5d03106e43ad0e6a8e612cfdashboard: show unhandled HumanReadableExceptions on http500 page2014-07-18T23:15:18+02:00Őry Mátéory.mate@cloud.bme.huhttps://git.ik.bme.hu/circle/cloud/commit/2562ea1f5a695798b0bc93736b2c68ff9387dc0dvm: add missing disk.save() to CreateDiskOperation2014-07-18T11:31:48+02:00Bach Dánielbd@ik.bme.huhttps://git.ik.bme.hu/circle/cloud/commit/79712693a5ec6de5828e64aab7f56ff217da37cecommon: add HumanReadableException and humanize_exception2014-07-18T10:49:29+02:00Őry Mátéory.mate@cloud.bme.huhttps://git.ik.bme.hu/circle/cloud/commit/bf391e078f65002995e4f9e5ecb0dbeb063c9f07common: add HumanReadableObject.set()2014-07-18T10:49:08+02:00Őry Mátéory.mate@cloud.bme.huhttps://git.ik.bme.hu/circle/cloud/commit/bbc9a44c58426bae7be7c107b9e4d428558b9760 Merge branch 'feature-session-cookie' into 'master'2014-07-17T14:58:09+02:00Őry Mátéory.mate@cloud.bme.hu
Feature Session Cookiehttps://git.ik.bme.hu/circle/cloud/commit/4ef135b137ed7bec1ca1bd0db1bc3791b00333cecircle: set unique session cookie name for different hosts2014-07-17T14:17:19+02:00Őry Mátéory.mate@cloud.bme.hu
cookies of devenvs with the same domain (eg forwarded to different ports)
collide otherwisehttps://git.ik.bme.hu/circle/cloud/commit/3f60bd7364f3a2054453a10384261170c064cb4avm: fix tests2014-07-17T10:09:29+02:00Őry Mátéory.mate@cloud.bme.hu
MagicMock.__init__'s name parameter doesnt set the name attribute.https://git.ik.bme.hu/circle/cloud/commit/3c6a1b3ef76e2ab85eb237a4ee0459429344619evm: fix tests2014-07-17T01:08:14+02:00Őry Mátéory.mate@cloud.bme.huhttps://git.ik.bme.hu/circle/cloud/commit/74c3886a2490e177458522eb33e06b5074f6fa3evm: use activity name interface2014-07-17T01:07:38+02:00Őry Mátéory.mate@cloud.bme.huhttps://git.ik.bme.hu/circle/cloud/commit/742d5f7fc49b813f8b4249cfd0854c5bf3300e53dashboard: fix node timeline icons2014-07-17T01:06:59+02:00Őry Mátéory.mate@cloud.bme.huhttps://git.ik.bme.hu/circle/cloud/commit/87dd7bb1c4d2fa913c895a872b4e3d41950682a4vm: fix migrations to preserve activity details2014-07-16T16:14:40+02:00Őry Mátéory.mate@cloud.bme.huhttps://git.ik.bme.hu/circle/cloud/commit/4780b59cf3d177620d444d0ddfadb1c1e30283c0dashboard: allow showing activity details for everyone2014-07-16T16:13:37+02:00Őry Mátéory.mate@cloud.bme.huhttps://git.ik.bme.hu/circle/cloud/commit/66ddb1a945d16cd0de472c2223c81d002f4ea737vm: add readable name to activities2014-07-16T16:12:58+02:00Őry Mátéory.mate@cloud.bme.huhttps://git.ik.bme.hu/circle/cloud/commit/96f1d71c6dd25ce65378dfbce27b2ed0009e2c42Merge branch 'master' into issue-1392014-07-16T15:47:13+02:00Őry Mátéory.mate@cloud.bme.hu
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.htmlhttps://git.ik.bme.hu/circle/cloud/commit/66805404aa6a0c3bb63af6afb76326c46de76e9ddashboard: update notification view2014-07-16T12:14:16+02:00Őry Mátéory.mate@cloud.bme.huhttps://git.ik.bme.hu/circle/cloud/commit/55773d3cd5f11a735ae7a8dcc7a158397697ff04dashboard: fix migration2014-07-16T12:03:27+02:00Őry Mátéory.mate@cloud.bme.hu
datamigration made var substituion fail if original rendered text contained
percent char. now these are escapedhttps://git.ik.bme.hu/circle/cloud/commit/4df8105328d566d725bb88e14acf9d9c72cf129adashboard: use new notify method2014-07-16T09:51:46+02:00Őry Mátéory.mate@cloud.bme.huhttps://git.ik.bme.hu/circle/cloud/commit/9ffe5f168d070b23705bb8ee088c1f3192b79abcdashboard: use HumanReadableObject for Notifications2014-07-16T09:50:57+02:00Őry Mátéory.mate@cloud.bme.huhttps://git.ik.bme.hu/circle/cloud/commit/82af31c5fa5a24713f98a4339ab5eba3d418371fcommon: force unicode() on nonserializable objs for HROs2014-07-16T09:49:11+02:00Őry Mátéory.mate@cloud.bme.huhttps://git.ik.bme.hu/circle/cloud/commit/b9bd76528a47f4d00a2a9f584625e4528ec4aaefdashboard: fix tests2014-07-15T17:38:51+02:00Bach Dánielbd@ik.bme.huhttps://git.ik.bme.hu/circle/cloud/commit/76da686079090e9c803f94722cb80cb2ceab767coperations: added subactivity for network attach/detach2014-07-15T17:10:27+02:00Guba Sándorguba.sandor@cloud.bme.huhttps://git.ik.bme.hu/circle/cloud/commit/b37ca46bccedaf8ade5c9a10171506df896d974ecommon: add HumanReadableObject.__unicode__2014-07-15T15:19:17+02:00Őry Mátéory.mate@cloud.bme.huhttps://git.ik.bme.hu/circle/cloud/commit/9e60b9b7ab0da97963fa4995a64099d906e1443boperations: added missing preconditions2014-07-15T15:01:29+02:00Guba Sándorguba.sandor@cloud.bme.huhttps://git.ik.bme.hu/circle/cloud/commit/cbcf6f97fe32b8472d7998b85e3e1c8025e863aeimplemented hot-attach functions2014-07-15T14:44:09+02:00Guba Sándorguba.sandor@cloud.bme.huhttps://git.ik.bme.hu/circle/cloud/commit/e5780f5a1e5b0bedaa86131ce02716452d2a3381added attach / detach functions2014-07-15T14:42:07+02:00Guba Sándorguba.sandor@cloud.bme.huhttps://git.ik.bme.hu/circle/cloud/commit/2fc1d0c14a6a49c80ecfed88524fbd0b265cdf4badded bus parameter to disk2014-07-15T14:34:43+02:00Guba Sándorguba.sandor@cloud.bme.huhttps://git.ik.bme.hu/circle/cloud/commit/9bbb5288d8c6c6757ce2de068e98a0ec25a03920added attach/detach tasks2014-07-15T14:33:59+02:00Guba Sándorguba.sandor@cloud.bme.hu