ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity
4058 commits 13 branches 148 tags 315 MiB
Commit graph

370 commits

Author SHA1 Message Date
PCoder
612e11736e Corrected obtaining values from vm_data dict 2017-09-13 05:37:26 +05:30
PCoder
f94ed011e5 Remove keys from known_hosts on delete of a vm 2017-09-13 05:30:05 +05:30
PCoder
1836d315cd Added query param to distinguish confirm order from invoice 2017-09-10 12:22:32 +05:30
PCoder
b1589e9c68 Reorganized imports hosting/views.py 2017-09-09 21:41:20 +05:30
PCoder
c1a8689199 Merged upstream master into task/3772/hosting_billing_monthly_subscription 2017-09-09 21:40:37 +05:30
PCoder
d96d2907bc Passing pass as parameter to celery task 2017-09-09 20:46:43 +05:30
PCoder
1a43f4f810 Merged upstream master into task/3731/cdist_ssh_key_handler 2017-09-09 20:30:50 +05:30
M.Ravi
e135bc9e8c hosting: Overriden get_object method in OrderHostingDetail and cleared 
session on completion of creation of VM
 2017-09-09 13:27:17 +02:00
M.Ravi
c8baf3d4c1 Implemented post method for hosting OrderDetailView 2017-09-09 12:06:29 +02:00
PCoder
f9abdfe1bc Merged upstream master into task/3731/cdist_ssh_key_handler 2017-09-09 13:44:46 +05:30
PCoder
1d5f92f7e1 Getting VM name for serializer data, hence fixing the problem of public- appearing in VM cancellation email 2017-09-09 12:12:56 +05:30
PCoder
e9b5e052ac Merged upstream master into task/3484/email_refactoring 2017-09-09 11:38:57 +05:30
Arvind Tiwari
d5c0fef965 Merge pull request #483 from tiwariav/task/3775/hosting_default_page 
Task/3775 hosting/dashboard as default page
 2017-09-08 02:03:08 +05:30
Arvind Tiwari
e26b6ac416 default page for hosting changed from /hosting/my-virtual-machines -> /hosting/dashboard 2017-09-07 22:24:03 +05:30
M.Ravi
0fc0b0630c hosting: Updated OrdersHostingDetailView for stripe charging in this view 2017-09-06 23:52:02 +02:00
PCoder
2a9b208719 hosting: Moving the stripe charge to order confirmation page (still incomplete) 2017-09-06 13:25:18 +05:30
PCoder
f84b95e385 Added some translations 2017-09-04 22:27:59 +05:30
M.Ravi
43e4c021a7 Removed order id from cancel vm email templates 2017-09-03 17:13:49 +02:00
M.Ravi
a32c8ea467 Corrected VM cancellation email templates 2017-09-03 13:20:30 +02:00
PCoder
f041a4047d Started with VM cancellation template 2017-09-03 02:33:05 +05:30
M.Ravi
8f2655bda2 Getting vm name properly in hosting views 2017-09-02 21:35:57 +02:00
M.Ravi
50431542f8 Corrected getting VM name in template 2017-09-02 20:42:58 +02:00
PCoder
b5120040d3 Fixed an error and from address in new vm email template 2017-09-02 22:47:31 +05:30
PCoder
e38df305c4 New VM email template updated 2017-09-02 22:08:25 +05:30
PCoder
7d12eff9be Added translations and reformatted code 2017-09-02 16:50:09 +05:30
M.Ravi
5a46cea307 Added functionality to add keys on creating a new vm 2017-08-31 18:20:02 +02:00
Arvind Tiwari
a07922e4d4 style and translations fix 2017-08-31 15:54:01 +05:30
PCoder
46642d816a Merged master into task/3731/cdist_ssh_key_handler 2017-08-31 01:09:12 +05:30
Arvind Tiwari
43ceea948e merged master 2017-08-30 19:38:19 +05:30
M.Ravi
51b1ee2013 Added call to manage_public_key task when generating dcl generated keys 
and reorganized imports
 2017-08-30 12:02:53 +02:00
