moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
782 commits 11 branches 113 tags 314 MiB
Commit graph

67 commits

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
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
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
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
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
0cb7645b50 #hotfix email after book vm 2016-06-05 15:49:51 -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
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
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
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
83a5a27791 fixed cdn fonts url 2016-05-24 01:27:10 -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
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
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
Tomislav R
9671ec5f05 resolve conflicts 2016-05-20 14:22:51 +02:00
Levi
768a990040 Changed offers in VM pricing, Fixed pricing error changing disk size, VM footer dead links, Added logged out message 2016-05-19 01:47:16 -04:30
Tomislav R
d3b579a41c add delete hosting order 2016-05-19 00:58:28 +02:00
Levi
cd0bbd4063 removed RailsBetaUser 2016-05-14 02:20:45 -04:30
Levi
e8e58066a0 Added test to order detail view, Added test to customer orders view, Added test to virtual machine detail view, Added test to customer booked virtual machines view 2016-05-14 02:12:42 -04:30
Levi
32d9b6719d added model mommy to requirements.txt 2016-05-12 02:11:18 -05:00
Levi
8be59499b6 Added based view test, Added billing address form test, payment view test , Added test for hetzner pricing calculation, Added test for bern pricing calculation, Fixed script to load initial pricing data 2016-05-12 01:57:34 -05:00
Levi
342512036d Added DjangoHostingView test, Added RailsHostingView test, Added, NodeJSHostingView test, Changed VMPlan model, Fixed templates to support new relationship between orders and VMplans, Merged Calendar feature with Booking 2016-05-05 01:03:35 -05:00
Levi
ca136d4e47 Merge branch 'develop' into feature/vm_pricing 2016-05-04 22:07:30 -05:00
Levi
6e8004bfd0 Changed hostingorder to m2m with vm plan model 2016-05-04 22:06:49 -05:00
Tomislav R
9f2b3a2a31 resolve merge conflicts 2016-05-04 17:36:54 +02:00
Levi
1486843af0 Added VM detail page, Added VM setting page, Added VM pricing page,Added VM orders page, Added VM status page 2016-05-04 00:16:41 -05:00
Levi
bbddb48ecc Changed redirect url after login 2016-05-03 01:06:43 -05:00
Levi
7d697b3c3a Added pagination to orders view, Created, Virtual machines booked page ,Changed logged user nabber , Added pagination to virtual machines view , Started Virtual machine detail page 2016-05-03 00:59:40 -05:00
Tomislav R
45730e4eb1 update dg payment 2016-05-01 14:13:12 +02:00
Levi
4d47564ea6 Added redirect urls after signup/login 2016-04-30 13:55:55 -05:00
Levi
3459dc6cbc Fixes digitalglarus urls, Added translated text to ungleich landing page, Create user’s order template, Created view to list all user’s orders, Adding some style to pricing template 2016-04-29 01:53:24 -05:00
Tomislav R
e0fc542673 fix merge conflict 2016-04-28 19:47:44 +02:00
Tomislav R
0fc96880ef update dg 2016-04-28 19:42:01 +02:00
Levi
e7c8258427 Handled stripe payment errors , Added invoice template, Added view to handle invoice data 2016-04-27 01:54:15 -05:00
Levi
fdf8722c8f Added Hosting Order model, Created Billing Address Model , Method to create a customer using Stripe API , Created Customer Stripe profile to store for further charges , Method in order to charge an amount to a customer 2016-04-26 01:16:03 -05:00