Levi Velázquez
|
f5cbeb8e91
|
Merge pull request #83 from levivm/develop
Fixed style errors, login redirect, fixed hosting tests.
|
2016-06-04 03:02:27 -05:00 |
|
Levi Velázquez
|
5e634406ed
|
Merge pull request #83 from levivm/develop
Fixed style errors, login redirect, fixed hosting tests.
|
2016-06-04 03:02:27 -05:00 |
|
Levi
|
adde97bea3
|
Fixed login/signup page background.Fixed payment input fields.Added login button on hosting page. Fixed hosting tests. Redirect to notifications page if an logged user try to login again.
|
2016-06-04 02:59:37 -05:00 |
|
Levi
|
cca3a23263
|
Fixed login/signup page background.Fixed payment input fields.Added login button on hosting page. Fixed hosting tests. Redirect to notifications page if an logged user try to login again.
|
2016-06-04 02:59:37 -05:00 |
|
Levi Velázquez
|
13233d19c7
|
Merge pull request #82 from levivm/develop
Bill user, invoice emails, design fixes.
|
2016-06-03 01:10:15 -05:00 |
|
Levi Velázquez
|
4da733f5b1
|
Merge pull request #82 from levivm/develop
Bill user, invoice emails, design fixes.
|
2016-06-03 01:10:15 -05:00 |
|
Levi
|
8c304dedb9
|
Fixed login error message change. Changed signup page background image. Changed login page background image. Changed djangohosting card image. Changed pricing font. Fixed pricing alignment. Fixed selector price
|
2016-06-03 00:59:46 -05:00 |
|
Levi
|
18c7691d92
|
Fixed login error message change. Changed signup page background image. Changed login page background image. Changed djangohosting card image. Changed pricing font. Fixed pricing alignment. Fixed selector price
|
2016-06-03 00:59:46 -05:00 |
|
Levi
|
a72c1446b4
|
Created custom “add order view” to admin panel, Added vm name and user email to orders list admin view , Started function to charge an user for his VM subscription from the admin panel, Created template for email after charge an user for his virtual machine plan, Handle errors creating an order in the admin panel, Now an email is sent to the user after charge him for his virtual machine plan
|
2016-06-03 00:07:47 -05:00 |
|
Levi
|
d472d37fab
|
Created custom “add order view” to admin panel, Added vm name and user email to orders list admin view , Started function to charge an user for his VM subscription from the admin panel, Created template for email after charge an user for his virtual machine plan, Handle errors creating an order in the admin panel, Now an email is sent to the user after charge him for his virtual machine plan
|
2016-06-03 00:07:47 -05:00 |
|
Levi Velázquez
|
c03ff34aec
|
Merge pull request #81 from levivm/develop
SSH Key, notifications and VM status.
|
2016-05-30 16:44:31 -05:00 |
|
Levi Velázquez
|
350d09f339
|
Merge pull request #81 from levivm/develop
SSH Key, notifications and VM status.
|
2016-05-30 16:44:31 -05:00 |
|
Levi
|
63eebbb2b0
|
Added mark a notification as read feature, Fixed some errors
|
2016-05-29 13:37:43 -05:00 |
|
Levi
|
a846f42bf6
|
Added mark a notification as read feature, Fixed some errors
|
2016-05-29 13:37:43 -05:00 |
|
Levi
|
7a9ea58a89
|
Added status field to a booked VM. Added the capability to change a booked VM status from the admin panel. Send email to user after his VM is approved
|
2016-05-27 00:51:10 -05:00 |
|
Levi
|
c33c4f4148
|
Added status field to a booked VM. Added the capability to change a booked VM status from the admin panel. Send email to user after his VM is approved
|
2016-05-27 00:51:10 -05:00 |
|
Levi
|
081370c062
|
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
|
2016-05-25 01:23:47 -05:00 |
|
Levi
|
5da39e8ed3
|
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
|
2016-05-25 01:23:47 -05:00 |
|
Levi
|
02e716106e
|
Created BaseEmail class , Now we are sending email to info@ungleich.com after an user book a VM, Fixed pricing issue, Now Admin can changed data about a booked VM
|
2016-05-25 01:23:32 -05:00 |
|
Levi
|
b443d4d21e
|
Created BaseEmail class , Now we are sending email to info@ungleich.com after an user book a VM, Fixed pricing issue, Now Admin can changed data about a booked VM
|
2016-05-25 01:23:32 -05:00 |
|
Levi Velázquez
|
d8536dbe5a
|
Merge pull request #80 from levivm/develop
fixed cdn fonts url
|
2016-05-24 01:27:58 -05:00 |
|
Levi Velázquez
|
3893bfbfde
|
Merge pull request #80 from levivm/develop
fixed cdn fonts url
|
2016-05-24 01:27:58 -05:00 |
|
Levi
|
83a5a27791
|
fixed cdn fonts url
|
2016-05-24 01:27:10 -05:00 |
|
Levi
|
71f3d30549
|
fixed cdn fonts url
|
2016-05-24 01:27:10 -05:00 |
|
Levi Velázquez
|
6273144411
|
Merge pull request #79 from levivm/develop
Finished SSH Key generation
|
2016-05-24 01:22:36 -05:00 |
|
Levi Velázquez
|
38b2a5b3d6
|
Merge pull request #79 from levivm/develop
Finished SSH Key generation
|
2016-05-24 01:22:36 -05:00 |
|
Levi
|
b4164e56ab
|
Added next button in order detail view after the user make a payment, Avoid to regenerate SSH Key if the user refresh the page, Now the key is served to download from javascript , Added public_key attribute to VirtualVMPlan in order to store keys created by the user, Now private key has PEM format and public has OpenSSH
|
2016-05-24 01:19:49 -05:00 |
|
Levi
|
8376d0106c
|
Added next button in order detail view after the user make a payment, Avoid to regenerate SSH Key if the user refresh the page, Now the key is served to download from javascript , Added public_key attribute to VirtualVMPlan in order to store keys created by the user, Now private key has PEM format and public has OpenSSH
|
2016-05-24 01:19:49 -05:00 |
|
tmslav
|
35e312411f
|
Merge pull request #78 from tmslav/develop
hosting: https://redmine.ungleich.ch/issues/2292, fixed footer
|
2016-05-22 17:37:44 +02:00 |
|
tmslav
|
d160344130
|
Merge pull request #78 from tmslav/develop
hosting: https://redmine.ungleich.ch/issues/2292, fixed footer
|
2016-05-22 17:37:44 +02:00 |
|
Tomislav R
|
154f6a77bf
|
hosting: https://redmine.ungleich.ch/issues/2292, fixed footer
|
2016-05-22 17:36:28 +02:00 |
|
Tomislav R
|
ed95a7ada4
|
hosting: https://redmine.ungleich.ch/issues/2292, fixed footer
|
2016-05-22 17:36:28 +02:00 |
|
tmslav
|
a06199448f
|
Merge pull request #77 from tmslav/develop
https://redmine.ungleich.ch/issues/2290
|
2016-05-21 00:04:41 +02:00 |
|
tmslav
|
3beb220f90
|
Merge pull request #77 from tmslav/develop
https://redmine.ungleich.ch/issues/2290
|
2016-05-21 00:04:41 +02:00 |
|
Tomislav R
|
6eb5565537
|
https://redmine.ungleich.ch/issues/2290
|
2016-05-21 00:03:17 +02:00 |
|
Tomislav R
|
f6fbf13023
|
https://redmine.ungleich.ch/issues/2290
|
2016-05-21 00:03:17 +02:00 |
|
Levi Velázquez
|
784ed0976b
|
Merge pull request #76 from levivm/develop
Develop
|
2016-05-20 16:43:48 -04:30 |
|
Levi Velázquez
|
b4bd728e35
|
Merge pull request #76 from levivm/develop
Develop
|
2016-05-20 16:43:48 -04:30 |
|
Levi
|
419f08aff8
|
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
|
2016-05-20 16:43:17 -04:30 |
|
Levi
|
88ee543083
|
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
|
2016-05-20 16:43:17 -04:30 |
|
Levi
|
d4a44b2b6c
|
Fixed Login Error Style , Started view to generating SSH key for a VM
|
2016-05-20 16:41:42 -04:30 |
|
Levi
|
5bdcc5d2b2
|
Fixed Login Error Style , Started view to generating SSH key for a VM
|
2016-05-20 16:41:42 -04:30 |
|
Tom
|
b8be9f3915
|
delete orders
|
2016-05-20 15:00:06 +00:00 |
|
Tom
|
418c257978
|
delete orders
|
2016-05-20 15:00:06 +00:00 |
|
tmslav
|
bb13644b06
|
Merge pull request #74 from tmslav/cancel_plans
Cancel plans
|
2016-05-20 14:23:43 +02:00 |
|
tmslav
|
aa4782607d
|
Merge pull request #74 from tmslav/cancel_plans
Cancel plans
|
2016-05-20 14:23:43 +02:00 |
|
Tomislav R
|
9671ec5f05
|
resolve conflicts
|
2016-05-20 14:22:51 +02:00 |
|
Tomislav R
|
2a7603778a
|
resolve conflicts
|
2016-05-20 14:22:51 +02:00 |
|
Levi Velázquez
|
b4fef1e296
|
Merge pull request #73 from levivm/develop
Changed offers in VM pricing, Fixed pricing error changing disk size,…
|
2016-05-19 01:51:25 -04:30 |
|
Levi Velázquez
|
f1b1faa631
|
Merge pull request #73 from levivm/develop
Changed offers in VM pricing, Fixed pricing error changing disk size,…
|
2016-05-19 01:51:25 -04:30 |
|