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 |
|
Sander Roosendaal
|
77bb53466e
|
added emailbounced keyword to tasks
|
2018-03-18 09:55:49 +01:00 |
|
Sander Roosendaal
|
4f1433830e
|
Merge tag 'v6.25' into develop
changing to AWS for outgoing email
|
2018-03-17 20:14:58 +01:00 |
|
Sander Roosendaal
|
6f7ebe6c34
|
Merge branch 'release/v6.25'
|
2018-03-17 20:12:41 +01:00 |
|
Sander Roosendaal
|
33fb1f5086
|
changed settings to use AWS SES for outgoing email
|
2018-03-17 19:49:29 +01:00 |
|
Sander Roosendaal
|
c15d68f3fe
|
Merge branch 'feature/emailbounce' into develop
|
2018-03-17 19:40:29 +01:00 |
|
Sander Roosendaal
|
d3e3aa1343
|
reset emailbounced when user changes email
|
2018-03-17 19:39:03 +01:00 |
|
Sander Roosendaal
|
d64cc9485d
|
email bounce added and updated privacy policy
|
2018-03-17 19:21:38 +01:00 |
|
Sander Roosendaal
|
9e514d2578
|
search for inf in update fitness metrics
|
2018-03-17 18:10:04 +01:00 |
|
Sander Roosendaal
|
c72cb70e35
|
changed AWS SES region to eu-west
|
2018-03-17 14:40:57 +01:00 |
|
Sander Roosendaal
|
cdb857f4e4
|
Merge tag 'v6.24' into develop
bug fix
|
2018-03-16 19:50:07 +01:00 |
|
Sander Roosendaal
|
b0f0143bd5
|
Merge branch 'hotfix/v6.24'
|
2018-03-16 19:49:23 +01:00 |
|
Sander Roosendaal
|
1c8f80494c
|
workouts without power
|
2018-03-16 19:47:21 +01:00 |
|
Sander Roosendaal
|
ce974ee884
|
AWS working on localhost in debug mode
|
2018-03-16 16:08:06 +01:00 |
|
Sander Roosendaal
|
4cdb3f4e68
|
improved timezone handling of workout edit save form
|
2018-03-16 12:23:41 +01:00 |
|
Sander Roosendaal
|
977824d462
|
added complete date to partially complete sessions
|
2018-03-16 11:43:42 +01:00 |
|
Sander Roosendaal
|
0d9a1ce6c1
|
Merge tag 'v6.23' into develop
bug fix
|
2018-03-16 10:56:18 +01:00 |
|
Sander Roosendaal
|
b5e79c5141
|
Merge branch 'release/v6.23'
|
2018-03-16 10:51:49 +01:00 |
|
Sander Roosendaal
|
fd34ab54a6
|
adding try except in comparison chart
|
2018-03-16 09:29:23 +01:00 |
|
Sander Roosendaal
|
758d528aef
|
Merge tag 'v6.22' into develop
robots.txt & improved comparison
|
2018-03-16 08:47:42 +01:00 |
|
Sander Roosendaal
|
f754d84043
|
Merge branch 'release/v6.22'
|
2018-03-16 08:46:41 +01:00 |
|
Sander Roosendaal
|
7384c8c8ad
|
added robotx.txt & improved comparison chart
|
2018-03-16 08:38:55 +01:00 |
|
Sander Roosendaal
|
0ec64b5683
|
Merge tag 'v6.21' into develop
release
|
2018-03-15 16:30:06 +01:00 |
|
Sander Roosendaal
|
ba10822978
|
Merge branch 'release/v6.21'
|
2018-03-15 16:28:46 +01:00 |
|
Sander Roosendaal
|
76805304d0
|
removed print statement
|
2018-03-15 08:28:28 +01:00 |
|
Sander Roosendaal
|
fd0ab1d225
|
Merge tag 'v6.20' into develop
c2 import improved
|
2018-03-14 21:14:47 +01:00 |
|
Sander Roosendaal
|
248aa18dde
|
Merge branch 'release/v6.20'
|
2018-03-14 21:12:55 +01:00 |
|
Sander Roosendaal
|
5ba8fc6eda
|
c2 import total distance now includes rest strokes
|
2018-03-14 20:58:52 +01:00 |
|