mravi/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
2534 commits 59 branches 86 tags 315 MiB
Commit graph

382 commits

Author SHA1 Message Date
Levi
ab4d1cf9c9 Changes stripe v2 to stripe v3 and added localization support 2017-06-04 17:04:38 -05:00
Henry Bravo
ba03cf232e 'what is it' section text change and fixed typo 2017-06-03 21:57:21 -05:00
Henry Bravo
9b121cc702 improveded mobile responsiveness 2017-06-03 21:19:13 -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
31e9377818 Merge branch 'develop' into hosting_i18n 2017-06-03 09:59:48 +02:00
Levi
f2ee18deba Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2017-06-02 11:20:30 -05:00
Levi
cd9c8938ed hidden footbar on mobile devices 2017-06-02 11:11:04 -05:00
Levi Velázquez
1ae8a627f2 Merge pull request #300 from ungleich/master 
Updating develop
 2017-06-02 09:45:49 -05:00
Henry Bravo
be04bee643 Fix center login pages 2017-06-01 15:40:19 -05:00
modulos
d229d124e9 Merge branch 'develop' into api/cleanup 2017-06-01 21:51:15 +02:00
Henry Bravo
024f7565df Fixed details in Hosting pages and translate in login 2017-06-01 11:24:50 -05:00
modulos
37a9629408 Add more translations 2017-05-30 15:57:36 +02:00
modulos
9416586d0b Merge branch 'develop' into hosting_i18n 2017-05-30 15:10:22 +02:00
modulos
796a56872c Add translation for CHF/Month 2017-05-29 18:05:21 +02:00
modulos
48050a2360 Remove .mo files and update .po files 2017-05-29 16:12:28 +02:00
modulos
f142bb1ce9 Move keys section underneath user name menu 2017-05-29 15:00:47 +02:00
modulos
6937fb98f0 Merge branch 'develop' into hosting_i18n 2017-05-29 14:00:53 +02:00
Henry Bravo
67d24462ec Apply design in Signup and change password, and fixed details 2017-05-28 12:57:02 -05:00
Henry Bravo
3f0a93357f Login page design new styles 2017-05-28 00:44:36 -05:00
Levi
59be6a7413 Merge branch 'master' into develop 2017-05-26 13:03:08 -05:00
modulos
a044490ec3 Add i18n to hosting/order 
With this commit most work for i18n of the order page is done. However
django errors, e.g. 'this field is required', aren't transalted yet.
 2017-05-26 17:02:22 +02:00
M.Ravi
6a6f403704 Renamed GiB to GB in datacenterlight/pricing.html and hosting/payment.html 2017-05-26 02:47:20 +05:30
Henry Bravo
549acd400a Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2017-05-25 13:31:16 -05:00
Henry Bravo
c91a61b33c Fix order columns in hosting/payment 2017-05-25 13:27:47 -05:00
modulos
c6db1450a1 Correct vm configuration flow 
A user now get's redirected to vm list view when pressing 'finish
configuration'
 2017-05-25 12:39:23 +02:00
