Commit graph

2039 commits

Author SHA1 Message Date
modulos
40fe3f4d29 Merge branch 'develop' into hosting_i18n 2017-05-29 15:47:22 +02:00
Noe
266d1bba18 Merge pull request #282 from Modulos/dcl_i18n
Add i18n to datacenterlight
2017-05-29 15:33:20 +02:00
modulos
1d95f87b8d Merge branch 'develop' into dcl_i18n 2017-05-29 15:25:18 +02:00
modulos
f142bb1ce9 Move keys section underneath user name menu 2017-05-29 15:00:47 +02:00
modulos
5dfb56eb6f Add more german translations 2017-05-29 14:36:05 +02:00
modulos
6937fb98f0 Merge branch 'develop' into hosting_i18n 2017-05-29 14:00:53 +02:00
Henry Bravo
aaf1dcbc7e Fix input width 2017-05-28 15:13:13 -05:00
Levi Velázquez
5a516c4c39 Merge pull request #291 from ungleich/develop
Develop
2017-05-28 15:03:56 -05:00
Levi Velázquez
760dd59e95 Merge pull request #290 from levivm/develop
Develop
2017-05-28 15:03:38 -05:00
Levi
079970852a added changelog 2017-05-28 15:03:01 -05:00
Levi
47be413298 fixed redirect link 2017-05-28 15:01:18 -05:00
Henry Bravo
67d24462ec Apply design in Signup and change password, and fixed details 2017-05-28 12:57:02 -05:00
Henry Bravo
3f0a93357f Login page design new styles 2017-05-28 00:44:36 -05:00
Henry Bravo
8d8b387cc7 Fix select languages in dcl 2017-05-27 12:49:42 -05:00
Henry Bravo
ac28ab0d6b Fix texts bugs and hosting mobile design 2017-05-27 10:39:30 -05:00
modulos
2582e31868 Remove public- from vm name 2017-05-26 23:53:05 +02:00
Levi Velázquez
3fc9d2c431 Merge pull request #287 from ungleich/develop
Develop
2017-05-26 13:06:04 -05:00
Levi Velázquez
5962c4fdb7 Merge pull request #286 from levivm/develop
Develop
2017-05-26 13:05:44 -05:00
Levi
59be6a7413 Merge branch 'master' into develop 2017-05-26 13:03:08 -05:00
Levi Velázquez
2c96db6397 Merge pull request #285 from levivm/master
added changelog for prod deploy (2017-05-26)
2017-05-26 12:49:26 -05:00
Levi
b8242b3345 added changelog for prod deploy (2017-05-26) 2017-05-26 12:48:57 -05:00
Levi Velázquez
5a45c639bd Merge pull request #281 from ungleich/change_GiB_to_GB
Changed GiB to GB in datacenterlight/pricing.html and hosting/payment…
2017-05-26 11:33:06 -05:00
Noe
3e92dc293e Merge pull request #284 from Modulos/fix/dcl_typo
Change 15 to 10 GB Storage
2017-05-26 17:15:15 +02:00
modulos
f8bbd94f8f Change 15 to 10 GB Storage 2017-05-26 17:12:37 +02:00
modulos
a044490ec3 Add i18n to hosting/order
With this commit most work for i18n of the order page is done. However
django errors, e.g. 'this field is required', aren't transalted yet.
2017-05-26 17:02:22 +02:00
modulos
5869c6dd87 Add i18n to datacenterlight
The pricing page is now fully i18n as well as the subscription modal
2017-05-26 15:53:21 +02:00
Levi Velázquez
00f9f6bb76 Merge pull request #280 from HenryGBC/develop
Fixed bugs in dcl and hosting/payment
2017-05-25 23:53:21 -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
22a876e134 Fix and add input values in calc 2017-05-25 16:16:18 -05:00
Henry Bravo
792219f6ac Fix image beta 2017-05-25 15:18:42 -05:00
879d0efb9a Merge branch 'develop' 2017-05-25 21:25:51 +02:00
4ad7d30d04 Merge remote-tracking branch 'refs/remotes/origin/master' 2017-05-25 21:25:28 +02:00
Henry Bravo
7b452740d7 fix values 2017-05-25 14:24:04 -05:00
dc7f78ab87 added Changelog 2017-05-25 21:22:53 +02:00
Henry Bravo
fbc1ab28b7 Fix minimun values calculator order widget 2017-05-25 13:40:45 -05:00
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
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