Commit Graph

337 Commits

Author SHA1 Message Date
ARvind Tiwari 9bd9ec5971 merged master 2017-07-28 16:48:50 +05:30
ARvind Tiwari 925252f1c9 merged master 2017-07-28 16:45:34 +05:30
Arvind Tiwari 2724cbd375 merged from master 2017-07-28 16:43:03 +05:30
ARvind Tiwari b0e6c5b55b style changes 2017-07-27 20:14:10 +05:30
ARvind Tiwari c6a3928638 decoding error fixed 2017-07-27 19:45:55 +05:30
ARvind Tiwari 99788468d1 download btn icon added for mobile 2017-07-27 17:33:44 +05:30
ARvind Tiwari 8a9242d74d ssh key flow styles fixed 2017-07-27 17:21:22 +05:30
ARvind Tiwari 08155c379b Merge branch 'master' into task/3354/modal_restyling 2017-07-27 16:02:39 +05:30
ARvind Tiwari 4216d9911a add ssh key form input shadows removed 2017-07-26 16:45:49 +05:30
ARvind Tiwari 69ff67c821 close icon fix 2017-07-25 22:21:39 +05:30
ARvind Tiwari 0e4a488dc1 footer links :hover :fpcus :active color changed to #ddd 2017-07-25 18:59:07 +05:30
ARvind Tiwari eb1b3b6eb5 new transparent navbar include in login,signup,reset-password 2017-07-24 19:43:03 +05:30
ARvind Tiwari 918e13bf91 modal close button thinner, some icons changed, vertical alignment changed to middle 2017-07-24 18:52:23 +05:30
ARvind Tiwari 805d151eea vertical alignment middle for modal 2017-07-24 17:55:36 +05:30
PCoder f4aec68bfd Added style to right align date in desktop view in Order Confirm page 2017-07-18 00:30:32 +05:30
PCoder 832ec48e93 Cleaned up some commented out code 2017-07-17 23:35:31 +05:30
PCoder 834810baf0 Added padding to enlarge the Submit payment button 2017-07-17 23:18:58 +05:30
PCoder 7359703de8 Fixed responsive issue for tablet devices 2017-07-17 02:51:49 +05:30
PCoder 3edc426cc4 Using same styles for Card number, CVV and MM/YY 2017-07-17 02:13:27 +05:30
PCoder 56e8734a27 font-weight -> 300 and outline none to the submit button in payment page 2017-07-17 02:12:12 +05:30
PCoder 467bb8f114 Fixed a bug for Enter your credit card number text not showing up in german 2017-07-17 01:17:12 +05:30
PCoder d8fa3430e6 Removed box-shadow and set font-weight 400 in mobile view in the billing details 2017-07-17 00:33:48 +05:30
PCoder e481ff947d Added code for tranlating Enter your credit card number in payment.js 2017-07-16 23:55:29 +05:30
PCoder 6ba0841bfe Center aligned the cvv field 2017-07-16 22:07:18 +05:30
PCoder c09947ef12 Added the titles of the input fields 2017-07-16 21:29:42 +05:30
PCoder a87c0a89eb Refactored and formatted unused code in hosting's payment.html payment.js landing-page.css 2017-07-16 16:37:49 +05:30
PCoder b67a12f01b Adjusted styles for error message 2017-07-16 16:04:15 +05:30
PCoder acaa791a37 Fixed MM/YY and CVV for mobile view 2017-07-16 15:50:15 +05:30
PCoder ba72527f2f Added validations for credit card inputs. Made credit card holder's name default value empty in the model. 2017-07-16 15:23:18 +05:30
PCoder b64198c2c0 Added styles for the new credit card form 2017-07-16 03:41:54 +05:30
PCoder 481dadcfe5 Implementing new credit card js code 2017-07-16 03:37:19 +05:30
PCoder 623c7e0d99 Added some padding to vat text and increased its font size 2017-07-15 20:44:28 +05:30
PCoder d711b524e1 New layout for payment page 2017-07-15 19:39:51 +05:30
Siarhei Puhach 759bfd75a3 Added question image file 2017-07-06 14:18:57 +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 f49d6b398f Changed ssh keys design(+ mobile ver.) 2017-07-05 08:41:50 +03:00
Siarhei Puhach b96d13772e SSH keys list template changed 2017-07-04 17:55:43 +03:00
Siarhei Puhach de0bada84a SSH key change design init 2017-07-04 15:00:08 +03:00
Mondi Geetha 8aa7ffa2d3 Added Heading to Modals and styles 2017-07-04 00:56:49 +05:30
Mondi Geetha b9d32afc67 Changed some styles for modal popup 2017-07-03 22:32:34 +05:30
M.Ravi 8dca67e638 Increased top margin for email confirmation and validation forms 2017-06-19 23:53:25 +05:30
M.Ravi 3cf7f8bd57 Updated css to center align text in registration success message 2017-06-19 12:55:14 +05:30
M.Ravi e63e014588 Added Lato font for sign up success text 2017-06-17 17:34:30 +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
Levi 3a1158cab0 cleaned up file createvm.js 2017-06-14 13:05:39 -05:00
Levi 1a1b05f2f8 fixed credit card input issu 2017-06-14 12:50:51 -05:00
Henry Bravo be82a63b7a Reduce container in ssh_key and tetextarea 2017-06-11 20:04:06 -05:00
Henry Bravo 225f92caf5 Change To Font Lato in VM Pages and remove messages in login 2017-06-11 19:46:07 -05:00
M.Ravi b8463360b5 Added styles for message title and text for email confirmation 2017-06-11 05:11:09 +05:30
Henry Bravo 7485c182c4 Redesign vm order page 2017-06-09 13:55:45 -05:00
Henry Bravo c69694274f Fix conflicts 2017-06-05 14:55:41 -05:00
Levi 484ab5f1c6 fixed payment when user has already a card 2017-06-04 17:41:48 -05:00
Levi ab4d1cf9c9 Changes stripe v2 to stripe v3 and added localization support 2017-06-04 17:04:38 -05:00
Henry Bravo 9b121cc702 improveded mobile responsiveness 2017-06-03 21:19:13 -05:00
Henry Bravo be04bee643 Fix center login pages 2017-06-01 15:40:19 -05:00
Henry Bravo 024f7565df Fixed details in Hosting pages and translate in login 2017-06-01 11:24:50 -05: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
Henry Bravo ac28ab0d6b Fix texts bugs and hosting mobile design 2017-05-27 10:39:30 -05:00
Henry Bravo c91a61b33c Fix order columns in hosting/payment 2017-05-25 13:27:47 -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
M.Ravi d537fcb118 Manual merge of ungleich/master into opennebula-integration 2017-04-24 03:01:05 +05:30
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 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
Levi 6737c539bb fixing email rendering svg logo 2016-06-23 23:08:52 -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 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 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
Tomislav R ed95a7ada4 hosting: https://redmine.ungleich.ch/issues/2292, fixed footer 2016-05-22 17:36:28 +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
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 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
Nico Schottelius 16008512b2 Merge branch 'feature/notifybymail' into develop 2015-09-03 19:56:39 +02:00
Nico Schottelius a69ac73f5d Add cards
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-09-03 19:56:31 +02:00
Nico Schottelius 42b0acd45e merge railshosting into hosting
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-08-27 18:33:10 +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