M.Ravi
92e47b6f90 Added manage_public_key when deleting a key (However, this does not seem to work in cdist) 2017-08-30 09:42:56 +02:00
M.Ravi
34580b6514 Refactored saving public key functionality to opennebula_api.models.save_public_key. Also, now creating hosting VMs loaded by default with ONEADMIN_USER_SSH_PUBLIC_KEY 2017-08-29 17:53:25 +02:00
Arvind Tiwari
ce1d346bc1 billing form in settings page 2017-08-29 17:42:35 +05:30
PCoder
12255364b2 Attempted to get hosts for adding ssh keys (to be tested) 2017-08-29 13:31:05 +05:30
Arvind Tiwari
daa50d4672 settings page design 2017-08-24 22:11:15 +05:30
Arvind Tiwari
c87e2cd36b hosting settings url, view and template added 2017-08-24 20:28:02 +05:30
Arvind Tiwari
23bf602a16 merged master, fixed translation 2017-08-24 20:16:26 +05:30
Pcoder
a77b7b0ab5 Merge pull request #460 from pcoder/add_test_create_vm_celery_task 
Added test for create vm celery task
 2017-08-23 23:24:49 +02:00
PCoder
6484684ac5 Removed unncessary check for error for make_charge 2017-08-24 02:29:24 +05:30
Arvind Tiwari
6890c82122 dashboard url, view,template and css added 2017-08-22 20:45:18 +05:30
Arvind Tiwari
653b3654b8 merged master 2017-08-20 22:04:48 +05:30
Arvind Tiwari
de481e8114 invoice link fixed 2017-08-19 02:32:37 +05:30
Arvind Tiwari
377f82319d buttons made to work 2017-08-19 02:21:34 +05:30
Pcoder
a80b0668a2 Merge pull request #432 from siarheipuhach/feature/task3637 
task/3637/Added stripe failed payment error handler
 2017-08-17 20:50:18 +02:00
Siarhei Puhach
72ddfd96ab Payment error was unified 2017-08-07 17:23:58 +03:00
Siarhei Puhach
a71ccbc566 Added error hash in url, added payment error handler to hosting/views 2017-08-07 17:02:47 +03:00
M.Ravi
d85afd56e0 Fixed an issue 
- Changed owner -> user
   - Reformatted code
 2017-08-04 17:49:55 +02:00
PCoder
c6b23f6aa0 Added get_object method to verify if the user is the owner of the ssh key 2017-08-04 20:54:28 +05:30
Pcoder
5b8e73984e Merge pull request #425 from pcoder/bug/3623/hosting_my_orders_header_fix 
Bug/3623/hosting my orders header fix
 2017-08-03 23:38:22 +02:00
M.Ravi
8ec692e51b Reformatted code 2017-07-30 18:03:16 +02:00
PCoder
4883294acf Added condition to show Confirm Order only when ordering a VM, and Invoice when order details page 2017-07-30 20:41:11 +05:30
ARvind Tiwari
925252f1c9 merged master 2017-07-28 16:45:34 +05:30
ARvind Tiwari
c6a3928638 decoding error fixed 2017-07-27 19:45:55 +05:30
ARvind Tiwari
4216d9911a add ssh key form input shadows removed 2017-07-26 16:45:49 +05:30
PCoder
97acd76b51 Added card holders name for initialization 2017-07-16 22:33:52 +05:30
Siarhei Puhach
062ca69d9d Update views.py 2017-07-12 08:21:43 +03:00
Siarhei Puhach
1279d4efbb Merge branch 'master' into feature/ssh_keys 2017-07-07 17:49:22 +03:00
PCoder
cfc1210a9a We probably need creating HostingBill 2017-07-07 00:12:29 +05:30
Siarhei Puhach
d2d96e9951 Added private_key field to UserHostingkey model, some html updates 2017-07-06 14:18:22 +03:00
Siarhei Puhach
8986aa6550 Added generation button with no field input required (generate ssh key name) 2017-07-06 11:47:12 +03:00
Siarhei Puhach
7cc70a95ac Added new page(Choice ssh key generate/upload), changed design of generate ssh form 2017-07-05 16:57:49 +03:00
siarheipuhach
a9c9f74aed Fixed PEP8 violations 2017-06-29 19:23:25 +03:00
Siarhei Puhach
fcc109b8f5 Merge branch 'master' into feature/flake8 2017-06-29 18:56:50 +03:00
Siarhei Puhach
edcfd3e9f4 Added Flake8 lib and fixed PEP8 violations 2017-06-29 17:34:40 +03:00
M.Ravi
0a6275bcef Merge branch 'master' into task/3379/text_style_activation 2017-06-19 12:37:09 +05:30
M.Ravi
ab50e58a72 Updated signup and email confirmation views to work with translation 2017-06-17 19:38:43 +05:30
M.Ravi
bf99bd5edb Fixed redirecting user to list vm page, if he requests for details of a vm whose id does not belong to him 2017-06-17 14:46:11 +05:30
Levi Velázquez
5271591cf3 Merge pull request #324 from pcoder/feature/3296/confirm_emails 
Feature/3296/confirm emails
 2017-06-15 15:22:00 -05:00
