PCoder
								
							 
						 | 
						
							
							
								
							
							
	e9b5e052ac
						 | 
						
							
							
								
								
								Merged upstream master into task/3484/email_refactoring
							
							
							
							
							
							
						 | 
						
							2017-09-09 11:38:57 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	f84b95e385
						 | 
						
							
							
								
								
								Added some translations
							
							
							
							
							
							
						 | 
						
							2017-09-04 22:27:59 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	52edb5466d
						 | 
						
							
							
								
								
								Added some translations in utils django.po
							
							
							
							
							
							
						 | 
						
							2017-09-03 17:22:16 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	3a739f1cde
						 | 
						
							
							
								
								
								Added utils django.po
							
							
							
							
							
							
						 | 
						
							2017-09-02 17:23:10 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	7d12eff9be
						 | 
						
							
							
								
								
								Added translations and reformatted code
							
							
							
							
							
							
						 | 
						
							2017-09-02 16:50:09 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	2276533185
						 | 
						
							
							
								
								
								Reformatted utils/views.py and added a condition to DCL_TEXT in passoword reset email
							
							
							
							
							
							
						 | 
						
							2017-09-02 16:36:27 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	1c42623964
						 | 
						
							
							
								
								
								Fixed some password reset email translation issues
							
							
							
							
							
							
						 | 
						
							2017-09-02 16:24:25 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	7c70ee637a
						 | 
						
							
							
								
								
								Updated password reset template
							
							
							
							
							
							
						 | 
						
							2017-09-02 15:56:17 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	5105b4583e
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'ungleich/master' into task/3704/my_settings
							
							
							
							
							
							
						 | 
						
							2017-08-30 16:25:24 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	58e7a2aca7
						 | 
						
							
							
								
								
								saving cardholder name
							
							
							
							
							
							
						 | 
						
							2017-08-29 17:48:41 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	32ba9c5ff7
						 | 
						
							
							
								
								
								Merge branch 'master' into task/3704/my_settings
							
							
							
							
							
							
						 | 
						
							2017-08-29 17:42:40 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	ce1d346bc1
						 | 
						
							
							
								
								
								billing form in settings page
							
							
							
							
							
							
						 | 
						
							2017-08-29 17:42:35 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	1da04a05d1
						 | 
						
							
							
								
								
								Created send_plain_email_task celery task and calling it on contact send
							
							
							
							
							
							
						 | 
						
							2017-08-27 16:42:14 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	bf304f9493
						 | 
						
							
							
								
								
								Fixed obtaining ga code from dict
							
							
							
							
							
							
						 | 
						
							2017-08-24 16:10:53 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	01b64fec88
						 | 
						
							
							
								
								
								Attempt to fix no ga code in www. sites
							
							
							
							
							
							
						 | 
						
							2017-08-24 16:04:37 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	c9357058f7
						 | 
						
							
							
								
								
								Added STRIPE_API_PRIVATE_KEY_TEST to the test case
							
							
							
							
							
							
						 | 
						
							2017-08-24 13:38:10 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	b5e488e326
						 | 
						
							
							
								
								
								Formatted utils/stripe_utils.py
							
							
							
							
							
							
						 | 
						
							2017-08-24 10:31:57 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	9eecfbda64
						 | 
						
							
							
								
								
								Added hdd parameter as an optional parameter to the subscription plan id
							
							
							
							
							
							
						 | 
						
							2017-08-22 02:13:12 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	35736ae593
						 | 
						
							
							
								
								
								Refactored some code
							
							
							
							
							
							
						 | 
						
							2017-08-18 01:49:27 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	7e1bfc9fab
						 | 
						
							
							
								
								
								Removed a print
							
							
							
							
							
							
						 | 
						
							2017-08-18 00:47:34 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	fc70c30f21
						 | 
						
							
							
								
								
								Merged master into task/3701/enable_monthly_payments
							
							
							
							
							
							
						 | 
						
							2017-08-18 00:40:57 +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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	5fe6007ad2
						 | 
						
							
							
								
								
								Refactored code and added app as a parameter in get_stripe_plan_id
							
							
							
							
							
							
						 | 
						
							2017-08-17 18:21:53 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	b0b1b6091a
						 | 
						
							
							
								
								
								Refactored code and added app as a parameter in get_stripe_plan_id
							
							
							
							
							
							
						 | 
						
							2017-08-17 18:17:52 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	5c92e47ffe
						 | 
						
							
							
								
								
								Added card that fails and a new test case to test failed payment
							
							
							
							
							
							
						 | 
						
							2017-08-17 16:42:32 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	0bc1766e4a
						 | 
						
							
							
								
								
								Refactored tests and added test_subscribe_customer_to_plan
							
							
							
							
							
							
						 | 
						
							2017-08-17 15:32:13 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	ffd0d24f1a
						 | 
						
							
							
								
								
								Refactored code
							
							
							
							
							
							
						 | 
						
							2017-08-17 13:23:49 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	3ef34d84a8
						 | 
						
							
							
								
								
								Added some comments and improved the test code
							
							
							
							
							
							
						 | 
						
							2017-08-17 13:02:39 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	1073b25a94
						 | 
						
							
							
								
								
								Refactored and added test_delete_unexisting_plan_should_fail
							
							
							
							
							
							
						 | 
						
							2017-08-17 12:43:42 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	2a348c40d1
						 | 
						
							
							
								
								
								Refactored code and added delete_stripe_plan method
							
							
							
							
							
							
						 | 
						
							2017-08-17 12:42:34 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	bba82e95d1
						 | 
						
							
							
								
								
								Cleaned up some unused code
							
							
							
							
							
							
						 | 
						
							2017-08-17 11:04:22 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	08c5485352
						 | 
						
							
							
								
								
								Added test_create_duplicate_plans_error_handling
							
							
							
							
							
							
						 | 
						
							2017-08-17 13:01:48 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	783ab5714c
						 | 
						
							
							
								
								
								Improved get_or_create_plan and subscribe_customer_to_plan
							
							
							
							
							
							
						 | 
						
							2017-08-17 13:01:05 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	9d4085138a
						 | 
						
							
							
								
								
								Added StripePlanTestCase
							
							
							
							
							
							
						 | 
						
							2017-08-17 04:25:07 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	974617badb
						 | 
						
							
							
								
								
								Added get_or_create_plan and subscribe_customer_to_plan and get_stripe_plan_id_string functions to StripeUtils class
							
							
							
							
							
							
						 | 
						
							2017-08-17 04:23:38 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	999f5d8e2d
						 | 
						
							
							
								
								
								Cleaned up a comment
							
							
							
							
							
							
						 | 
						
							2017-08-15 18:48:29 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	492f7553d8
						 | 
						
							
							
								
								
								Added test TestStripeCustomerDescription
							
							
							
							
							
							
						 | 
						
							2017-08-15 16:12:08 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	3be7fbe2ee
						 | 
						
							
							
								
								
								Added name parameter for creating StripeCustomer and set description to this
							
							
							
							
							
							
						 | 
						
							2017-08-15 16:05:52 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	debfafaf26
						 | 
						
							
							
								
								
								Added migration file for missing card holder's name in utils_billing_address
							
							
							
							
							
							
						 | 
						
							2017-08-10 23:14:51 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Siarhei Puhach
								
							 
						 | 
						
							
							
								
							
							
	4de04b2663
						 | 
						
							
							
								
								
								Changed visa card error placement
							
							
							
							
							
							
						 | 
						
							2017-08-07 09:56:57 +03:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	e33df8f1e9
						 | 
						
							
							
								
								
								Added card holders name in UserBillingAddress to_dict function
							
							
							
							
							
							
						 | 
						
							2017-07-16 22:34:49 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	ed52e396d9
						 | 
						
							
							
								
								
								Formatted utils/models.py
							
							
							
							
							
							
						 | 
						
							2017-07-16 16:36:38 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	083b870b33
						 | 
						
							
							
								
								
								Formatted utils/forms.py
							
							
							
							
							
							
						 | 
						
							2017-07-16 16:35:55 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	a37464f8b3
						 | 
						
							
							
								
								
								Removed some unreachable code from utils/forms.py
							
							
							
							
							
							
						 | 
						
							2017-07-16 16:35:02 +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
								
							 
						 | 
						
							
							
								
							
							
	9d4cbb2be5
						 | 
						
							
							
								
								
								Introduced credit card holder's name in BaseBillingAddress model
							
							
							
							
							
							
						 | 
						
							2017-07-16 03:40:30 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	30058efa41
						 | 
						
							
							
								
								
								Inroduced credit card holder's name in Billing Address
							
							
							
							
							
							
						 | 
						
							2017-07-16 03:39:42 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	f419ce784f
						 | 
						
							
							
								
								
								Fixed some flake8 warnings
							
							
							
							
							
							
						 | 
						
							2017-07-03 23:53:37 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	f9c3c80864
						 | 
						
							
							
								
								
								Merged the latest master into siarheipuhach-feature/flake8
							
							
							
							
							
							
						 | 
						
							2017-07-03 23:47:56 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Andrii Marynets
								
							 
						 | 
						
							
							
								
							
							
	303d99d70d
						 | 
						
							
							
								
								
								Merge branch 'master' into feature/add_google_analytics
							
							
							
							
							
							
							
							
							# Conflicts:
#	datacenterlight/templates/datacenterlight/order_detail.html 
							
						 | 
						
							2017-07-02 17:56:07 +03:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |