sanghee/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
782 commits 10 branches 82 tags 313 MiB
Commit graph

782 commits

This branch
This branch
All branches
Author SHA1 Message Date
Levi
4dc6ab1d84 Created generic view for vm pricing widget, Added VM configuration info on VM detail view, Fixed template bugs. Fixed Blog urls bugs 2016-06-30 01:23:14 -05:00
Levi
258728e6e9 fixed hosting emails 2016-06-26 14:54:01 -05:00
Levi
38332561d3 changing defualt 'from email' to no-reply@ungleich.ch 2016-06-24 00:53:26 -05:00
Levi
b85ecd5c38 changing defualt 'from email' to no-reply@ungleich.ch 2016-06-24 00:49:46 -05:00
Levi
44cb3aef4d changing defualt 'from email' to no-reply@ungleich.ch 2016-06-24 00:45:21 -05:00
Levi
b2c0c961ef adding from email for sending emails 2016-06-24 00:40:08 -05:00
Levi
ea47d39372 updated all email templates with the new logo img 2016-06-24 00:08:51 -05:00
Levi
a60ab62831 fixing logo on emails 2016-06-23 23:58:02 -05:00
Levi
2f9dde5863 fixing logo on emails 2016-06-23 23:46:25 -05:00
Levi
1115e7bc70 changing logo on vm booking emails 2016-06-23 23:38:32 -05:00
Levi
d94a5e3e66 fixing email rendering svg logo 2016-06-23 23:08:52 -05:00
Levi
d4bdf65858 As an admin I want to be able to create a custom use. As an user I want to see listed only posts in the current selected language. As an user I want to be able to switch languages between EN-DE 2016-06-23 21:32:51 -05:00
Levi
c1db3b99ee Added migrations 2016-06-21 00:22:57 -05:00
Levi
104fc37bde Created reset password email, Added forgot password view, Added forgot password form, Added set new password form, Added set new password view, fixed signup response issue, fixed main menu ungleich button redirect to django-hosting 2016-06-21 00:10:38 -05:00
Levi
0701d35add Merge branch 'feature/django-mailer' into develop 2016-06-16 21:35:17 -05:00
Levi
e0a27ba602 revert django-mailer configuration 2016-06-16 01:19:40 -05:00
Levi
9f2c78db33 Added cron to send email and fixing settings error 2016-06-16 01:04:48 -05:00
Levi
14905db9dc changed cancel VM modal message 2016-06-09 23:59:05 -05:00
Levi Velázquez
5845ea7b9f Merge pull request #87 from levivm/develop 
changed cancel VM modal message
 2016-06-09 23:59:00 -05:00
Levi Velázquez
2d202c9a66 Merge pull request #86 from levivm/develop 
Cancel VM Plan, receive email after status change
 2016-06-09 23:53:09 -05:00
Levi
fd83ad4ffc As an user I want to be able to cancel my VM Plan subscription. As an user I want to be able to receive an email each time that my VM status changes. 2016-06-09 23:50:49 -05:00
Levi Velázquez
b76c015cec Merge pull request #85 from levivm/develop 
As an admin I can change the VM ip using admin panel ,Fixed notificat…
 2016-06-07 00:32:07 -05:00
Levi
1d83d4de79 As an admin I can change the VM ip using admin panel ,Fixed notification view count label, Fixed hosting company name on payment view, Added configuration in VM hosting page, Admin can changes the VM configuration using admin panel 2016-06-07 00:29:22 -05:00
Levi Velázquez
025343b96d Merge pull request #84 from levivm/develop 
#hotfix email after book vm
 2016-06-05 15:50:21 -05:00
Levi
0cb7645b50 #hotfix email after book vm 2016-06-05 15:49:51 -05:00
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
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 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
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
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 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
63eebbb2b0 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
081370c062 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 Velázquez
d8536dbe5a 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 Velázquez
6273144411 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
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
Tomislav R
154f6a77bf 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
Tomislav R
6eb5565537 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
419f08aff8 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
Tom
b8be9f3915 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
Tomislav R
9671ec5f05 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