Pcoder
ebaadb4d07 Merge pull request #330 from pcoder/bug/3313/pwd_reset_email_from_dcl_support 
Bug/3313/pwd reset email from dcl support
 2017-06-15 21:04:03 +02:00
Levi Velázquez
657e93862d Merge branch 'master' into bug/3313/pwd_reset_email_from_dcl_support 2017-06-15 01:17:14 -05:00
M.Ravi
5b4e9b733d Tentative fix for error 500 on order details page 2017-06-15 07:30:47 +05:30
M.Ravi
a2a3cc1f5a Small code formatting 2017-06-12 20:51:48 +05:30
M.Ravi
d84496b0de Added 'site' parameter to PasswordResetViewMixin so that we can differentiate from which site we have requested a password reset. 2017-06-12 20:42:17 +05:30
Levi
817f800fbd fixed #3350 2017-06-11 11:44:14 -05:00
M.Ravi
c989017a8f Added SignupValidateView and SignupValidatedView classes to handle respective views 2017-06-11 05:18:06 +05:30
Levi
d43855adda fixed #3350, #3328, #3316, #3339 2017-06-09 15:36:14 -05:00
Modulos
346733fbcd Allow users to delete ssh keys 2017-06-03 15:03:55 +02:00
modulos
ab29b138c3 Add delete ssh key modal 2017-06-03 13:33:05 +02:00
modulos
715d092b96 Add ssh key to new vm 
Create_vm now stes to public key correctly
 2017-06-02 00:53:22 +02:00
modulos
d229d124e9 Merge branch 'develop' into api/cleanup 2017-06-01 21:51:15 +02:00
Levi Velázquez
211e1be0fb Merge pull request #279 from levivm/develop 
Develop
 2017-05-25 13:05:48 -05:00
Levi
d9d8ddc9e1 removed import pdb 2017-05-25 13:05:32 -05:00
Levi
9a93a3e315 fixed vm pricing error 2017-05-25 13:04:29 -05:00
modulos
d395735219 Redirect new user to key generation view 2017-05-25 16:23:31 +02:00
modulos
35f129a4c7 Add user generated public ssh keys as well 2017-05-25 15:54:32 +02:00
modulos
9753dfd2fc Add UserHosting public key to opennebula user 2017-05-25 11:27:49 +02:00
Levi
ee80181a55 added redirect after create vm ssh key 2017-05-24 10:58:16 -05:00
Levi
34d596f2ba added next url to ssh create key view 2017-05-21 22:46:31 -05:00
Levi
05bf8db38a added next url to ssh create key view 2017-05-21 22:39:47 -05:00
Levi
02a2ac31c6 added next url to ssh create key view 2017-05-21 22:35:43 -05:00
Levi
3f198bb4de Fixed djangohosting, railshosting and nodehosting page. Fixed payment erro 2017-05-21 22:01:26 -05:00
Levi
03ec8ef674 Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api 2017-05-20 11:20:30 -05:00
Levi
5dd54f4219 added redirect 2017-05-20 11:06:10 -05:00
Modulos
1e2b8b1652 Add connection error handling 2017-05-14 12:22:10 +02:00
Levi
bcc32174b2 added permissions to hosting bill view 2017-05-13 20:19:09 -05:00
Levi
e6ec14dfe7 Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api 2017-05-13 12:22:21 -05:00
Modulos
752e11bcea Readded hostingplans 2017-05-13 13:47:53 +02:00
Modulos
8017fbb90f Work on configuration 2017-05-13 10:00:07 +02:00
Levi
d8c8804cc4 Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api 2017-05-13 00:31:33 -05:00
Levi
07dc04018f cleaned code 2017-05-13 00:31:29 -05:00
Modulos
75d93b2aad Add images as configuration 2017-05-13 06:59:57 +02:00
Modulos
cfaf201064 Handle ConnectionException, add change_user_password 2017-05-13 05:50:56 +02:00
Levi
8980f6b2fc merged opnnebula api changes 2017-05-12 12:13:18 -05:00
Modulos
130c00c8ee API Integration 
Please review carefully.
 2017-05-12 12:07:05 +02:00
