Commit Graph

180 Commits

Author SHA1 Message Date
PCoder d933f71fe9 Merge branch 'master' into task/3452/back_button_mgmt 2018-03-03 11:37:41 +01:00
Arvind Tiwari 0879a3e324 fix flake8 issues 2018-02-22 14:18:55 +05:30
Arvind Tiwari 7692997c82 minor improvements 2018-02-13 19:03:15 +05:30
Arvind Tiwari 909067e11f removed vendor files from hosting and using the ones from dataccenterlight 2018-02-09 06:50:17 +05:30
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 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
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