Commit graph

1335 commits

Author SHA1 Message Date
Levi
65c6f1342b added next url to ssh create key view 2017-05-21 22:38:12 -05:00
Levi Velázquez
3d05264d64 Merge pull request #254 from levivm/develop
added next url to ssh create key view
2017-05-21 22:36:26 -05:00
Levi
02a2ac31c6 added next url to ssh create key view 2017-05-21 22:35:43 -05:00
Levi Velázquez
646f73763e Merge pull request #253 from ungleich/opennebula_api
Opennebula api
2017-05-21 22:02:49 -05:00
Levi Velázquez
d5e98e34d9 Merge pull request #252 from levivm/opennebula_api
Fixed djangohosting, railshosting and nodehosting page. Fixed payment…
2017-05-21 22:02:24 -05:00
Levi
3f198bb4de Fixed djangohosting, railshosting and nodehosting page. Fixed payment erro 2017-05-21 22:01:26 -05:00
Levi Velázquez
9b3c65d28a Merge pull request #250 from ungleich/opennebula_api
Opennebula api
2017-05-20 11:40:25 -05:00
Levi Velázquez
8036ea84a1 Merge pull request #251 from levivm/opennebula_api
fixed datacenterlight page
2017-05-20 11:39:42 -05:00
Levi
1aba5cbee5 fixed datacenterlight page 2017-05-20 11:38:37 -05:00
Levi Velázquez
6c2be0202f Merge pull request #249 from levivm/opennebula_api
Opennebula api
2017-05-20 11:25:13 -05:00
Levi
3503e6568e Merge branch 'develop' into opennebula_api 2017-05-20 11:23:13 -05:00
Levi
03ec8ef674 Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api 2017-05-20 11:20:30 -05:00
Levi
ec198c74f9 fixed translations 2017-05-20 11:19:58 -05:00
Levi
5dd54f4219 added redirect 2017-05-20 11:06:10 -05:00
Levi Velázquez
8e00e55c76 Merge pull request #248 from HenryGBC/develop
Redesign DCL Page
2017-05-20 10:31:17 -05:00
verysanghee
14e87feab2 Update django.po 2017-05-20 17:11:50 +02:00
verysanghee
5cead83c89 typo 2017-05-20 17:08:24 +02:00
Henry Bravo
00101921c7 Fixed typo bugs dcl 2017-05-19 22:41:10 -05:00
Modulos
d13efd4527 Get public ip for vms
By using kamilas script we can get the ip from a vms mac address.
2017-05-19 16:39:56 +02:00
Henry Bravo
767e95895a Redesign DCL Page 2017-05-18 00:13:00 -05:00
M.Ravi
1ca884e1f6 Removed 'More info' button from datacenterlight index page. 2017-05-14 21:09:16 +05:30
Noe
39f9b3c085 Merge pull request #245 from ungleich/connection_error_open_api
open_api ConnectionRefusedError handling
2017-05-14 14:21:34 +02:00
M.Ravi
62be9ae789 Added ServiceUnvailable error handling for the case when we have no connection to OpenNebula. 2017-05-14 17:39:10 +05:30
Modulos
7cbe75014d Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api 2017-05-14 12:45:22 +02:00
Modulos
0353f72676 Try connection 2017-05-14 12:44:36 +02:00
M.Ravi
dec1ccd180 Created url for buy button on datacenterlight home page and redirection
of ^hosting/ endpoint to take to hosting app's login page.
2017-05-14 12:44:11 +02:00
Noe
8d0e69ab25 Merge pull request #244 from ungleich/connection_error
Connection error
2017-05-14 12:34:54 +02:00
Modulos
a6e6303ba0 Merge branch 'opennebula_api' into connection_error 2017-05-14 12:24:53 +02:00
Modulos
1e2b8b1652 Add connection error handling 2017-05-14 12:22:10 +02:00
M.Ravi
05e19ffb68 Created url for buy button on datacenterlight home page and redirection
of ^hosting/ endpoint to take to hosting app's login page.
2017-05-14 15:36:16 +05:30
Modulos
d7bd142387 Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api 2017-05-14 03:41:56 +02:00
Modulos
8a18c275c3 Display configuration in virtualmachine detail 2017-05-14 03:41:30 +02:00
Levi Velázquez
d031488514 Merge pull request #242 from levivm/opennebula_api
added permissions to hosting bill view
2017-05-13 20:20:02 -05:00
Levi
bcc32174b2 added permissions to hosting bill view 2017-05-13 20:19:09 -05:00
Levi Velázquez
de3fa34e7e Merge pull request #241 from levivm/opennebula_api
fixed create vm button display
2017-05-13 19:58:27 -05:00
Levi
d5749f65f1 fixed create vm button display 2017-05-13 19:57:23 -05:00
Modulos
921fa209ce Merge image into template 2017-05-14 02:18:16 +02:00
Modulos
46b918d175 Fix price calculation 2017-05-14 02:18:10 +02:00
Modulos
f80496a103 Quick fix remove cpu_cost etc. 2017-05-14 01:21:10 +02:00
Modulos
b8df86342a Add try and except for template disks
It turns out that some templates don't need a disk size if they use a
image.
2017-05-14 01:02:22 +02:00
Levi Velázquez
aa8e886745 Merge pull request #240 from levivm/opennebula_api
Opennebula api
2017-05-13 18:00:49 -05:00
Levi
9141e1211c remove pdb 2017-05-13 18:00:30 -05:00
Levi
c7b59ec762 added web-team@ungleich.ch email for error 2017-05-13 17:59:04 -05:00
Levi Velázquez
ddeb3b5575 Merge pull request #239 from levivm/opennebula_api
debugging templates
2017-05-13 17:21:50 -05:00
Levi
4f0bc72cc1 debugging templates 2017-05-13 17:21:07 -05:00
Levi Velázquez
4e07655694 Merge pull request #238 from levivm/opennebula_api
Opennebula api
2017-05-13 12:36:41 -05:00
Levi
e6ec14dfe7 Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api 2017-05-13 12:22:21 -05:00
Modulos
edab311d62 Fix memory MB to GB 2017-05-13 17:32:55 +02:00
Modulos
85d3158dbd Fix order price 2017-05-13 17:02:45 +02:00
Modulos
cee507e34f Update open_api/vms to include ssh_key and specs 2017-05-13 15:50:00 +02:00