Private
Public Access
1
0

Commit Graph

  • 0264d47d11 Merge tag 'v9.09' into develop Sander Roosendaal 2019-01-06 10:56:37 +01:00
  • 4c33866e69 Merge branch 'release/v9.09' Sander Roosendaal 2019-01-06 10:56:06 +01:00
  • c544ead2f0 no changes Sander Roosendaal 2019-01-06 10:54:04 +01:00
  • b438bfd78d resolves #410 Sander Roosendaal 2019-01-06 10:51:43 +01:00
  • 7dca3a10bc comments embedded in p tag Sander Roosendaal 2019-01-06 10:30:47 +01:00
  • 6df8b43f1f Merge tag 'v9.08' into develop Sander Roosendaal 2019-01-05 19:20:54 +01:00
  • 9777cc73ef Merge branch 'hotfix/v9.08' Sander Roosendaal 2019-01-05 19:19:56 +01:00
  • fb872eac7c fixed ajax forms (ending slash) Sander Roosendaal 2019-01-05 19:17:33 +01:00
  • 3016bf6620 Merge tag 'v9.07' into develop Sander Roosendaal 2019-01-05 14:05:18 +01:00
  • f7acc1063c Merge branch 'release/v9.07' Sander Roosendaal 2019-01-05 14:03:55 +01:00
  • 09c3d35e82 releasing links to paid plans Sander Roosendaal 2019-01-05 14:01:12 +01:00
  • 97cdaa893a Merge branch 'feature/activeplans' into develop Sander Roosendaal 2019-01-05 13:39:41 +01:00
  • b66975e575 extra test file Sander Roosendaal 2019-01-05 13:38:36 +01:00
  • e2cdb0af8e adding trailing slashes to post forms Sander Roosendaal 2019-01-05 13:29:39 +01:00
  • aa1b233798 Merge branch 'feature/coverage' into develop Sander Roosendaal 2019-01-04 21:49:42 +01:00
  • 0d4c6231a7 some more tests Sander Roosendaal 2019-01-04 21:48:13 +01:00
  • c85bc53632 improved most tests Sander Roosendaal 2019-01-04 18:14:42 +01:00
  • 879e16e057 no changes, really Sander Roosendaal 2019-01-04 14:56:51 +01:00
  • 50928cba32 changed links to paidplans Sander Roosendaal 2019-01-04 09:14:14 +01:00
  • 121abe623c Merge tag 'v9.06' into develop Sander Roosendaal 2019-01-04 08:54:21 +01:00
  • d0c29b901e Merge branch 'hotfix/v9.06' Sander Roosendaal 2019-01-04 08:53:38 +01:00
  • 4b2eecbb6b fixing print statement Sander Roosendaal 2019-01-04 08:51:54 +01:00
  • 7e8cb40d46 adding multi compare test Sander Roosendaal 2019-01-04 08:27:01 +01:00
  • 6c20c3ab7f passes tests now - for what it's worth Sander Roosendaal 2019-01-03 21:54:34 +01:00
  • f901258b9b opaquification part 1 Sander Roosendaal 2019-01-03 20:50:36 +01:00
  • e42583d4f9 Merge branch 'feature/testcoverage' into develop Sander Roosendaal 2019-01-03 18:20:07 +01:00
  • abceefa42c non succeeeded in ajax test Sander Roosendaal 2019-01-03 18:11:19 +01:00
  • 8ff24d3fae faking some more sql calls Sander Roosendaal 2019-01-03 16:06:47 +01:00
  • 331b6c0049 mocking sqlalchemy Sander Roosendaal 2019-01-03 12:32:24 +01:00
  • c006c0599a patching sqlalchemy to make tests work Sander Roosendaal 2019-01-03 09:03:50 +01:00
  • d86329ad2e token refresh test Sander Roosendaal 2019-01-03 00:25:32 +01:00
  • c7a293b35b test_zemails moved to tests folder Sander Roosendaal 2019-01-03 00:22:22 +01:00
  • f442e179ba renamed emails Sander Roosendaal 2019-01-03 00:18:59 +01:00
  • 670d2fc722 additional tests defined Sander Roosendaal 2019-01-02 23:54:37 +01:00
  • 76d2325797 adding tests to increase coverage Sander Roosendaal 2019-01-02 21:54:25 +01:00
  • 128609968a working with pytest Sander Roosendaal 2019-01-02 20:16:08 +01:00
  • 7fca84f6d8 Merge tag 'v9.05' into develop Sander Roosendaal 2019-01-02 18:02:57 +01:00
  • 8e14c40d80 Merge branch 'release/v9.05' Sander Roosendaal 2019-01-02 18:01:34 +01:00
  • 9394894812 Merge branch 'feature/flexdevpay' into develop Sander Roosendaal 2019-01-02 17:35:02 +01:00
  • 93607d5bf6 Merge tag 'v9.04' into develop Sander Roosendaal 2019-01-02 17:21:31 +01:00
  • 4fd1023896 Merge branch 'release/v9.04' Sander Roosendaal 2019-01-02 17:20:27 +01:00
  • e929e0fcb9 made form flexible Sander Roosendaal 2019-01-02 17:15:59 +01:00
  • 3290f72787 reverting to sandbox on dev Sander Roosendaal 2019-01-02 16:45:23 +01:00
  • 3cd0827661 Merge tag 'v9.03' into develop Sander Roosendaal 2019-01-02 16:20:07 +01:00
  • fc81bb3ae3 Merge branch 'release/v9.03' Sander Roosendaal 2019-01-02 16:18:56 +01:00
  • 8ebdf7c06b changed braintree to production Sander Roosendaal 2019-01-02 16:16:20 +01:00
  • 7a7a2b0ffe Merge branch 'feature/testrefactoring' into develop Sander Roosendaal 2019-01-02 13:06:08 +01:00
  • 21523988aa gitignore change Sander Roosendaal 2019-01-02 12:51:34 +01:00
  • c742f0ee09 coverage folder excluded from git Sander Roosendaal 2019-01-02 12:16:18 +01:00
  • 5f8cca4465 moved tests to tests folder and made it working Sander Roosendaal 2019-01-02 11:33:54 +01:00
  • de67c1f8bb Merge tag 'v9.02' into develop Sander Roosendaal 2019-01-02 10:55:22 +01:00
  • 3da0be5a51 Merge branch 'release/v9.02' Sander Roosendaal 2019-01-02 10:53:56 +01:00
  • 156560dc9e Merge branch 'bugfix/upgrade' into develop Sander Roosendaal 2019-01-02 10:06:15 +01:00
  • 36b99aafea allowing non ascii in workout comments Sander Roosendaal 2019-01-02 10:03:32 +01:00
  • f8c50a71cb there was no bug Sander Roosendaal 2019-01-02 09:53:14 +01:00
  • 43c5981dd3 fixed #402 Sander Roosendaal 2019-01-01 17:36:20 +01:00
  • ef0fa44d34 bug fix Sander Roosendaal 2018-12-31 18:48:43 +01:00
  • 05495e9399 Merge tag 'v9.01' into develop Sander Roosendaal 2018-12-31 17:54:12 +01:00
  • 73681ec475 Merge branch 'release/v9.01' Sander Roosendaal 2018-12-31 17:53:26 +01:00
  • 1ad16c6b68 Merge branch 'feature/betterpayments' into develop Sander Roosendaal 2018-12-31 17:23:36 +01:00
  • 639ab23beb implemented mike's improvement suggestions Sander Roosendaal 2018-12-31 17:21:50 +01:00
  • 117836a102 errors fixed Sander Roosendaal 2018-12-31 16:45:46 +01:00
  • 1968832eba adding white space in paidplans page Sander Roosendaal 2018-12-30 16:34:33 +01:00
  • 7866355385 removing races from plan overview Sander Roosendaal 2018-12-30 15:52:11 +01:00
  • 53bfd170fc swapped order - sync after setting workout type Sander Roosendaal 2018-12-28 08:08:22 +01:00
  • 39c7bff4ef fixed chinese file name Sander Roosendaal 2018-12-27 14:38:08 +01:00
  • e434582e85 Merge branch 'feature/braintree2' into develop Sander Roosendaal 2018-12-24 14:15:34 +01:00
  • a198ebbeaa notification email bug fix Sander Roosendaal 2018-12-24 14:12:52 +01:00
  • 2c431709d3 make button inactive when submitted Sander Roosendaal 2018-12-22 10:16:55 +01:00
  • 9dcf4d8d26 bug fix Sander Roosendaal 2018-12-21 16:19:42 +01:00
  • d8f6f5adb5 Merge tag 'v9.00' into develop Sander Roosendaal 2018-12-21 15:25:10 +01:00
  • 6ceeae36ba Merge branch 'release/v9.00' Sander Roosendaal 2018-12-21 15:24:34 +01:00
  • a9b315e8bf typos corrected in notification emails Sander Roosendaal 2018-12-21 15:17:12 +01:00
  • 3286630931 adding braintree info Sander Roosendaal 2018-12-21 15:04:35 +01:00
  • d4898701c9 time based indoor races on edit page Sander Roosendaal 2018-12-21 13:58:58 +01:00
  • 403d2ace46 Merge branch 'feature/braintree' into develop Sander Roosendaal 2018-12-21 10:46:01 +01:00
  • 73d8d555d1 adding transactions download Sander Roosendaal 2018-12-21 09:46:23 +01:00
  • 98900059f8 better error handling Sander Roosendaal 2018-12-20 21:29:13 +01:00
  • ab9579a048 downgrade notifications Sander Roosendaal 2018-12-20 17:40:32 +01:00
  • 291cd0e56c Merge tag 'v8.75' into develop Sander Roosendaal 2018-12-20 16:25:18 +01:00
  • 9888a04aa3 Merge branch 'hotfix/v8.75' Sander Roosendaal 2018-12-20 16:24:55 +01:00
  • 38050c8759 removed adaptiveclass in call to getagegrouprecords Sander Roosendaal 2018-12-20 16:22:46 +01:00
  • 954bd46bce notification emails Sander Roosendaal 2018-12-20 16:18:28 +01:00
  • a9f11f4f76 confirmation emails to buyers Sander Roosendaal 2018-12-20 15:29:21 +01:00
  • 9272704f36 bugfix Sander Roosendaal 2018-12-19 23:12:32 +01:00
  • 3ff114a307 upgrade done Sander Roosendaal 2018-12-19 22:53:07 +01:00
  • a0a03a90df added subscription_id Sander Roosendaal 2018-12-19 21:51:39 +01:00
  • d70725f2b3 buy now flow complete except email confirmation Sander Roosendaal 2018-12-19 17:23:34 +01:00
  • fa61957be7 simple upgrade/billing address form Sander Roosendaal 2018-12-19 10:33:43 +01:00
  • 0b79b0de98 updated models to add paid plan complexity Sander Roosendaal 2018-12-19 09:25:28 +01:00
  • 75261118c2 adding some model changes around paid plans Sander Roosendaal 2018-12-18 19:22:27 +01:00
  • 6d7d9f5792 billing address to user Sander Roosendaal 2018-12-18 12:39:34 +01:00
  • a9d032ef2f Merge tag 'v8.74' into develop Sander Roosendaal 2018-12-18 11:25:02 +01:00
  • 31b50927cc Merge branch 'hotfix/v8.74' Sander Roosendaal 2018-12-18 11:22:55 +01:00
  • 53619f8380 disallowing HEAD requests Sander Roosendaal 2018-12-18 11:20:34 +01:00
  • 63a6114e0b trying to get country info Sander Roosendaal 2018-12-17 22:39:11 +01:00
  • 7d981cbf0a Merge branch 'develop' into feature/braintree Sander Roosendaal 2018-12-17 20:51:47 +01:00
  • a74e701b41 Merge tag 'v8.73' into develop Sander Roosendaal 2018-12-17 20:45:20 +01:00
  • 53cc69c8af Merge branch 'release/v8.73' Sander Roosendaal 2018-12-17 20:44:19 +01:00
  • ee76ce0093 mock Session not working without net Sander Roosendaal 2018-12-17 20:42:29 +01:00