aatish/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
761 commits 11 branches 82 tags 313 MiB
Commit graph

761 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Tom
76c0fc092a Merge remote-tracking branch 'remotes/origin/master' into develop 2016-05-16 23:48:11 +00:00
tmslav
0162038c02 Merge pull request #71 from sgoudelis/bugfix/usermanage#2286 
Registered CustomUser model in the admin panel.
 2016-05-17 01:39:30 +02:00
Efstratios Goudelis
9658d6937a Registered CustomUser model in the admin panel. 
Related issue: https://redmine.ungleich.ch/issues/2286
 2016-05-16 16:48:26 +03:00
Nico Schottelius
d890770bcc Merge pull request #70 from sgoudelis/bugfix/blog_publish 
Fixed issue with publish flag for the Digital Glarus blog
 2016-05-16 21:58:04 +09:00
Efstratios Goudelis
8fc0ad20a6 Fixed issue with publish flag not be respected when getting blog posts for the site blog. Also for the digitalglarus blog now. 
Related issue: https://redmine.ungleich.ch/issues/2284
 2016-05-16 15:56:05 +03:00
Nico Schottelius
8d531a2995 Merge pull request #69 from sgoudelis/bugfix/blog_publish 
Fixed issue with publish flag not be respected when getting blog post…
 2016-05-16 21:39:16 +09:00
Efstratios Goudelis
9c83f29b94 Fixed issue with publish flag not be respected when getting blog posts for the site blog. 
Related issue: https://redmine.ungleich.ch/issues/2284
 2016-05-16 15:34:45 +03:00
Nico Schottelius
7c88ebe9f5 Merge branch 'master' of github.com:ungleich/dynamicweb 2016-05-14 22:30:05 +02:00
Nico Schottelius
ec3b872650 remove open calls 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2016-05-14 22:29:57 +02:00
Nico Schottelius
c37094cb35 add mindmap 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2016-05-14 22:29:33 +02:00
Levi Velázquez
b1e585026d Merge pull request #68 from levivm/develop 
removed RailsBetaUser
 2016-05-14 02:21:32 -04:30
Levi
cd0bbd4063 removed RailsBetaUser 2016-05-14 02:20:45 -04:30
Levi Velázquez
9ec6f679c4 Merge pull request #67 from levivm/develop 
Added Test to order and vms detail/list view
 2016-05-14 02:15:08 -04:30
Levi
8c71468921 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-05-14 02:12:53 -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 Velázquez
87480b6f14 Merge pull request #66 from levivm/develop 
added model mommy to requirements.txt
 2016-05-12 02:11:39 -05:00
Levi
32d9b6719d added model mommy to requirements.txt 2016-05-12 02:11:18 -05:00
Levi Velázquez
eebf7abb66 Merge pull request #65 from levivm/develop 
Added hosting view tests
 2016-05-12 02:04:59 -05:00
Levi
fbb19c55f5 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-05-12 01:58:23 -05:00