Sander Roosendaal
|
4ceb7d04d1
|
Merge branch 'hotfix/uaupload'
|
2018-03-29 17:04:52 -07:00 |
|
Sander Roosendaal
|
b600c03d5b
|
bug fix
|
2018-03-29 17:03:09 -07:00 |
|
Sander Roosendaal
|
bf92a63f6e
|
Merge branch 'release/v6.34'
|
2018-03-25 20:51:20 +02:00 |
|
Sander Roosendaal
|
1560757e74
|
Merge branch 'feature/mailcommands' into develop
|
2018-03-25 20:43:00 +02:00 |
|
Sander Roosendaal
|
e1eab77a52
|
add workouttype & boattype to email processing
|
2018-03-25 20:31:12 +02:00 |
|
Sander Roosendaal
|
15dbbef449
|
added boattype and workouttype to YAML workout commands
|
2018-03-25 17:52:02 +02:00 |
|
Sander Roosendaal
|
a9345a66b5
|
improved order of sessions / coach view
|
2018-03-24 14:44:49 +01:00 |
|
Sander Roosendaal
|
dfbeaae1fa
|
first by preferreddate - order plannsedsessions
|
2018-03-23 14:44:13 +01:00 |
|
Sander Roosendaal
|
d8aa97f515
|
Merge tag 'v6.33' into develop
GDPR release
|
2018-03-23 14:29:28 +01:00 |
|
Sander Roosendaal
|
efa8091218
|
Merge branch 'release/v6.33'
|
2018-03-23 14:27:29 +01:00 |
|
Sander Roosendaal
|
abf413b306
|
further tests.py refinement
|
2018-03-23 14:15:21 +01:00 |
|
Sander Roosendaal
|
965d44cd37
|
further tests debug
|
2018-03-23 13:45:05 +01:00 |
|
Sander Roosendaal
|
a72863deec
|
changes in tests to accomodate rower has opted in to gdpr
|
2018-03-23 13:36:12 +01:00 |
|
Sander Roosendaal
|
5f5e873fbd
|
activate GDPR
|
2018-03-23 08:47:05 +01:00 |
|
Sander Roosendaal
|
639473e2f8
|
registration email from template
|
2018-03-20 18:44:33 +01:00 |
|
Sander Roosendaal
|
05f44f6547
|
Merge branch 'feature/emailtemplates' into develop
|
2018-03-20 10:00:58 +01:00 |
|
Sander Roosendaal
|
04aaeea5db
|
changes email processing
|
2018-03-20 10:00:11 +01:00 |
|
Sander Roosendaal
|
3cd05e9660
|
mail processing confirmation uses template
|
2018-03-20 09:43:26 +01:00 |
|
Sander Roosendaal
|
d39451544a
|
Merge tag 'v6.32' into develop
fixes
|
2018-03-20 08:32:52 +01:00 |
|
Sander Roosendaal
|
bfe42f21ae
|
Merge branch 'hotfix/v6.32'
|
2018-03-20 08:31:29 +01:00 |
|
Sander Roosendaal
|
e4db31f0ba
|
fixes and moved send_template_email to emails.py
|
2018-03-20 08:29:22 +01:00 |
|
Sander Roosendaal
|
2df42a015c
|
Merge tag 'v6.31' into develop
fix
|
2018-03-19 23:16:01 +01:00 |
|
Sander Roosendaal
|
4885101c50
|
Merge branch 'hotfix/v6.31'
|
2018-03-19 23:15:40 +01:00 |
|
Sander Roosendaal
|
450ef130c6
|
fix
|
2018-03-19 23:14:39 +01:00 |
|
Sander Roosendaal
|
9381300967
|
Merge tag 'v6.30' into develop
fix
|
2018-03-19 23:09:57 +01:00 |
|
Sander Roosendaal
|
1e986e650a
|
Merge branch 'hotfix/v6.30'
|
2018-03-19 23:09:37 +01:00 |
|
Sander Roosendaal
|
166eefeae4
|
fix
|
2018-03-19 23:08:31 +01:00 |
|
Sander Roosendaal
|
89938aa528
|
Merge tag 'v6.29' into develop
moving to jinja for email templates
|
2018-03-19 23:03:21 +01:00 |
|
Sander Roosendaal
|
e7c7c4c281
|
Merge branch 'hotfix/v6.29'
|
2018-03-19 23:02:49 +01:00 |
|
Sander Roosendaal
|
9d46190e85
|
fixing using jinja2
|
2018-03-19 23:01:32 +01:00 |
|
Sander Roosendaal
|
553a21220b
|
Merge tag 'v6.28' into develop
trying different tasks.py settings
|
2018-03-19 22:12:26 +01:00 |
|
Sander Roosendaal
|
e162cbd9b5
|
Merge branch 'hotfix/v6.28'
|
2018-03-19 22:11:55 +01:00 |
|
Sander Roosendaal
|
ff4a095c04
|
trying change in envri
|
2018-03-19 22:09:54 +01:00 |
|
Sander Roosendaal
|
2e6766de2c
|
Merge tag 'v6.27' into develop
release email templates
|
2018-03-19 21:27:02 +01:00 |
|
Sander Roosendaal
|
1dcffc4852
|
Merge branch 'release/v6.27'
|
2018-03-19 21:26:15 +01:00 |
|
Sander Roosendaal
|
c4b34c5d37
|
Merge branch 'feature/htmlemail' into develop
|
2018-03-19 21:18:38 +01:00 |
|
Sander Roosendaal
|
a466990b5c
|
smaller logo in emails
|
2018-03-19 21:16:02 +01:00 |
|
Sander Roosendaal
|
ea30428f6e
|
a few more templates
|
2018-03-19 21:08:45 +01:00 |
|
Sander Roosendaal
|
ffed5c694b
|
bug fix in email templates
|
2018-03-19 18:05:30 +01:00 |
|
Sander Roosendaal
|
0dadcf32a6
|
a few more templates
|
2018-03-19 17:48:47 +01:00 |
|
Sander Roosendaal
|
e7e2ced5f5
|
a few new email templates
|
2018-03-19 15:49:57 +01:00 |
|
Sander Roosendaal
|
b744eff7f6
|
added breakthrough notification
|
2018-03-19 14:47:40 +01:00 |
|
Sander Roosendaal
|
5afb2477cf
|
cleaning up email templates
|
2018-03-19 12:44:41 +01:00 |
|
Sander Roosendaal
|
073533f1a9
|
fixed nan values in updatefitnessmetric
|
2018-03-19 10:23:39 +01:00 |
|
Sander Roosendaal
|
240210d43e
|
first use of email templates
|
2018-03-18 20:15:48 +01:00 |
|
Sander Roosendaal
|
4d962d4f52
|
Merge tag 'v6.26' into develop
release bounce
|
2018-03-18 10:37:09 +01:00 |
|
Sander Roosendaal
|
dda047749f
|
Merge branch 'release/v6.26'
|
2018-03-18 10:36:19 +01:00 |
|
Sander Roosendaal
|
7613b95031
|
Merge branch 'feature/importantemail' into develop
|
2018-03-18 10:25:43 +01:00 |
|
Sander Roosendaal
|
f249565ab3
|
added raise500 for superuser to check
|
2018-03-18 10:24:24 +01:00 |
|
Sander Roosendaal
|
f5f6de50c6
|
logic around emailbounces
|
2018-03-18 10:17:01 +01:00 |
|