Commit Graph

209 Commits

Author SHA1 Message Date
Levi Velázquez 7773b841c9 Merge pull request #302 from levivm/master
hidden footbar on mobile devices
2017-06-02 11:12:57 -05:00
Levi cd9c8938ed hidden footbar on mobile devices 2017-06-02 11:11:04 -05:00
modulos f142bb1ce9 Move keys section underneath user name menu 2017-05-29 15:00:47 +02:00
Levi 59be6a7413 Merge branch 'master' into develop 2017-05-26 13:03:08 -05:00
M.Ravi 6a6f403704 Renamed GiB to GB in datacenterlight/pricing.html and hosting/payment.html 2017-05-26 02:47:20 +05:30
Henry Bravo 549acd400a Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2017-05-25 13:31:16 -05:00
Henry Bravo c91a61b33c Fix order columns in hosting/payment 2017-05-25 13:27:47 -05:00
Levi Velázquez 211e1be0fb Merge pull request #279 from levivm/develop
Develop
2017-05-25 13:05:48 -05:00
Levi d9d8ddc9e1 removed import pdb 2017-05-25 13:05:32 -05:00
Levi 9a93a3e315 fixed vm pricing error 2017-05-25 13:04:29 -05:00
modulos d395735219 Redirect new user to key generation view 2017-05-25 16:23:31 +02:00
modulos 4b89e71b1f Merge branch 'develop' into fix_redirect 2017-05-25 16:19:34 +02:00
modulos 35f129a4c7 Add user generated public ssh keys as well 2017-05-25 15:54:32 +02:00
modulos c6db1450a1 Correct vm configuration flow
A user now get's redirected to vm list view when pressing 'finish
configuration'
2017-05-25 12:39:23 +02:00
modulos 9753dfd2fc Add UserHosting public key to opennebula user 2017-05-25 11:27:49 +02:00
Levi 4daf6ac3ac added redirect after create vm ssh key 2017-05-24 11:09:54 -05:00
Levi ee80181a55 added redirect after create vm ssh key 2017-05-24 10:58:16 -05:00
modulos df0b4f2629 Merge branch 'develop' into order_now 2017-05-23 19:31:58 +02:00
modulos 15259e59f2 Add support for sign up redirection 2017-05-23 19:18:51 +02:00
Levi 3d03d00201 fixed ip format in virtual machine list 2017-05-23 11:52:53 -05:00
Levi 60fc2890f1 added ipv4 and ipv6 to virtualmachine list 2017-05-23 11:50:08 -05:00
Levi e278ff742d Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2017-05-23 11:48:25 -05:00
Levi 8d81220202 changed virtual machine list 2017-05-23 11:48:02 -05:00
modulos adf9b77e4e Show ipv6 address 2017-05-23 11:30:10 +02:00
modulos e782290eeb Fix NoReverseMatch for create-virtual-machine 2017-05-22 12:53:01 +02:00
Levi d71c3093e8 added price to create vm view 2017-05-21 22:49:56 -05:00
Levi cb33e6a750 added price to create vm view 2017-05-21 22:48:10 -05:00
Levi 34d596f2ba added next url to ssh create key view 2017-05-21 22:46:31 -05:00
Levi 05bf8db38a added next url to ssh create key view 2017-05-21 22:39:47 -05:00
Levi 65c6f1342b added next url to ssh create key view 2017-05-21 22:38:12 -05:00
Levi 02a2ac31c6 added next url to ssh create key view 2017-05-21 22:35:43 -05:00
Levi 3f198bb4de Fixed djangohosting, railshosting and nodehosting page. Fixed payment erro 2017-05-21 22:01:26 -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 5dd54f4219 added redirect 2017-05-20 11:06:10 -05:00
Modulos 1e2b8b1652 Add connection error handling 2017-05-14 12:22:10 +02:00
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 46b918d175 Fix price calculation 2017-05-14 02:18:10 +02:00
Levi e6ec14dfe7 Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api 2017-05-13 12:22:21 -05:00
Modulos 85d3158dbd Fix order price 2017-05-13 17:02:45 +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
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