Arvind Tiwari
|
10c6fd5696
|
add optimize folder
|
2018-02-08 19:43:13 +05:30 |
|
Arvind Tiwari
|
4145129974
|
remove whitespace from output
|
2018-02-08 19:10:37 +05:30 |
|
Arvind Tiwari
|
b9c53717e3
|
Merge branch 'master' into task/3713/clean_up_css
|
2018-02-08 17:11:41 +05:30 |
|
Arvind Tiwari
|
ff2761912e
|
minor fix
|
2018-02-05 02:57:46 +05:30 |
|
Arvind Tiwari
|
a43428539f
|
optimize script documentation and report output
|
2018-02-05 02:47:18 +05:30 |
|
Arvind Tiwari
|
4ebd52cd69
|
fix user keys layout, adjust @media breakpoints to bs4, fix more unused css, optimize script
|
2018-02-04 03:20:27 +05:30 |
|
Arvind Tiwari
|
6bb7f2f187
|
create vm error fix, more css optimizations
|
2018-01-31 04:22:34 +05:30 |
|
Arvind Tiwari
|
9d196416e2
|
optimize script
|
2018-01-30 19:09:55 +05:30 |
|
PCoder
|
3d1738871b
|
Replace all ungleich.com with ungleich.ch
|
2018-01-03 08:54:19 +01:00 |
|
PCoder
|
72baa3635b
|
Add cache_control decorator to LoginViewMixin
|
2017-12-27 08:31:19 +01:00 |
|
PCoder
|
6fa8dbb5cb
|
Add trial_end parameter to subscribe_customer_to_plan
|
2017-12-24 12:32:08 +01:00 |
|
PCoder
|
1306dbe46a
|
Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete
|
2017-12-12 20:23:25 +01:00 |
|
PCoder
|
4a30438704
|
Update datacenterlight django.po
|
2017-11-27 08:38:10 +01:00 |
|
PCoder
|
273fa75d55
|
Fix PEP8 warnings
|
2017-11-26 01:12:16 +01:00 |
|
PCoder
|
07ffbcda97
|
Add skipIf condition for utils.tests.TestStripeCustomerDescription
|
2017-11-25 23:57:58 +01:00 |
|
PCoder
|
8c5848c1aa
|
Update skipif condition
|
2017-11-25 23:14:40 +01:00 |
|
PCoder
|
3284adaf7a
|
Add cardholder_name to data in BillingAddressFormTest
|
2017-11-25 22:37:00 +01:00 |
|
PCoder
|
89ac6250f1
|
Add validated=1 to users created in utils.tests
|
2017-11-25 20:19:22 +01:00 |
|
PCoder
|
6eec131218
|
Merge branch 'master' into task/3672/cleaning_existing_tests
|
2017-11-24 21:37:19 +01:00 |
|
Arvind Tiwari
|
b8d0ca17d7
|
translation fix in utils.forms
|
2017-10-31 21:01:54 +05:30 |
|
PCoder
|
23e7edf7c2
|
Return True if associate_customer_card runs ok
|
2017-10-29 14:40:15 +01:00 |
|
PCoder
|
2ffaee2d5b
|
Add clear_items_from_list utility function
|
2017-10-29 13:14:29 +01:00 |
|
PCoder
|
7e5cab2cc4
|
Fix PEP8 warnings
|
2017-10-28 22:44:58 +02:00 |
|
PCoder
|
2a59a3336b
|
Add metadata (vm_id) to Stripe subscription
|
2017-10-28 20:25:18 +02:00 |
|
PCoder
|
73169e825d
|
Add set_as_default parameter for associate_customer_card method
|
2017-10-28 15:13:38 +02:00 |
|
PCoder
|
bd7db30633
|
Add card hidden field to BillingAddressForm
|
2017-10-27 00:43:07 +02:00 |
|
PCoder
|
1374eaf1a2
|
Rename id to stripe_api_cus_id
|
2017-10-27 00:41:49 +02:00 |
|
M.Ravi
|
85d19c004b
|
Remove redundant code in check_customer
|
2017-10-26 15:21:29 +02:00 |
|
PCoder
|
1e08ae5426
|
Stripe API: Use list() instead of all() as the former is deprecated
|
2017-10-21 20:46:29 +02:00 |
|
PCoder
|
fb2056bf95
|
Update stripe_id for a missing case
|
2017-10-21 20:45:00 +02:00 |
|
PCoder
|
70b6bbdf2f
|
Save card id as a parameter and use it to delete a source
|
2017-10-21 13:27:35 +02:00 |
|
M.Ravi
|
a3ce43fd53
|
Add add_card_to_stripe_customer function
|
2017-10-15 23:32:16 +02:00 |
|
M.Ravi
|
83363f4701
|
Remove some lines
|
2017-10-15 21:46:26 +02:00 |
|
M.Ravi
|
7d69d8d5d4
|
Add get_cards_details_from_token function
|
2017-10-15 21:45:17 +02:00 |
|
Arvind Tiwari
|
3370f06bff
|
msg fix
|
2017-10-15 02:30:42 +05:30 |
|
M.Ravi
|
a03040b449
|
Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete
|
2017-10-11 21:25:52 +02:00 |
|
Arvind Tiwari
|
452089e103
|
translation fix
|
2017-10-10 21:38:49 +05:30 |
|
M.Ravi
|
f044b83b8f
|
Add Stripe unsubscribe_customer method
|
2017-10-03 13:06:37 +02:00 |
|
M.Ravi
|
e2188cc166
|
Added some skipIf conditions
|
2017-10-02 17:19:51 +02:00 |
|
M.Ravi
|
b848841337
|
Add logger error messages for Stripe errors
|
2017-10-02 01:35:28 +02:00 |
|
M.Ravi
|
4334dfaa44
|
Update utils django.po
|
2017-09-29 22:36:38 +02:00 |
|
M.Ravi
|
e6869612d8
|
Update resend activation link email text
|
2017-09-29 21:45:30 +02:00 |
|
M.Ravi
|
0202d5ba93
|
Add initial values for dcl billing form
|
2017-09-28 22:56:33 +02:00 |
|
PCoder
|
fcda0b5637
|
DCL payment page: Get form data from session on error
|
2017-09-29 01:25:22 +05:30 |
|
PCoder
|
06ef940b01
|
Merge upstream
|
2017-09-28 03:33:43 +05:30 |
|
PCoder
|
5a2a134070
|
Merge upstream master
|
2017-09-28 01:35:09 +05:30 |
|
PCoder
|
e33e9cd1ae
|
Merge branch 'master' into tiwariav-task/3756/landing_billing_page
|
2017-09-26 12:20:56 +05:30 |
|
PCoder
|
c17604e5c1
|
Merge master into task/3730/refactor_price_parameter
|
2017-09-26 12:16:50 +05:30 |
|
PCoder
|
a9e8d8bb34
|
Merge branch 'master' into task/3764/show_cancelled_vms_my_orders
|
2017-09-26 12:09:09 +05:30 |
|
PCoder
|
6bf89669ef
|
some more de translations
|
2017-09-26 02:07:28 +05:30 |
|
PCoder
|
3b55e331ed
|
Merge branch 'master' into task/3764/show_cancelled_vms_my_orders
|
2017-09-26 01:58:42 +05:30 |
|
PCoder
|
75ff7e4ea8
|
Added some translations
|
2017-09-26 01:53:19 +05:30 |
|
PCoder
|
81bc5d5555
|
Merge branch 'master' into task/3781/resend_activation_mail
|
2017-09-26 01:18:02 +05:30 |
|
PCoder
|
c2844d25ed
|
Corrected a de spelling
|
2017-09-26 00:06:17 +05:30 |
|
verysanghee
|
04c29d0622
|
Update django.po
|
2017-09-25 20:17:12 +02:00 |
|
PCoder
|
114511e924
|
Fixed some flake8 warnings
|
2017-09-25 00:34:18 +05:30 |
|
PCoder
|
7278a20135
|
Added get_or_create_vm_detail function
|
2017-09-25 00:02:36 +05:30 |
|
PCoder
|
3e32e5127b
|
Added ResendActivationLinkViewMixin
|
2017-09-24 15:55:52 +05:30 |
|
PCoder
|
af426c5b7a
|
Added ResendActivationEmailForm and translation function to untranslated texts
|
2017-09-24 15:54:45 +05:30 |
|
PCoder
|
9ab7622a9c
|
Reformatted stripe_utils.py
|
2017-09-23 03:25:48 +05:30 |
|
PCoder
|
285d664660
|
Refactored obtaining stripe plan name to utils.stripe_utils.get_stripe_plan_name
|
2017-09-23 03:17:21 +05:30 |
|
PCoder
|
3bb7f09d41
|
Refactored obtaining vm price to utils.hosting_utils.get_vm_price
|
2017-09-23 03:16:18 +05:30 |
|
Arvind Tiwari
|
fc03df4652
|
merged master
|
2017-09-20 23:21:24 +05:30 |
|
M.Ravi
|
a06753ca4b
|
Use hostname and send celery errors to DCL_ERROR_EMAILS_TO
|
2017-09-15 13:09:46 +02:00 |
|
M.Ravi
|
5c3cf7682f
|
Fixed some flake8 warnings
|
2017-09-14 15:27:25 +02:00 |
|
M.Ravi
|
a4fe2e2db9
|
Updated SaveSSHKeyTestCase to include add/remove ssh keys
|
2017-09-14 15:05:28 +02:00 |
|
PCoder
|
f4dfee2306
|
Send an email in case of a failed save_ssh_key task
|
2017-09-13 07:45:16 +05:30 |
|
PCoder
|
221af96c8b
|
Removed explicit deleting of file with NamedTemporaryFile
|
2017-09-13 02:46:54 +05:30 |
|
PCoder
|
511a1551d5
|
Added logger debug message when file not found when deleting
|
2017-09-13 02:41:19 +05:30 |
|
PCoder
|
261615e701
|
Using ssh-keygen to validate public key
|
2017-09-13 02:22:29 +05:30 |
|
Arvind Tiwari
|
5d9a20dd94
|
merged master and added translations
|
2017-09-11 23:47:35 +05:30 |
|
PCoder
|
1a43f4f810
|
Merged upstream master into task/3731/cdist_ssh_key_handler
|
2017-09-09 20:30:50 +05:30 |
|
PCoder
|
f9abdfe1bc
|
Merged upstream master into task/3731/cdist_ssh_key_handler
|
2017-09-09 13:44:46 +05:30 |
|
PCoder
|
e9b5e052ac
|
Merged upstream master into task/3484/email_refactoring
|
2017-09-09 11:38:57 +05:30 |
|
Arvind Tiwari
|
de1895d2a0
|
billing address form fixed
|
2017-09-08 23:46:29 +05:30 |
|
PCoder
|
dc6fa5428e
|
Corrected filtering public ssh keys condition
|
2017-09-05 03:29:12 +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 |
|
PCoder
|
1bc78ceb5d
|
Added save_ssh_key_error_handler
|
2017-09-01 02:33:31 +05:30 |
|
M.Ravi
|
ab31ad37d3
|
Not passing index to cdist configure
|
2017-08-31 18:57:05 +02:00 |
|
M.Ravi
|
75a778e65f
|
Added hosting_utils.py
|
2017-08-31 18:35:19 +02:00 |
|
M.Ravi
|
89ba4b6d04
|
Added CdistUtils class to manage indices
|
2017-08-31 15:05:45 +02:00 |
|
PCoder
|
b35e74e355
|
Updated cdist integration code with index parameter
|
2017-08-31 12:55:19 +05:30 |
|
Arvind Tiwari
|
5105b4583e
|
Merge remote-tracking branch 'ungleich/master' into task/3704/my_settings
|
2017-08-30 16:25:24 +05:30 |
|
M.Ravi
|
adb75b488c
|
Merged dynamicwebs master into task/3731/cdist_ssh_key_handler
|
2017-08-30 12:10:44 +02:00 |
|
M.Ravi
|
a4a2b2a803
|
Refactored and commented utils/tasks
|
2017-08-30 09:44:33 +02:00 |
|
M.Ravi
|
96be1245dc
|
utils/tasks: Refactored code
|
2017-08-29 18:15:23 +02:00 |
|
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 |
|
M.Ravi
|
21f51692c4
|
Improved save_ssh_key celery task
|
2017-08-28 11:40:59 +02:00 |
|
M.Ravi
|
2b541da94b
|
Added SaveSSHKeyTestCase
|
2017-08-28 11:39:46 +02:00 |
|
PCoder
|
568f38dd67
|
Added utils/tasks.py
|
2017-08-28 12:25:39 +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 |
|
M.Ravi
|
c8cf166571
|
Merged code from siarheipuhach/dynamicweb
|
2017-07-01 15:18:44 +02:00 |
|
Andrii Marynets
|
9431e9846c
|
Add middleware for fix "get_host() method fails when the host is behind multiple proxies"
|
2017-06-30 08:44:39 +03:00 |
|
PCoder
|
d161a285b8
|
Added get_card_details function to stripe_utils
|
2017-06-30 11:08:00 +05:30 |
|
Andrii Marynets
|
ebf8b0646d
|
Fix not add analytics if DEBUG=True
|
2017-06-30 01:33:12 +03:00 |
|
Andrii Marynets
|
2ad984504c
|
Add GOOGLE_ANALYTICS_PROPERTY_IDS for dynamic set ID
|
2017-06-30 01:23:35 +03:00 |
|
Siarhei Puhach
|
edcfd3e9f4
|
Added Flake8 lib and fixed PEP8 violations
|
2017-06-29 17:34:40 +03:00 |
|
Pcoder
|
d4876cdecb
|
Fixed the username for the from_email address
|
2017-06-16 00:09:11 +05:30 |
|
Levi Velázquez
|
657e93862d
|
Merge branch 'master' into bug/3313/pwd_reset_email_from_dcl_support
|
2017-06-15 01:17:14 -05:00 |
|
Levi
|
c7d29be24c
|
Merge branch 'master' into develop
|
2017-06-12 23:51:03 -05:00 |
|
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
|
d43855adda
|
fixed #3350, #3328, #3316, #3339
|
2017-06-09 15:36:14 -05:00 |
|
M.Ravi
|
a60ef7cf7a
|
Changed BaseEmail to accept from_address to modify the from header accordingly
|
2017-06-07 11:35:16 +05:30 |
|
Levi
|
8adcb75b8c
|
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
|
2017-06-04 17:08:09 -05:00 |
|
Levi
|
8598c540b9
|
removed pdb
|
2017-06-04 17:05:48 -05:00 |
|