Commit graph

3465 commits

Author SHA1 Message Date
Arvind Tiwari
3ef2aa4bfb removed unused header plugins 2018-01-05 18:31:24 +05:30
Arvind Tiwari
74626a59dc galsfaser section cms plugin extra padding fix 2018-01-05 05:18:35 +05:30
PCoder
b4fbd59144 Merge branch 'master' into task/4046/compute_hdd_sdd 2018-01-03 09:22:25 +01:00
PCoder
c368aa0272 Merge branch 'master' into bug/4000/replace_ungleichcom_ungleichch 2018-01-03 08:59:48 +01:00
PCoder
3d1738871b Replace all ungleich.com with ungleich.ch 2018-01-03 08:54:19 +01:00
PCoder
43999d803a Add sdd_size, hdd_size to VirtualMachineSerializer 2018-01-03 08:43:57 +01:00
PCoder
554335ae19 Update Changelog for 1.3.1 2017-12-31 18:28:41 +01:00
Pcoder
e85993eabf
Merge pull request #556 from pcoder/feature/use_email_smarthost
Obtain email host, port and tls settings from env
2017-12-31 18:14:46 +01:00
PCoder
ace2abc47e Obtain email host, port and tls settings from env 2017-12-31 00:58:37 +01:00
Arvind Tiwari
a4ff33f0fd
Update Changelog 2017-12-29 18:50:58 +05:30
PCoder
f5db08e3df Update psycopg2 from 2.7.1 to 2.7.3.2 2017-12-28 13:14:59 +01:00
PCoder
f2f1c61739 Remove margin from a tags for explanation text 2017-12-27 23:59:40 +01:00
PCoder
b0993d8728 Fix address: Bahnhotstrasse to Bahnhofstrasse 2017-12-27 23:44:27 +01:00
PCoder
34f841afd4 Update Changelog 2017-12-27 21:47:29 +01:00
PCoder
23c4069ebd Update Changelog for release 1.3 2017-12-27 21:31:53 +01:00
Pcoder
e497616c1e
Merge pull request #554 from pcoder/task/3994/dg_add_signup_clarification_line
Task/3994/Add DG signup clarification line
2017-12-27 21:27:46 +01:00
PCoder
2c6204de9b Merge branch 'task/3994/dg_add_signup_clarification_line' of https://github.com/pcoder/dynamicweb into task/3994/dg_add_signup_clarification_line 2017-12-27 21:18:43 +01:00
PCoder
a743e4e8a0 Merge branch 'master' into task/3994/dg_add_signup_clarification_line 2017-12-27 21:18:13 +01:00
PCoder
01b8266b61 Update Changelog 2017-12-27 20:37:34 +01:00
Pcoder
9c513e667f
Merge pull request #553 from pcoder/task/3799/dg_monthly_subscription
Task/3799/dg monthly subscription
2017-12-27 20:29:39 +01:00
PCoder
0abd165c8e Skip test_post if Stripe API key is not provided 2017-12-27 20:21:37 +01:00
PCoder
3189568884 Send emails to admin when Stripe transaction error 2017-12-27 20:04:29 +01:00
PCoder
2ed8df721b Merge branch 'master' into task/3799/dg_monthly_subscription 2017-12-27 19:28:38 +01:00
M.Ravi
e6931534ab Load i18n in ungleich_page's _header_with_background_video_slider_item.html 2017-12-27 18:09:50 +01:00
M.Ravi
251b5d7495 Remove a whitespace 2017-12-27 11:03:12 +01:00
PCoder
3489640afe Add DG signup clarification line 2017-12-24 21:17:52 +01:00
PCoder
96ba93e206 Merge branch 'master' into task/3799/dg_monthly_subscription 2017-12-24 19:48:35 +01:00
PCoder
fe6bd2a807 Update Changelog 2017-12-24 19:37:29 +01:00
Pcoder
ed6e39d955
Merge pull request #552 from pcoder/bug/3993/dg_new_user_membership_payment
Set cardholder_name field for UserBillingAddressForm
2017-12-24 19:33:12 +01:00
PCoder
a3f212a59e Fix PEP8 error 2017-12-24 18:33:24 +01:00
PCoder
a34bd83c5e Refactor reactivate link html 2017-12-24 18:07:30 +01:00
PCoder
ca2a90ca2d On reactivate, take user to pricing page 2017-12-24 18:06:17 +01:00
PCoder
89d70a2b6a Fix bug: rename subscription_id to stripe_subscription_id 2017-12-24 15:04:20 +01:00
PCoder
eb067f5708 Refactor code and log messages for possible errors 2017-12-24 14:38:32 +01:00
PCoder
29c24574aa Cancel subscription on membership deactivation + some more reorganizes + import logger 2017-12-24 14:26:40 +01:00
PCoder
707e1897b3 Reorganize imports 2017-12-24 14:23:33 +01:00
PCoder
63215b1c42 Organize imports 2017-12-24 13:35:53 +01:00
PCoder
b19c3bdcde Reformat code 2017-12-24 13:15:48 +01:00
PCoder
b4421bc9b2 Reformat code 2017-12-24 13:06:23 +01:00
PCoder
f6d0b6ce9c Add stripe_subscription_id to MembershipOrder data 2017-12-24 12:54:59 +01:00
PCoder
3ed6119dc9 Check if DG subscription created was under trial; if not show error 2017-12-24 12:53:23 +01:00
PCoder
f5170cce5f Call DG subscribe_customer_to_plan with trial period until first of next month 2017-12-24 12:51:16 +01:00
PCoder
3826ca207a Reformat code 2017-12-24 12:48:03 +01:00
PCoder
11b8ebe401 Import time 2017-12-24 12:46:36 +01:00
PCoder
0091281357 Add next_month_in_sec_since_epoch MembershipType function 2017-12-24 12:45:59 +01:00
PCoder
6fa8dbb5cb Add trial_end parameter to subscribe_customer_to_plan 2017-12-24 12:32:08 +01:00
PCoder
b2d0fd45ad Fix PEP8 error 2017-12-24 00:21:25 +01:00
PCoder
872582f45f Add tentative code to subscribe customer to Stripe plan (wip) 2017-12-24 00:08:17 +01:00
PCoder
f226c551a8 Add stripe_subscription_id field to MembershipOrder 2017-12-24 00:06:21 +01:00
PCoder
10bc05f700 User customer's name instead of email for cardholder_name if not provided 2017-12-23 23:07:53 +01:00