Levi
|
3a1158cab0
|
cleaned up file createvm.js
|
2017-06-14 13:05:39 -05:00 |
|
Levi
|
1a1b05f2f8
|
fixed credit card input issu
|
2017-06-14 12:50:51 -05:00 |
|
Henry Bravo
|
be82a63b7a
|
Reduce container in ssh_key and tetextarea
|
2017-06-11 20:04:06 -05:00 |
|
Henry Bravo
|
38970e9353
|
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
|
2017-06-11 19:46:26 -05:00 |
|
Henry Bravo
|
225f92caf5
|
Change To Font Lato in VM Pages and remove messages in login
|
2017-06-11 19:46:07 -05:00 |
|
Levi
|
817f800fbd
|
fixed #3350
|
2017-06-11 11:44:14 -05:00 |
|
Henry Bravo
|
7004536a19
|
Fix conflicts
|
2017-06-09 16:18:41 -05:00 |
|
Henry Bravo
|
54b339a546
|
Staging fix and cleaned html
|
2017-06-09 15:37:14 -05:00 |
|
Levi
|
d43855adda
|
fixed #3350, #3328, #3316, #3339
|
2017-06-09 15:36:14 -05:00 |
|
Henry Bravo
|
7485c182c4
|
Redesign vm order page
|
2017-06-09 13:55:45 -05:00 |
|
Levi
|
a355ae9087
|
Merge branch 'develop' of git://github.com/HenryGBC/dynamicweb into HenryGBC-develop
|
2017-06-05 22:51:53 -05:00 |
|
Henry Bravo
|
c69694274f
|
Fix conflicts
|
2017-06-05 14:55:41 -05:00 |
|
Levi
|
484ab5f1c6
|
fixed payment when user has already a card
|
2017-06-04 17:41:48 -05:00 |
|
Levi
|
5be46db5a3
|
Merge branch 'feature/delete_ssh_key' of git://github.com/Modulos/dynamicweb into Modulos-feature/delete_ssh_key
|
2017-06-04 17:22:52 -05:00 |
|
Levi
|
8adcb75b8c
|
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
|
2017-06-04 17:08:09 -05:00 |
|
Levi
|
ab4d1cf9c9
|
Changes stripe v2 to stripe v3 and added localization support
|
2017-06-04 17:04:38 -05:00 |
|
Henry Bravo
|
ba03cf232e
|
'what is it' section text change and fixed typo
|
2017-06-03 21:57:21 -05:00 |
|
Henry Bravo
|
9b121cc702
|
improveded mobile responsiveness
|
2017-06-03 21:19:13 -05:00 |
|
Modulos
|
346733fbcd
|
Allow users to delete ssh keys
|
2017-06-03 15:03:55 +02:00 |
|
modulos
|
ab29b138c3
|
Add delete ssh key modal
|
2017-06-03 13:33:05 +02:00 |
|
modulos
|
31e9377818
|
Merge branch 'develop' into hosting_i18n
|
2017-06-03 09:59:48 +02:00 |
|
Levi
|
f2ee18deba
|
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
|
2017-06-02 11:20:30 -05:00 |
|
Levi
|
cd9c8938ed
|
hidden footbar on mobile devices
|
2017-06-02 11:11:04 -05:00 |
|
Levi Velázquez
|
1ae8a627f2
|
Merge pull request #300 from ungleich/master
Updating develop
|
2017-06-02 09:45:49 -05:00 |
|
modulos
|
715d092b96
|
Add ssh key to new vm
Create_vm now stes to public key correctly
|
2017-06-02 00:53:22 +02:00 |
|
modulos
|
ef0589f691
|
Add german translation
|
2017-06-01 23:06:29 +02:00 |
|
Henry Bravo
|
be04bee643
|
Fix center login pages
|
2017-06-01 15:40:19 -05:00 |
|
modulos
|
d229d124e9
|
Merge branch 'develop' into api/cleanup
|
2017-06-01 21:51:15 +02:00 |
|
Henry Bravo
|
024f7565df
|
Fixed details in Hosting pages and translate in login
|
2017-06-01 11:24:50 -05:00 |
|
modulos
|
37a9629408
|
Add more translations
|
2017-05-30 15:57:36 +02:00 |
|
modulos
|
9416586d0b
|
Merge branch 'develop' into hosting_i18n
|
2017-05-30 15:10:22 +02:00 |
|
Henry Bravo
|
a7c28f5644
|
Fix conflic translates
|
2017-05-29 15:05:11 -05:00 |
|
modulos
|
796a56872c
|
Add translation for CHF/Month
|
2017-05-29 18:05:21 +02:00 |
|
modulos
|
48050a2360
|
Remove .mo files and update .po files
|
2017-05-29 16:12:28 +02:00 |
|
modulos
|
40fe3f4d29
|
Merge branch 'develop' into hosting_i18n
|
2017-05-29 15:47:22 +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
|
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
|
ac28ab0d6b
|
Fix texts bugs and hosting mobile design
|
2017-05-27 10:39:30 -05:00 |
|
Levi
|
59be6a7413
|
Merge branch 'master' into develop
|
2017-05-26 13:03:08 -05: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 |
|
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 |
|