Levi
3873540849 Force user to generate ssh key in order to create a VM #3147. As user I want to terminate a VM using web interface #3148. Change password in opennebula when user change his password on hosting app #3149 2017-05-12 00:56:35 -05:00
Levi
1f10f04a9d Fixed ssh key error, Now an existing user is not ask for his credit card again 2017-05-11 00:11:33 -05: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
38b2aa8986 Create HostingBill obj when payment's successful 2017-05-09 04:40:41 +02:00
Modulos
3ee075fad9 Merge branch 'opennebula-integration' into vm_bill 2017-05-09 04:04:53 +02:00
Levi
7ae49d00dd added opennebula manager claass 2017-05-08 19:02:29 -05:00
Modulos
c745a8c402 Remove comment 
I assume that only clients are StripeCustomer objects
 2017-05-08 16:00:42 +02:00
Modulos
3078536bd7 Merge branch 'opennebula-integration' into vm_bill 2017-05-08 15:46:53 +02:00
Levi
d72c1c810d added get vms 2017-05-07 18:57:44 -05:00
Modulos
b4ec750728 Return error page if HostingBill is None 2017-05-08 01:56:02 +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
e67148ff59 fixing vm list 2017-05-06 18:39:19 -05:00
Levi
e99be51de1 adding list vm 2017-05-06 18:19:28 -05:00
Levi
c9c7023c73 fixed create vm method 2017-05-06 18:04:45 -05:00
Levi
97fecf88db fixed typo 2017-05-06 17:42:14 -05:00
Levi
ac9ba1480b fixed payment issues 2017-05-06 17:36:02 -05:00
Modulos
bd362cb619 Change to user_email add TODOs 2017-05-06 15:28:18 +02:00
Modulos
6f252def5d Return error if HostingBill object does not exist 2017-05-06 15:16:10 +02: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
2658205008 showing VMS 2017-04-29 12:54:14 -05:00
Levi
4ec830550c showing VMS 2017-04-29 12:51:30 -05:00
Levi
3e755b3b68 added vm_template parameter to djangohosting view 2017-04-29 12:46:56 -05:00
Levi
085133fb53 integrating hosting app with opennebula integration 2017-04-29 12:39:55 -05:00
Levi
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
Levi
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
Levi
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
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
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
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
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
6d029fdeb5 Added cron to send email and fixing settings error 2016-06-16 01:04: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
a6eba4f536 #hotfix email after book vm 2016-06-05 15:49:51 -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
a846f42bf6 Added mark a notification as read feature, Fixed some errors 2016-05-29 13:37:43 -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
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
3beb220f90 Merge pull request #77 from tmslav/develop 
https://redmine.ungleich.ch/issues/2290
 2016-05-21 00:04:41 +02:00
Tomislav R
f6fbf13023 https://redmine.ungleich.ch/issues/2290 2016-05-21 00:03:17 +02:00
Levi
88ee543083 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-05-20 16:43:17 -04:30
Levi
5bdcc5d2b2 Fixed Login Error Style , Started view to generating SSH key for a VM 2016-05-20 16:41:42 -04:30
Tom
418c257978 delete orders 2016-05-20 15:00:06 +00:00
Tomislav R
2a7603778a resolve conflicts 2016-05-20 14:22:51 +02:00
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
Tomislav R
04d8c263bf add delete hosting order 2016-05-19 00:58:28 +02:00
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
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
539117741e Changed redirect url after login 2016-05-03 01:06:43 -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
1c5fc6a437 Added redirect urls after signup/login 2016-04-30 13:55:55 -05:00
Levi
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
Levi
46ab364184 Handled stripe payment errors , Added invoice template, Added view to handle invoice data 2016-04-27 01:54:15 -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
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
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
rscnt
fd1b987bb6 hosting: fixed views function calls 2015-09-22 05:37:22 -06:00
Nico Schottelius
2bf346495e begin refactor to /hosting/ 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-08-27 18:20:08 +02:00
Renamed from railshosting/views.py (Browse further)