Private
Public Access
1
0

Commit Graph

  • 965d44cd37 further tests debug Sander Roosendaal 2018-03-23 13:45:05 +01:00
  • a72863deec changes in tests to accomodate rower has opted in to gdpr Sander Roosendaal 2018-03-23 13:36:12 +01:00
  • 5f5e873fbd activate GDPR Sander Roosendaal 2018-03-23 08:47:05 +01:00
  • 639473e2f8 registration email from template Sander Roosendaal 2018-03-20 18:44:33 +01:00
  • 05f44f6547 Merge branch 'feature/emailtemplates' into develop Sander Roosendaal 2018-03-20 10:00:58 +01:00
  • 04aaeea5db changes email processing Sander Roosendaal 2018-03-20 10:00:11 +01:00
  • 3cd05e9660 mail processing confirmation uses template Sander Roosendaal 2018-03-20 09:43:26 +01:00
  • d39451544a Merge tag 'v6.32' into develop Sander Roosendaal 2018-03-20 08:32:52 +01:00
  • bfe42f21ae Merge branch 'hotfix/v6.32' Sander Roosendaal 2018-03-20 08:31:29 +01:00
  • e4db31f0ba fixes and moved send_template_email to emails.py Sander Roosendaal 2018-03-20 08:29:22 +01:00
  • 2df42a015c Merge tag 'v6.31' into develop Sander Roosendaal 2018-03-19 23:16:01 +01:00
  • 4885101c50 Merge branch 'hotfix/v6.31' Sander Roosendaal 2018-03-19 23:15:40 +01:00
  • 450ef130c6 fix Sander Roosendaal 2018-03-19 23:14:39 +01:00
  • 9381300967 Merge tag 'v6.30' into develop Sander Roosendaal 2018-03-19 23:09:57 +01:00
  • 1e986e650a Merge branch 'hotfix/v6.30' Sander Roosendaal 2018-03-19 23:09:37 +01:00
  • 166eefeae4 fix Sander Roosendaal 2018-03-19 23:08:31 +01:00
  • 89938aa528 Merge tag 'v6.29' into develop Sander Roosendaal 2018-03-19 23:03:21 +01:00
  • e7c7c4c281 Merge branch 'hotfix/v6.29' Sander Roosendaal 2018-03-19 23:02:49 +01:00
  • 9d46190e85 fixing using jinja2 Sander Roosendaal 2018-03-19 23:01:32 +01:00
  • 553a21220b Merge tag 'v6.28' into develop Sander Roosendaal 2018-03-19 22:12:26 +01:00
  • e162cbd9b5 Merge branch 'hotfix/v6.28' Sander Roosendaal 2018-03-19 22:11:55 +01:00
  • ff4a095c04 trying change in envri Sander Roosendaal 2018-03-19 22:09:54 +01:00
  • 2e6766de2c Merge tag 'v6.27' into develop Sander Roosendaal 2018-03-19 21:27:02 +01:00
  • 1dcffc4852 Merge branch 'release/v6.27' Sander Roosendaal 2018-03-19 21:26:15 +01:00
  • c4b34c5d37 Merge branch 'feature/htmlemail' into develop Sander Roosendaal 2018-03-19 21:18:38 +01:00
  • a466990b5c smaller logo in emails Sander Roosendaal 2018-03-19 21:16:02 +01:00
  • ea30428f6e a few more templates Sander Roosendaal 2018-03-19 21:08:45 +01:00
  • ffed5c694b bug fix in email templates Sander Roosendaal 2018-03-19 18:05:30 +01:00
  • 0dadcf32a6 a few more templates Sander Roosendaal 2018-03-19 17:48:47 +01:00
  • e7e2ced5f5 a few new email templates Sander Roosendaal 2018-03-19 15:49:57 +01:00
  • b744eff7f6 added breakthrough notification Sander Roosendaal 2018-03-19 14:47:40 +01:00
  • 5afb2477cf cleaning up email templates Sander Roosendaal 2018-03-19 12:44:41 +01:00
  • 073533f1a9 fixed nan values in updatefitnessmetric Sander Roosendaal 2018-03-19 10:23:39 +01:00
  • 240210d43e first use of email templates Sander Roosendaal 2018-03-18 20:15:48 +01:00
  • 4d962d4f52 Merge tag 'v6.26' into develop Sander Roosendaal 2018-03-18 10:37:09 +01:00
  • dda047749f Merge branch 'release/v6.26' Sander Roosendaal 2018-03-18 10:36:19 +01:00
  • 7613b95031 Merge branch 'feature/importantemail' into develop Sander Roosendaal 2018-03-18 10:25:43 +01:00
  • f249565ab3 added raise500 for superuser to check Sander Roosendaal 2018-03-18 10:24:24 +01:00
  • f5f6de50c6 logic around emailbounces Sander Roosendaal 2018-03-18 10:17:01 +01:00
  • 77bb53466e added emailbounced keyword to tasks Sander Roosendaal 2018-03-18 09:55:49 +01:00
  • 4f1433830e Merge tag 'v6.25' into develop Sander Roosendaal 2018-03-17 20:14:58 +01:00
  • 6f7ebe6c34 Merge branch 'release/v6.25' Sander Roosendaal 2018-03-17 20:12:41 +01:00
  • 33fb1f5086 changed settings to use AWS SES for outgoing email Sander Roosendaal 2018-03-17 19:49:29 +01:00
  • c15d68f3fe Merge branch 'feature/emailbounce' into develop Sander Roosendaal 2018-03-17 19:40:29 +01:00
  • d3e3aa1343 reset emailbounced when user changes email Sander Roosendaal 2018-03-17 19:39:03 +01:00
  • d64cc9485d email bounce added and updated privacy policy Sander Roosendaal 2018-03-17 19:21:38 +01:00
  • 9e514d2578 search for inf in update fitness metrics Sander Roosendaal 2018-03-17 18:10:04 +01:00
  • c72cb70e35 changed AWS SES region to eu-west Sander Roosendaal 2018-03-17 14:40:57 +01:00
  • cdb857f4e4 Merge tag 'v6.24' into develop Sander Roosendaal 2018-03-16 19:50:07 +01:00
  • b0f0143bd5 Merge branch 'hotfix/v6.24' Sander Roosendaal 2018-03-16 19:49:23 +01:00
  • 1c8f80494c workouts without power Sander Roosendaal 2018-03-16 19:47:21 +01:00
  • ce974ee884 AWS working on localhost in debug mode Sander Roosendaal 2018-03-16 16:08:06 +01:00
  • 4cdb3f4e68 improved timezone handling of workout edit save form Sander Roosendaal 2018-03-16 12:23:41 +01:00
  • 977824d462 added complete date to partially complete sessions Sander Roosendaal 2018-03-16 11:43:42 +01:00
  • 0d9a1ce6c1 Merge tag 'v6.23' into develop Sander Roosendaal 2018-03-16 10:56:18 +01:00
  • b5e79c5141 Merge branch 'release/v6.23' Sander Roosendaal 2018-03-16 10:51:49 +01:00
  • fd34ab54a6 adding try except in comparison chart Sander Roosendaal 2018-03-16 09:29:23 +01:00
  • 758d528aef Merge tag 'v6.22' into develop Sander Roosendaal 2018-03-16 08:47:42 +01:00
  • f754d84043 Merge branch 'release/v6.22' Sander Roosendaal 2018-03-16 08:46:41 +01:00
  • 7384c8c8ad added robotx.txt & improved comparison chart Sander Roosendaal 2018-03-16 08:38:55 +01:00
  • 0ec64b5683 Merge tag 'v6.21' into develop Sander Roosendaal 2018-03-15 16:30:06 +01:00
  • ba10822978 Merge branch 'release/v6.21' Sander Roosendaal 2018-03-15 16:28:46 +01:00
  • 76805304d0 removed print statement Sander Roosendaal 2018-03-15 08:28:28 +01:00
  • fd0ab1d225 Merge tag 'v6.20' into develop Sander Roosendaal 2018-03-14 21:14:47 +01:00
  • 248aa18dde Merge branch 'release/v6.20' Sander Roosendaal 2018-03-14 21:12:55 +01:00
  • 5ba8fc6eda c2 import total distance now includes rest strokes Sander Roosendaal 2018-03-14 20:58:52 +01:00
  • b502244733 adding extra parameters to X axis flex chart Sander Roosendaal 2018-03-14 13:39:52 +01:00
  • f890ffa019 Merge tag 'v6.19' into develop Sander Roosendaal 2018-03-14 11:22:20 +01:00
  • 182c409fe3 Merge branch 'release/v6.19' Sander Roosendaal 2018-03-14 11:22:07 +01:00
  • cf0511b5a5 to_csv email list encoding utf 8 Sander Roosendaal 2018-03-14 11:20:16 +01:00
  • 5df2bac258 Merge tag 'v6.18' into develop Sander Roosendaal 2018-03-14 11:15:06 +01:00
  • 46ca6af01a Merge branch 'release/v6.18' Sander Roosendaal 2018-03-14 11:13:11 +01:00
  • 8b8fe6d431 removed non working line in update_records Sander Roosendaal 2018-03-14 11:10:00 +01:00
  • a28a31f6bc Merge branch 'bugfix/dates' into develop Sander Roosendaal 2018-03-14 10:59:27 +01:00
  • be26c732ce improved date processing for otwranking Sander Roosendaal 2018-03-14 10:54:55 +01:00
  • 99e924caf7 better links for date range on oterankings Sander Roosendaal 2018-03-14 10:50:30 +01:00
  • 7c3539c1c2 adding get email list management command Sander Roosendaal 2018-03-14 09:55:35 +01:00
  • cdbf2459ed bug fixes Sander Roosendaal 2018-03-13 08:11:09 +01:00
  • a76931b918 typo correction on teamcreate.html Sander Roosendaal 2018-03-12 18:15:32 +01:00
  • 79aa8279c2 removing power > 2000W from CP chart Sander Roosendaal 2018-03-12 13:38:41 +01:00
  • dc42b3fe28 bug fix getmaxwattinterval Sander Roosendaal 2018-03-12 13:01:22 +01:00
  • 53de235886 Merge tag 'thumbnails' into develop Sander Roosendaal 2018-03-12 08:35:50 +01:00
  • 6e962703b6 Merge branch 'hotfix/thumbnails' Sander Roosendaal 2018-03-12 08:35:25 +01:00
  • 4f006e828e bugfix loading nonexisting thumbnails Sander Roosendaal 2018-03-12 08:14:32 +01:00
  • b235e98923 typo fix Sander Roosendaal 2018-03-11 19:25:41 +01:00
  • 737d205c8b Merge tag 'v6.17' into develop Sander Roosendaal 2018-03-11 19:21:27 +01:00
  • 441d5bd39f Merge branch 'release/v6.17' Sander Roosendaal 2018-03-11 19:20:00 +01:00
  • de4ec80f64 bug fixed on clone session Sander Roosendaal 2018-03-11 19:03:47 +01:00
  • 26254c87ac link bug fix Sander Roosendaal 2018-03-11 11:43:51 +01:00
  • 06633f1a89 linebreaks in workflow workout notes Sander Roosendaal 2018-03-11 11:30:03 +01:00
  • 4e39a7d598 Merge tag 'v6.16' into develop Sander Roosendaal 2018-03-11 11:17:47 +01:00
  • 5f118f9438 Merge branch 'release/v6.16' Sander Roosendaal 2018-03-11 11:05:45 +01:00
  • a94912e124 wrapping text in some tables Sander Roosendaal 2018-03-11 10:54:57 +01:00
  • 843a94c579 Merge tag 'v6.15' into develop Sander Roosendaal 2018-03-10 17:04:44 +01:00
  • e40ae0a6a6 Merge branch 'release/v6.15' Sander Roosendaal 2018-03-10 16:48:50 +01:00
  • 4c1a2a7450 added form processing for preferreddate Sander Roosendaal 2018-03-10 16:27:48 +01:00
  • be6d343b21 Merge tag 'v6.14' into develop Sander Roosendaal 2018-03-10 15:55:06 +01:00
  • c6562f2e81 Merge branch 'release/v6.14' Sander Roosendaal 2018-03-10 15:54:08 +01:00
  • 9af1ebc9db adding preffereddate to session and tooltip on workout Sander Roosendaal 2018-03-10 15:48:23 +01:00
  • 22bc518bf2 Merge tag 'v6.13' into develop Sander Roosendaal 2018-03-09 13:20:20 +01:00