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 |
|
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 |
|
Noe
|
beb0a8926c
|
Merge pull request #237 from ungleich/add_config
Add config
|
2017-05-13 13:48:51 +02:00 |
|
Modulos
|
752e11bcea
|
Readded hostingplans
|
2017-05-13 13:47:53 +02:00 |
|
Modulos
|
8017fbb90f
|
Work on configuration
|
2017-05-13 10:00:07 +02:00 |
|
Levi
|
d8c8804cc4
|
Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api
|
2017-05-13 00:31:33 -05:00 |
|
Levi
|
07dc04018f
|
cleaned code
|
2017-05-13 00:31:29 -05:00 |
|
Levi Velázquez
|
68c0a6cec6
|
Merge pull request #236 from ungleich/add_config
Readd configuration
|
2017-05-13 00:29:40 -05:00 |
|
Modulos
|
75d93b2aad
|
Add images as configuration
|
2017-05-13 06:59:57 +02:00 |
|
Modulos
|
c816d280ee
|
Remove opennebula_functions.py
|
2017-05-13 05:52:27 +02:00 |
|
Modulos
|
cfaf201064
|
Handle ConnectionException, add change_user_password
|
2017-05-13 05:50:56 +02:00 |
|
Noe
|
8f3125d2f7
|
Merge pull request #235 from levivm/opennebula_api
Opennebula api
|
2017-05-13 05:07:53 +02:00 |
|
Levi
|
8980f6b2fc
|
merged opnnebula api changes
|
2017-05-12 12:13:18 -05:00 |
|