085133fb53
integrating hosting app with opennebula integration
2017-04-29 12:39:55 -05:00
cb4d96604c
Manual merge of develop into opennebula-integration
2017-04-26 10:40:52 +05:30
43350869e0
Reverted some files back to as they were in master. They had been reorganized.
2017-04-25 03:55:05 +05:30
1e61ec965d
Some more fixes for the issues of the review of rscnt.
2017-04-25 03:37:50 +05:30
a8952700d6
Partial fixes for issues pointed by @rscnt
...
- Moved opennebula constants to base.py
- Refactored all opennebula functions from admin.py to opennebula_functions.py
- string#format for some strings
- Renamed my_view function to show_vms
- Added logger to show logs of exceptions generated
2017-04-24 18:51:11 +02:00
d537fcb118
Manual merge of ungleich/master into opennebula-integration
2017-04-24 03:01:05 +05:30
d10285e23d
Made to use random passwords for creating opennebula users and managing their VMs.
2017-04-23 22:46:59 +05:30
a427fa8579
Renamed 'manage vmss' model names so that we have a nice name
2017-04-23 22:24:41 +05:30
354cb144f7
Added graceful handling of OpenNebula network not available
2017-04-23 22:16:13 +05:30
41d1e8b003
Merge branch 'opennebula-integration' of https://github.com/ungleich/dynamicweb into opennebula-integration
2017-04-23 21:27:32 +05:30
37dc1f1c57
Added the functionality to create opennebula user corresponding to dynamicweb user and creating and listing vms of the logged in user.
2017-04-23 21:22:50 +05:30
d3f7110c60
Update README-opennebula-integration.md
2017-04-22 10:52:19 +05:30
9645895112
Rename README-opennebula-integration to README-opennebula-integration.md
2017-04-22 10:51:35 +05:30
c8614f4f63
Added functionality to select templates for the VMs being created
2017-04-18 13:34:29 +05:30
b68fe31361
Added start/stop functionality for VMs. Refactored a few functions.
2017-04-11 00:44:55 +05:30
c7334dfac2
Merge branch 'opennebula-integration' of https://github.com/ungleich/dynamicweb into opennebula-integration
2017-04-10 13:44:24 +05:30
167e0482a9
Added Delete VM functionality.
2017-04-10 13:43:13 +05:30
cb64dd2b11
Create README-opennebula-integration
2017-03-17 01:02:03 +05:30
24cfe707cd
Listing of VMs and Creation of VMs done.
2017-03-17 00:42:27 +05:30
b363bf5f6a
First working version of opennebula-integration.
2017-03-15 17:32:55 +05:30
f56f294205
Fixed blling form goes out of background image, Fixed billing address page "amount" field seems broken, Changed authentication page fonts
...
Added new DG login.html, Fixed DG login contact footer, Added new DG login form, Added DG login, Added DG signup, Added DG reset password, Added DG confirm reset password, Added DG membership payment view
Please enter the commit message for your changes. Lines starting
2016-08-20 00:57:46 -05:00
4e07385949
Added command make_donations_charges in order to create stripe current monthly donations from all donators. Now the user can logout using navbar. Added restriction to user in order to make a donation when he has an active monthly donation . Added donations view where the user can view their recents donations. Now users receive an email after making his first donation.
2016-07-29 00:17:34 -05:00
4580a75f89
Added DonatorStatus model in order to know if an donator has canceled or not his monthly donation, Now we create a DonatorStatus for the user after receiving his first donation. Added DonatorStatus view. Added donator_status.html in order to allow an user view his donation status , Added action to allow user to cancel his monthly donations. Now the user can logout using navbar. added Donation model to admin.Added command make_donations_charges in order to create stripe current monthly donations from all donators
2016-07-27 00:08:45 -05:00
cb520f6b58
Created signup view. Added login after signup.Added signup url to nosystem app urls.py. Added logout view, Added logout button on nabber, Added password reset form, Added password view , Added password reset html, Added password reset email for nosystemd app. Added confirm_reset_password.html, Added confirm_ reset password view, Added confirm reset password form, Fixed reset password token generation, Started donation view, Added donation view, Added donation.html, Added donation form, Adding donation.js lib in order to capture stripe payments for nosystem app.
2016-07-22 01:24:32 -05:00
d7f7d498f5
Created .po translation file for login.html, signup.html, reset_password.html, confirm_reset_password.html, base_short.html, order_detail.html. Created .po translation file for orders.html, virtual_machine_detail.html, virtual_machines. created .po translation file for virtual_machine_key.html, notifications.html
2016-07-18 21:24:44 -05:00
7cd5244fdc
Added PostListViewUngleichTest, Added PostDetailViewUngleich, Converted detail ungleich post view into Class Based Django view, Added translations to ungleich landing page
2016-07-15 00:14:51 -05:00
a6ea27696a
fixed tests in order to user permissions
2016-07-10 22:42:06 -05:00
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
3e6502133e
Merge branch 'develop' into feature/hosting_permission
2016-07-09 17:43:28 -05:00
37287cf299
Added HostingPriceView test, - [ ] Added resolving url test to few views
2016-07-09 16:04:50 -05:00
b34d84657e
Added HostingUserLoginForm test, Added HostingUserSignupForm test, Added PasswordResetRequestForm Test, Added SetPasswordForm test, Created custom 404 page
2016-07-07 23:35:50 -05:00
0dc81fff3d
Fixed duplicated post bug , Added reset password view test, Added confirm reset password view test
2016-07-04 23:44:15 -05:00
e90c5fece0
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
9aa732626f
fixed hosting emails
2016-06-26 14:54:01 -05:00
a8b9e02ea5
started hosting permissions
2016-06-26 14:50:48 -05:00
11bb685ea6
updated all email templates with the new logo img
2016-06-24 00:08:51 -05:00
ddc2d0aa0d
fixing logo on emails
2016-06-23 23:58:02 -05:00
03cdd3437d
fixing logo on emails
2016-06-23 23:46:25 -05:00
29efff31ea
changing logo on vm booking emails
2016-06-23 23:38:32 -05:00
6737c539bb
fixing email rendering svg logo
2016-06-23 23:08:52 -05:00
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
ad035af28c
Added migrations
2016-06-21 00:22:57 -05:00
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
6d029fdeb5
Added cron to send email and fixing settings error
2016-06-16 01:04:48 -05:00
72a21af789
changed cancel VM modal message
2016-06-09 23:59:05 -05:00
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
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
a6eba4f536
#hotfix email after book vm
2016-06-05 15:49:51 -05:00
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
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
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
a846f42bf6
Added mark a notification as read feature, Fixed some errors
2016-05-29 13:37:43 -05:00
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
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
71f3d30549
fixed cdn fonts url
2016-05-24 01:27:10 -05:00
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
ed95a7ada4
hosting: https://redmine.ungleich.ch/issues/2292 , fixed footer
2016-05-22 17:36:28 +02:00
3beb220f90
Merge pull request #77 from tmslav/develop
...
https://redmine.ungleich.ch/issues/2290
2016-05-21 00:04:41 +02:00
f6fbf13023
https://redmine.ungleich.ch/issues/2290
2016-05-21 00:03:17 +02:00
88ee543083
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
2016-05-20 16:43:17 -04:30
5bdcc5d2b2
Fixed Login Error Style , Started view to generating SSH key for a VM
2016-05-20 16:41:42 -04:30
418c257978
delete orders
2016-05-20 15:00:06 +00:00
2a7603778a
resolve conflicts
2016-05-20 14:22:51 +02:00
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
04d8c263bf
add delete hosting order
2016-05-19 00:58:28 +02:00
c869f4ec0b
removed RailsBetaUser
2016-05-14 02:20:45 -04:30
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
2a1bcbc904
added model mommy to requirements.txt
2016-05-12 02:11:18 -05:00
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
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
bf0e152789
Merge branch 'develop' into feature/vm_pricing
2016-05-04 22:07:30 -05:00
90aca7c25c
Changed hostingorder to m2m with vm plan model
2016-05-04 22:06:49 -05:00
52ea4eec49
resolve merge conflicts
2016-05-04 17:36:54 +02:00
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
539117741e
Changed redirect url after login
2016-05-03 01:06:43 -05:00
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
65e3cdeb94
update dg payment
2016-05-01 14:13:12 +02:00
1c5fc6a437
Added redirect urls after signup/login
2016-04-30 13:55:55 -05:00
de48f1ce69
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
69f9f4a416
fix merge conflict
2016-04-28 19:47:44 +02:00
a493ad225d
update dg
2016-04-28 19:42:01 +02:00
46ab364184
Handled stripe payment errors , Added invoice template, Added view to handle invoice data
2016-04-27 01:54:15 -05:00
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
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
9fa83e6f9a
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
2016-04-22 19:58:30 -05:00
38801abed7
Added View to render payment page, Added Payment and summary forms, Added Payment.js library to request stripe token , Added jQuery validator for handling payment form errors
2016-04-22 08:36:38 -05:00
rascencio
f4fb538b9e
wqMerge remote-tracking branch 'remotes/origin/feature/vm_pricing' into develop
...
Conflicts:
dynamicweb/urls.py
2016-04-22 10:04:00 +02:00
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
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
805707e905
Added extra URLs for the hosting pages:
...
/djangohosting/
/nodehosting/
Also fixed a small typo in hosting/templates/hosting/rails.html
Related tickets:
https://redmine.ungleich.ch/issues/2225
https://redmine.ungleich.ch/issues/1620
https://redmine.ungleich.ch/issues/1621
2016-04-18 12:16:29 +03:00
5e1419cd1c
registered VM types model in the admin
2016-04-17 20:05:39 -05:00
7c891fe9c4
Fixed ungleich urls, created model for storing VM types, created command to load VM prices and data to database
2016-04-17 19:52:19 -05:00
baef7e4aa8
fixed requirements
2016-03-16 00:26:49 +01:00
rascencio
decfaa676e
dynamic year for hosting template footer
...
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-03 05:24:58 -06:00
rascencio
fd1b987bb6
hosting: fixed views function calls
2015-09-22 05:37:22 -06:00
16008512b2
Merge branch 'feature/notifybymail' into develop
2015-09-03 19:56:39 +02:00
a69ac73f5d
Add cards
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-09-03 19:56:31 +02:00
42b0acd45e
merge railshosting into hosting
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-08-27 18:33:10 +02:00
59ef61dfe8
merge from sanghee
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-08-27 18:21:15 +02:00
2bf346495e
begin refactor to /hosting/
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-08-27 18:20:08 +02:00
Levi
M.Ravi
Pcoder
Tomislav R
rascencio
Efstratios Goudelis
Nico Schottelius