Levi
|
8adcb75b8c
|
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
|
2017-06-04 17:08:09 -05:00 |
|
Levi Velázquez
|
9f06c98554
|
Merge pull request #283 from Modulos/hosting_i18n
Add i18n to hosting/order
|
2017-06-04 17:07:17 -05:00 |
|
Levi
|
8598c540b9
|
removed pdb
|
2017-06-04 17:05:48 -05:00 |
|
Levi
|
ab4d1cf9c9
|
Changes stripe v2 to stripe v3 and added localization support
|
2017-06-04 17:04:38 -05:00 |
|
modulos
|
31e9377818
|
Merge branch 'develop' into hosting_i18n
|
2017-06-03 09:59:48 +02:00 |
|
Levi Velázquez
|
77314d04c8
|
Merge pull request #303 from levivm/develop
Develop
|
2017-06-02 11:21:25 -05:00 |
|
Levi
|
f2ee18deba
|
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
|
2017-06-02 11:20:30 -05:00 |
|
Levi
|
35d3e73a52
|
Merge branch 'master' into develop
|
2017-06-02 11:19:39 -05:00 |
|
Levi
|
cd9c8938ed
|
hidden footbar on mobile devices
|
2017-06-02 11:11:04 -05:00 |
|
Levi Velázquez
|
8d47018aae
|
Merge pull request #301 from levivm/develop
removed more info button
|
2017-06-02 10:37:24 -05:00 |
|
Levi
|
83705984d0
|
removed more info button
|
2017-06-02 10:36:17 -05:00 |
|
Levi Velázquez
|
1ae8a627f2
|
Merge pull request #300 from ungleich/master
Updating develop
|
2017-06-02 09:45:49 -05:00 |
|
Levi Velázquez
|
78773eb5c3
|
Merge pull request #298 from Modulos/api/cleanup
Api/cleanup
|
2017-06-02 09:33:24 -05:00 |
|
modulos
|
e4291083bd
|
Append changes
|
2017-06-02 00:58:48 +02: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 |
|
modulos
|
06f372e56d
|
Fix tests, add remove_public_key
The tests for VitualMachineSerializer were wrong. The manager now
contains a function to remove public keys from a user
|
2017-06-01 22:25:10 +02:00 |
|
modulos
|
d229d124e9
|
Merge branch 'develop' into api/cleanup
|
2017-06-01 21:51:15 +02:00 |
|
modulos
|
0db15d99a5
|
Add exceptions, merge for ssh key
The replace variable of the add_public_key function is now a merge
variable in order to append new keys to a user
|
2017-06-01 19:08:38 +02:00 |
|
modulos
|
88393c3da7
|
Merge branch 'develop' into hosting_i18n
|
2017-06-01 18:34:42 +02:00 |
|
modulos
|
ca63355914
|
Remove templates
In the current setup the templates views are not necessary
|
2017-06-01 17:30:53 +02:00 |
|
modulos
|
0b5cf2c057
|
Cleanup and add tests
|
2017-05-31 18:01:54 +02:00 |
|
Levi Velázquez
|
4492d6700c
|
Merge pull request #292 from Modulos/fix/ssh_key_location
Move keys section underneath user name menu
|
2017-05-30 09:26:11 -05:00 |
|
Levi Velázquez
|
3c29e68b96
|
Merge pull request #288 from Modulos/fix/vm_name
Remove public- from vm name
|
2017-05-30 09:25:52 -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 |
|
M.Ravi
|
9a7df541c5
|
Removed a bogus call to languages() method that caused no showing of the VM templates
|
2017-05-30 12:20:13 +05:30 |
|
Pcoder
|
33e37908ef
|
Merge pull request #289 from HenryGBC/develop
Fix texts bugs and hosting mobile design
|
2017-05-30 00:05:14 +02:00 |
|
Henry Bravo
|
a7c28f5644
|
Fix conflic translates
|
2017-05-29 15:05:11 -05:00 |
|
Henry Bravo
|
8207bc2dab
|
Fixed pricing page mobile
|
2017-05-29 14:54:18 -05:00 |
|
modulos
|
796a56872c
|
Add translation for CHF/Month
|
2017-05-29 18:05:21 +02:00 |
|
modulos
|
a3ea7f585b
|
Update Changelog
|
2017-05-29 16:27:44 +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 |
|
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 |
|