Commit graph

1335 commits

Author SHA1 Message Date
Noe
7a5555fe99 Merge pull request #274 from Modulos/develop
Context fix
2017-05-24 20:47:54 +02:00
modulos
17a85e3831 Context fix
By setting the ssh key in the context section network information were
overwritten. We use updateconf now
2017-05-24 20:45:20 +02:00
Henry Bravo
6f9ca234f2 Fixed, delete files .html.py 2017-05-24 11:52:52 -05:00
Levi Velázquez
4c5cbe5bd9 Merge pull request #273 from levivm/develop
Develop
2017-05-24 11:10:30 -05: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
Henry Bravo
f2649251c2 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2017-05-23 18:32:21 -05:00
Henry Bravo
c205bb05e8 Fixed Pricing pages bugs 2017-05-23 18:32:06 -05:00
Levi Velázquez
c59fcd4b16 Merge pull request #271 from Modulos/checkbox
Disable checkbox
2017-05-23 13:31:33 -05:00
modulos
229c8b9cfc Disable checkbox 2017-05-23 20:27:26 +02:00
Levi Velázquez
f2d4e1515e Merge pull request #270 from Modulos/order_now
Order now
2017-05-23 13:12:12 -05:00
modulos
e6f2157b83 Correct pricing page redriection 2017-05-23 19:58:29 +02: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 Velázquez
08e3ac6bce Merge pull request #269 from HenryGBC/develop
Develop
2017-05-23 12:17:04 -05:00
Henry Bravo
398b7062e0 resolve conflicts 2017-05-23 12:13:44 -05:00
Henry Bravo
c383156c42 Pass params in form pricing 2017-05-23 12:06:48 -05:00
Levi Velázquez
4dc60c4b1a Merge pull request #268 from levivm/develop
fixed configuration name in vm detail
2017-05-23 11:59:46 -05:00
Levi
da3194fee3 fixed configuration name in vm detail 2017-05-23 11:58:48 -05:00
Levi Velázquez
52a67bc3a4 Merge pull request #267 from levivm/develop
fixed ip format in virtual machine list
2017-05-23 11:53:23 -05:00
Levi
3d03d00201 fixed ip format in virtual machine list 2017-05-23 11:52:53 -05:00
Levi Velázquez
9dee72a91c Merge pull request #266 from levivm/develop
Develop
2017-05-23 11:51:07 -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
Levi Velázquez
bed670c9e3 Merge pull request #261 from Modulos/public_ip
Public ip
2017-05-23 11:10:08 -05:00
Levi Velázquez
21d37ffca4 Merge pull request #263 from Modulos/beta_modal
Show modal after beta access signup
2017-05-23 11:10:01 -05:00
Levi Velázquez
194dfe5064 Merge pull request #265 from Modulos/remove_prefix
Remove 'public-' prefix
2017-05-23 11:09:56 -05:00
modulos
adf9b77e4e Show ipv6 address 2017-05-23 11:30:10 +02:00
modulos
4c8a4d0be8 Typo 2017-05-23 11:17:38 +02:00
modulos
021a8e784d Remove 'public-' prefix 2017-05-23 10:36:57 +02:00
Henry Bravo
506fbca204 Design calculator page 2017-05-22 23:35:29 -05:00
Henry Bravo
30f042cdc3 Fixed bugs style dcl 2017-05-22 13:00:27 -05:00
Noe
ba9336dd33 Merge pull request #264 from Modulos/order_now
Change buy now to order now and add link
2017-05-22 18:27:09 +02:00
modulos
88731d6371 Change buy now to order now and add link 2017-05-22 18:25:56 +02:00
modulos
920e7669dc Show modal after beta access signup
The beta access form is now in it's own html page. this makes it easier
to work with djangos form validation with reloading the whole page.
2017-05-22 18:03:33 +02:00
modulos
ccb583b20d Add vm-ipv6-nat64-ipv4 network name check 2017-05-22 13:28:14 +02:00
modulos
9d5d924c7e Merge remote-tracking branch 'upstream/develop' into public_ip 2017-05-22 12:57:12 +02:00
Noe
a2571bfad2 Merge pull request #260 from Modulos/develop
Fix NoReverseMatch for create-virtual-machine
2017-05-22 12:55:58 +02:00
modulos
e782290eeb Fix NoReverseMatch for create-virtual-machine 2017-05-22 12:53:01 +02:00
modulos
866594f3fc Merge remote-tracking branch 'upstream/develop' into public_ip 2017-05-22 12:44:44 +02:00
Levi Velázquez
54c7234dbe Merge pull request #259 from levivm/develop
added price to create vm view
2017-05-21 22:50:21 -05:00
Levi
d71c3093e8 added price to create vm view 2017-05-21 22:49:56 -05:00
Levi Velázquez
e818a53bbe Merge pull request #258 from levivm/develop
added price to create vm view
2017-05-21 22:48:38 -05:00
Levi
cb33e6a750 added price to create vm view 2017-05-21 22:48:10 -05:00
Levi Velázquez
ffc4700faf Merge pull request #257 from levivm/develop
added next url to ssh create key view
2017-05-21 22:47:07 -05:00
Levi
34d596f2ba added next url to ssh create key view 2017-05-21 22:46:31 -05:00
Levi Velázquez
f73ed7fad7 Merge pull request #256 from levivm/develop
added next url to ssh create key view
2017-05-21 22:40:19 -05:00
Levi
05bf8db38a added next url to ssh create key view 2017-05-21 22:39:47 -05:00
Levi Velázquez
8f310c1ceb Merge pull request #255 from levivm/develop
added next url to ssh create key view
2017-05-21 22:38:38 -05:00