Levi
4daf6ac3ac added redirect after create vm ssh key 2017-05-24 11:09:54 -05:00
Levi
ee80181a55 added redirect after create vm ssh key 2017-05-24 10:58:16 -05:00
modulos
df0b4f2629 Merge branch 'develop' into order_now 2017-05-23 19:31:58 +02:00
modulos
15259e59f2 Add support for sign up redirection 2017-05-23 19:18:51 +02:00
Levi
3d03d00201 fixed ip format in virtual machine list 2017-05-23 11:52:53 -05:00
Levi
60fc2890f1 added ipv4 and ipv6 to virtualmachine list 2017-05-23 11:50:08 -05:00
Levi
e278ff742d Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2017-05-23 11:48:25 -05:00
Levi
8d81220202 changed virtual machine list 2017-05-23 11:48:02 -05:00
modulos
adf9b77e4e Show ipv6 address 2017-05-23 11:30:10 +02:00
modulos
e782290eeb Fix NoReverseMatch for create-virtual-machine 2017-05-22 12:53:01 +02:00
Levi
d71c3093e8 added price to create vm view 2017-05-21 22:49:56 -05:00
Levi
cb33e6a750 added price to create vm view 2017-05-21 22:48:10 -05:00
Levi
34d596f2ba added next url to ssh create key view 2017-05-21 22:46:31 -05:00
Levi
65c6f1342b added next url to ssh create key view 2017-05-21 22:38:12 -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
Modulos
1e2b8b1652 Add connection error handling 2017-05-14 12:22:10 +02:00
Modulos
d7bd142387 Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api 2017-05-14 03:41:56 +02:00
Modulos
8a18c275c3 Display configuration in virtualmachine detail 2017-05-14 03:41:30 +02:00
Levi
d5749f65f1 fixed create vm button display 2017-05-13 19:57:23 -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
85d3158dbd Fix order price 2017-05-13 17:02:45 +02: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
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
1a6e1a44d8 fixing formatting 2017-05-11 00:38:53 -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
7010c76c72 Add floatformat 2017-05-09 04:41:35 +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
970ae1d0b2 Manual merge of levi/opennebula-integration 2017-05-08 12:34:28 +05:30
Modulos
a22c8cad51 Fix cosmetic detail 2017-05-08 02:46:11 +02:00
Modulos
f871bb2aba Show correct user name and email 2017-05-08 01:43:47 +02:00
Modulos
d146c25899 Merge branch 'opennebula-integration' into vm_bill 2017-05-07 06:29:29 +02:00
M.Ravi
6d4e9d8a83 Refactored code to introduce different VM templates 2017-05-07 05:31:39 +05:30
Levi Velázquez
e1a61ba930 Merge pull request #217 from levivm/opennebula-integration 
Opennebula integration
 2017-05-06 18:27:35 -05:00
Levi
2ac34ff295 fixed virtual machines template 2017-05-06 18:25:15 -05:00
Levi
ac9ba1480b fixed payment issues 2017-05-06 17:36:02 -05: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
Pcoder
9884eefa19 Update managevms.html 2017-05-03 11:44:04 +05:30
M.Ravi
58d3dd6624 Fixed some issues. 2017-05-03 11:09:22 +05:30
Levi
3e755b3b68 added vm_template parameter to djangohosting view 2017-04-29 12:46:56 -05:00
M.Ravi
d537fcb118 Manual merge of ungleich/master into opennebula-integration 2017-04-24 03:01:05 +05:30
M.Ravi
d10285e23d Made to use random passwords for creating opennebula users and managing their VMs. 2017-04-23 22:46:59 +05:30
M.Ravi
c8614f4f63 Added functionality to select templates for the VMs being created 2017-04-18 13:34:29 +05:30
M.Ravi
b68fe31361 Added start/stop functionality for VMs. Refactored a few functions. 2017-04-11 00:44:55 +05:30
M.Ravi
167e0482a9 Added Delete VM functionality. 2017-04-10 13:43:13 +05:30
M.Ravi
24cfe707cd Listing of VMs and Creation of VMs done. 2017-03-17 00:42:27 +05:30
M.Ravi
b363bf5f6a First working version of opennebula-integration. 2017-03-15 17:32:55 +05:30
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
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
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
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
9aa732626f fixed hosting emails 2016-06-26 14:54:01 -05:00
Levi
11bb685ea6 updated all email templates with the new logo img 2016-06-24 00:08:51 -05:00
Levi
ddc2d0aa0d fixing logo on emails 2016-06-23 23:58:02 -05:00
Levi
03cdd3437d fixing logo on emails 2016-06-23 23:46:25 -05:00
Levi
29efff31ea changing logo on vm booking emails 2016-06-23 23:38:32 -05:00
Levi
6737c539bb fixing email rendering svg logo 2016-06-23 23:08:52 -05:00
Levi
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
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
72a21af789 changed cancel VM modal message 2016-06-09 23:59:05 -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
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
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
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
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
71f3d30549 fixed cdn fonts url 2016-05-24 01:27: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
Tomislav R
ed95a7ada4 hosting: https://redmine.ungleich.ch/issues/2292, fixed footer 2016-05-22 17:36:28 +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
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
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
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
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
9fa83e6f9a Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-04-22 19:58:30 -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
Efstratios Goudelis
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
rscnt
decfaa676e dynamic year for hosting template footer 
Signed-off-by: rscnt <rascnt@gmail.com>
 2016-02-03 05:24:58 -06:00
Nico Schottelius
59ef61dfe8 merge from sanghee 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-08-27 18:21:15 +02: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