Private
Public Access
1
0
Commit Graph

3860 Commits

Author SHA1 Message Date
Sander Roosendaal
de67c1f8bb Merge tag 'v9.02' into develop
bug fixes for payments
2019-01-02 10:55:22 +01:00
Sander Roosendaal
3da0be5a51 Merge branch 'release/v9.02' 2019-01-02 10:53:56 +01:00
Sander Roosendaal
156560dc9e Merge branch 'bugfix/upgrade' into develop 2019-01-02 10:06:15 +01:00
Sander Roosendaal
36b99aafea allowing non ascii in workout comments 2019-01-02 10:03:32 +01:00
Sander Roosendaal
f8c50a71cb there was no bug 2019-01-02 09:53:14 +01:00
Sander Roosendaal
43c5981dd3 fixed #402 2019-01-01 17:36:20 +01:00
Sander Roosendaal
ef0fa44d34 bug fix 2018-12-31 18:48:43 +01:00
Sander Roosendaal
05495e9399 Merge tag 'v9.01' into develop
bug fixes for payments
2018-12-31 17:54:12 +01:00
Sander Roosendaal
73681ec475 Merge branch 'release/v9.01' 2018-12-31 17:53:26 +01:00
Sander Roosendaal
1ad16c6b68 Merge branch 'feature/betterpayments' into develop 2018-12-31 17:23:36 +01:00
Sander Roosendaal
639ab23beb implemented mike's improvement suggestions 2018-12-31 17:21:50 +01:00
Sander Roosendaal
117836a102 errors fixed 2018-12-31 16:45:46 +01:00
Sander Roosendaal
1968832eba adding white space in paidplans page 2018-12-30 16:34:33 +01:00
Sander Roosendaal
7866355385 removing races from plan overview 2018-12-30 15:52:11 +01:00
Sander Roosendaal
53bfd170fc swapped order - sync after setting workout type 2018-12-28 08:08:22 +01:00
Sander Roosendaal
39c7bff4ef fixed chinese file name 2018-12-27 14:38:08 +01:00
Sander Roosendaal
e434582e85 Merge branch 'feature/braintree2' into develop 2018-12-24 14:15:34 +01:00
Sander Roosendaal
a198ebbeaa notification email bug fix 2018-12-24 14:12:52 +01:00
Sander Roosendaal
2c431709d3 make button inactive when submitted 2018-12-22 10:16:55 +01:00
Sander Roosendaal
9dcf4d8d26 bug fix 2018-12-21 16:19:42 +01:00
Sander Roosendaal
d8f6f5adb5 Merge tag 'v9.00' into develop
major upgrade - braintree payments!
2018-12-21 15:25:10 +01:00
Sander Roosendaal
6ceeae36ba Merge branch 'release/v9.00' 2018-12-21 15:24:34 +01:00
Sander Roosendaal
a9b315e8bf typos corrected in notification emails 2018-12-21 15:17:12 +01:00
Sander Roosendaal
3286630931 adding braintree info 2018-12-21 15:04:35 +01:00
Sander Roosendaal
d4898701c9 time based indoor races on edit page 2018-12-21 13:58:58 +01:00
Sander Roosendaal
403d2ace46 Merge branch 'feature/braintree' into develop 2018-12-21 10:46:01 +01:00
Sander Roosendaal
73d8d555d1 adding transactions download 2018-12-21 09:46:23 +01:00
Sander Roosendaal
98900059f8 better error handling 2018-12-20 21:29:13 +01:00
Sander Roosendaal
ab9579a048 downgrade notifications 2018-12-20 17:40:32 +01:00
Sander Roosendaal
291cd0e56c Merge tag 'v8.75' into develop
hot fix
2018-12-20 16:25:18 +01:00
Sander Roosendaal
9888a04aa3 Merge branch 'hotfix/v8.75' 2018-12-20 16:24:55 +01:00
Sander Roosendaal
38050c8759 removed adaptiveclass in call to getagegrouprecords 2018-12-20 16:22:46 +01:00
Sander Roosendaal
954bd46bce notification emails 2018-12-20 16:18:28 +01:00
Sander Roosendaal
a9f11f4f76 confirmation emails to buyers 2018-12-20 15:29:21 +01:00
Sander Roosendaal
9272704f36 bugfix 2018-12-19 23:12:32 +01:00
Sander Roosendaal
3ff114a307 upgrade done 2018-12-19 22:53:07 +01:00
Sander Roosendaal
a0a03a90df added subscription_id 2018-12-19 21:51:39 +01:00
Sander Roosendaal
d70725f2b3 buy now flow complete except email confirmation 2018-12-19 17:23:34 +01:00
Sander Roosendaal
fa61957be7 simple upgrade/billing address form 2018-12-19 10:33:43 +01:00
Sander Roosendaal
0b79b0de98 updated models to add paid plan complexity 2018-12-19 09:25:28 +01:00
Sander Roosendaal
75261118c2 adding some model changes around paid plans 2018-12-18 19:22:27 +01:00
Sander Roosendaal
6d7d9f5792 billing address to user 2018-12-18 12:39:34 +01:00
Sander Roosendaal
a9d032ef2f Merge tag 'v8.74' into develop
small fix
2018-12-18 11:25:02 +01:00
Sander Roosendaal
31b50927cc Merge branch 'hotfix/v8.74' 2018-12-18 11:22:55 +01:00
Sander Roosendaal
53619f8380 disallowing HEAD requests 2018-12-18 11:20:34 +01:00
Sander Roosendaal
63a6114e0b trying to get country info 2018-12-17 22:39:11 +01:00
Sander Roosendaal
7d981cbf0a Merge branch 'develop' into feature/braintree 2018-12-17 20:51:47 +01:00
Sander Roosendaal
a74e701b41 Merge tag 'v8.73' into develop
release race improvements
2018-12-17 20:45:20 +01:00
Sander Roosendaal
53cc69c8af Merge branch 'release/v8.73' 2018-12-17 20:44:19 +01:00
Sander Roosendaal
ee76ce0093 mock Session not working without net 2018-12-17 20:42:29 +01:00