Levi Velázquez
|
af38ce71ca
|
Merge pull request #99 from levivm/develop
changing defualt 'from email' to no-reply@ungleich.ch
|
2016-06-24 00:53:11 -05:00 |
|
Levi
|
c70c98ecc5
|
changing defualt 'from email' to no-reply@ungleich.ch
|
2016-06-24 00:53:26 -05:00 |
|
Levi
|
2ad5118688
|
changing defualt 'from email' to no-reply@ungleich.ch
|
2016-06-24 00:49:46 -05:00 |
|
Levi Velázquez
|
80dcd83777
|
Merge pull request #98 from levivm/develop
changing defualt 'from email' to no-reply@ungleich.ch
|
2016-06-24 00:49:28 -05:00 |
|
Levi
|
3526ddd9af
|
changing defualt 'from email' to no-reply@ungleich.ch
|
2016-06-24 00:45:21 -05:00 |
|
Levi Velázquez
|
5939b63dad
|
Merge pull request #97 from levivm/develop
changing defualt 'from email' to no-reply@ungleich.ch
|
2016-06-24 00:45:11 -05:00 |
|
Levi
|
ec6ced8f9e
|
adding from email for sending emails
|
2016-06-24 00:40:08 -05:00 |
|
Levi Velázquez
|
1a2a7b49df
|
Merge pull request #96 from levivm/develop
adding "from email" for sending emails
|
2016-06-24 00:40:05 -05:00 |
|
Levi
|
11bb685ea6
|
updated all email templates with the new logo img
|
2016-06-24 00:08:51 -05:00 |
|
Levi Velázquez
|
d4c9a8ed7c
|
Merge pull request #95 from levivm/develop
updated all email templates with the new logo img
|
2016-06-24 00:08:38 -05:00 |
|
Levi Velázquez
|
4b8982adb6
|
Merge pull request #94 from levivm/develop
fixing logo on emails
|
2016-06-23 23:58:47 -05:00 |
|
Levi
|
ddc2d0aa0d
|
fixing logo on emails
|
2016-06-23 23:58:02 -05:00 |
|
Levi Velázquez
|
a542de1bd8
|
Merge pull request #93 from levivm/develop
fixing logo on emails
|
2016-06-23 23:46:30 -05:00 |
|
Levi
|
03cdd3437d
|
fixing logo on emails
|
2016-06-23 23:46:25 -05:00 |
|
Levi Velázquez
|
3f467118a8
|
Merge pull request #92 from levivm/develop
changing logo on vm booking emails
|
2016-06-23 23:38:32 -05:00 |
|
Levi
|
29efff31ea
|
changing logo on vm booking emails
|
2016-06-23 23:38:32 -05:00 |
|
Levi Velázquez
|
9f6c278bf6
|
Merge pull request #91 from levivm/develop
fixing email rendering svg logo
|
2016-06-23 23:09:03 -05:00 |
|
Levi
|
6737c539bb
|
fixing email rendering svg logo
|
2016-06-23 23:08:52 -05:00 |
|
Levi Velázquez
|
f551a8fd58
|
Merge pull request #90 from levivm/develop
Create custom user, post languages, languages switcher
|
2016-06-23 21:35:18 -05:00 |
|
Levi
|
2b50f9fdd9
|
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 Velázquez
|
2d3e60666c
|
Merge pull request #89 from levivm/develop
Added migrations
|
2016-06-21 00:23:12 -05:00 |
|
Levi
|
ad035af28c
|
Added migrations
|
2016-06-21 00:22:57 -05:00 |
|
Levi Velázquez
|
05b8493fe1
|
Merge pull request #88 from levivm/develop
Develop
|
2016-06-21 00:17:55 -05:00 |
|
Levi
|
d8150b6593
|
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
|
d7fc64258a
|
Merge branch 'feature/django-mailer' into develop
|
2016-06-16 21:35:17 -05:00 |
|
Levi
|
a41b75935c
|
revert django-mailer configuration
|
2016-06-16 01:19:40 -05:00 |
|
Levi
|
6d029fdeb5
|
Added cron to send email and fixing settings error
|
2016-06-16 01:04:48 -05:00 |
|
Levi
|
72a21af789
|
changed cancel VM modal message
|
2016-06-09 23:59:05 -05:00 |
|
Levi Velázquez
|
781f55f864
|
Merge pull request #87 from levivm/develop
changed cancel VM modal message
|
2016-06-09 23:59:00 -05:00 |
|
Levi Velázquez
|
4c48621506
|
Merge pull request #86 from levivm/develop
Cancel VM Plan, receive email after status change
|
2016-06-09 23:53:09 -05:00 |
|
Levi
|
288be32c5f
|
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
|
ac382d42b9
|
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
|
82ca7da20a
|
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
|
f4d4888192
|
Merge pull request #84 from levivm/develop
#hotfix email after book vm
|
2016-06-05 15:50:21 -05:00 |
|
Levi
|
a6eba4f536
|
#hotfix email after book vm
|
2016-06-05 15:49:51 -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
|
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
|
4da733f5b1
|
Merge pull request #82 from levivm/develop
Bill user, invoice emails, design fixes.
|
2016-06-03 01:10:15 -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
|
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
|
350d09f339
|
Merge pull request #81 from levivm/develop
SSH Key, notifications and VM status.
|
2016-05-30 16:44:31 -05:00 |
|
Levi
|
a846f42bf6
|
Added mark a notification as read feature, Fixed some errors
|
2016-05-29 13:37:43 -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
|
5da39e8ed3
|
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
|
2016-05-25 01:23:47 -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
|
3893bfbfde
|
Merge pull request #80 from levivm/develop
fixed cdn fonts url
|
2016-05-24 01:27:58 -05:00 |
|
Levi
|
71f3d30549
|
fixed cdn fonts url
|
2016-05-24 01:27:10 -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
|
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
|
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 |
|