moep
/
dynamicweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,168 Commits 11 Branches 113 Tags 314 MiB
Commit Graph

52 Commits

Author SHA1 Message Date
Modulos 130c00c8ee API Integration 
Please review carefully.
 2017-05-12 12:07:05 +02:00
Modulos 63052df6c9 Change to new OpenNebula functions 2017-05-09 05:05:58 +02:00
Modulos d0fc0144e5 Merge branch 'opennebula-integration' into vm_bill 2017-05-09 04:56:03 +02:00
Levi 9a34518457 attached opennebula vm id to virtualmachine plan 2017-05-08 21:54:12 -05:00
Levi abf6dbddce added create vm feature from a normal user in opennebula 2017-05-08 21:49:40 -05:00
Modulos 6dedf3693e Change to use OpenNebulaManager 2017-05-09 04:41:45 +02:00
Modulos 3ee075fad9 Merge branch 'opennebula-integration' into vm_bill 2017-05-09 04:04:53 +02:00
Levi bd83545653 Merge branch 'opennebula-integration' of github.com:ungleich/dynamicweb into opennebula-integration 2017-05-08 19:06:12 -05:00
Levi 7ae49d00dd added opennebula manager claass 2017-05-08 19:02:29 -05:00
Modulos 3078536bd7 Merge branch 'opennebula-integration' into vm_bill 2017-05-08 15:46:53 +02:00
M.Ravi 621376c5b4 Added functionality to create opennebula user if it does not exist 2017-05-08 16:23:03 +05:30
Modulos ae69a56ab2 Add error handling 2017-05-08 02:47:38 +02:00
Levi d72c1c810d added get vms 2017-05-07 18:57:44 -05:00
Modulos c2a76e6c39 Merge migrations and fix spacing 2017-05-07 16:09:41 +02:00
Modulos 4ab8963149 Follow fat models small views 
Based on the recommondation in 'Two scoops of Django' I moved the code
for accessing the customers vm from the view to the model.
 2017-05-07 16:07:38 +02:00
Modulos d146c25899 Merge branch 'opennebula-integration' into vm_bill 2017-05-07 06:29:29 +02:00
Levi 90307724c8 added null true to opennebula id atribute 2017-05-06 18:09:01 -05:00
Levi c9c7023c73 fixed create vm method 2017-05-06 18:04:45 -05:00
Modulos 673e8a0c79 Add total_price to HostingBill model 2017-05-06 14:44:08 +02:00
Modulos 2ff8b9e4a5 Add hosting bill view, model and urls 2017-05-05 14:59:11 +02:00
Levi ed806910e6 adding integration opennebula-hosting app 2017-05-03 23:19:32 -05:00
Levi 085133fb53 integrating hosting app with opennebula integration 2017-04-29 12:39:55 -05:00
M.Ravi cb4d96604c Manual merge of develop into opennebula-integration 2017-04-26 10:40:52 +05:30
M.Ravi 43350869e0 Reverted some files back to as they were in master. They had been reorganized. 2017-04-25 03:55:05 +05:30
M.Ravi 1e61ec965d Some more fixes for the issues of the review of rscnt. 2017-04-25 03:37:50 +05:30
M.Ravi a427fa8579 Renamed 'manage vmss' model names so that we have a nice name 2017-04-23 22:24:41 +05:30
M.Ravi b363bf5f6a First working version of opennebula-integration. 2017-03-15 17:32:55 +05:30
Levi 4352094680 Added ‘view virtual machine plan ’ permission, Added ‘delete virtual machine plan’ permission , Added ‘view hosting order’ permission 2016-07-10 22:08:51 -05:00
Levi 3e6502133e Merge branch 'develop' into feature/hosting_permission 2016-07-09 17:43:28 -05:00
Levi 0dc81fff3d Fixed duplicated post bug , Added reset password view test, Added confirm reset password view test 2016-07-04 23:44:15 -05:00
Levi a8b9e02ea5 started hosting permissions 2016-06-26 14:50:48 -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 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 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 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 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
Levi 5bdcc5d2b2 Fixed Login Error Style , Started view to generating SSH key for a VM 2016-05-20 16:41:42 -04:30
Levi e26eecf2eb 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
Levi 994b489c63 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 bf17e80df4 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 14f78893d5 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 90aca7c25c Changed hostingorder to m2m with vm plan model 2016-05-04 22:06:49 -05:00
Levi a99ea335c8 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 906df2a111 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
Levi bf334a38d4 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
Levi 5456c4c341 Created a base template for login / signup, Fixed some html design issues on login / signup pages, Added Billing Address Form to payment page, Handle Billing Address Form validation, Created VirtualMachinePlan model in order to store user purchased VM, Create method in order to create a stripe plan , Investigated about stripe payment workflows 2016-04-23 02:22:44 -05:00
Levi 4e23adcea6 Separated base hosting page into html sections, Added pricing selector to Django Page, Added pricing selector to Rails Page, Added pricing selector to NodeJS Page, Implemented hosting signup , Implemented hosting login, Created forms to handle login/signup errors 2016-04-20 01:03:32 -05:00
Levi 9694681dd2 Added serializer to VM model, Rewrite django hosting view , Created price selection templates , Added price selector with automatic price change 2016-04-19 01:04:42 -05:00
Levi 5e1419cd1c registered VM types model in the admin 2016-04-17 20:05:39 -05:00