|
|
dc7f78ab87
|
added Changelog
|
2017-05-25 21:22:53 +02: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 |
|
Noe Thalheim
|
1ff411e426
|
Merge branch 'develop' of https://github.com/ungleich/dynamicweb/
|
2017-05-25 18:38:58 +02:00 |
|
Noe Thalheim
|
cb73bf7b80
|
Replace lorem ipsum text
|
2017-05-25 18:37:42 +02:00 |
|
Levi Velázquez
|
505e5920c9
|
Merge pull request #278 from Modulos/pr/henry
Henry's changes
|
2017-05-25 10:16:13 -05:00 |
|
modulos
|
3027513d17
|
Remove .txt.py files
|
2017-05-25 16:55:37 +02:00 |
|
modulos
|
9a94c0f609
|
Remove .html.py files
|
2017-05-25 16:44:17 +02:00 |
|
Noe
|
8fee713ce8
|
Merge pull request #277 from Modulos/fix_redirect
Correct vm configuration flow
|
2017-05-25 16:27:34 +02: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 |
|
Noe
|
622cdbe732
|
Merge pull request #276 from Modulos/develop
Add UserHosting public key to opennebula user
|
2017-05-25 16:04:46 +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 |
|
Noe
|
8464ea400e
|
Merge pull request #275 from Modulos/develop
Use client to create vms and set ssh key correct
|
2017-05-25 00:19:57 +02:00 |
|
modulos
|
fb8dac7d00
|
Use client to create vms and set ssh key correct
|
2017-05-25 00:18:03 +02:00 |
|
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 |
|
