Sander Roosendaal
|
3d9ee2aa22
|
added ascii utf filter to messages around comments
|
2018-04-04 17:32:18 +02:00 |
|
Sander Roosendaal
|
1ce5ba2a17
|
no change
|
2018-04-03 14:59:45 +02:00 |
|
Sander Roosendaal
|
a9ec2316d9
|
Merge tag 'v6.36' into develop
oauth improvements & rower names
|
2018-04-02 09:40:17 +02:00 |
|
Sander Roosendaal
|
48aa7da798
|
Merge branch 'release/v6.36'
|
2018-04-02 09:36:45 +02:00 |
|
Sander Roosendaal
|
d6c471d0e0
|
change rower replaced with name
|
2018-04-01 20:15:52 +02:00 |
|
Sander Roosendaal
|
f479d7438b
|
Merge branch 'feature/oauth' into develop
|
2018-03-31 07:03:21 -07:00 |
|
Sander Roosendaal
|
692883b8e0
|
host names on developers.html
|
2018-03-31 07:01:45 -07:00 |
|
Sander Roosendaal
|
bfe6fc3111
|
slight update of developers.html
|
2018-03-31 06:54:26 -07:00 |
|
Sander Roosendaal
|
7fd376b8f8
|
Merge branch 'feature/nkoauth' into develop
|
2018-03-30 16:10:29 -07:00 |
|
Sander Roosendaal
|
8c4b4cce73
|
updated developers.html
|
2018-03-30 16:09:36 -07:00 |
|
Sander Roosendaal
|
ff15f6e2f7
|
small change
|
2018-03-30 16:03:42 -07:00 |
|
Sander Roosendaal
|
f711bd8214
|
added NK EMpower parameters to api strokedata
|
2018-03-29 18:24:13 -07:00 |
|
Sander Roosendaal
|
867706a6ca
|
Merge branch 'bugfix/coachview' into develop
|
2018-03-29 18:10:42 -07:00 |
|
Sander Roosendaal
|
73148c858e
|
Merge tag 'v6.35' into develop
fix underarmour sync error
|
2018-03-29 17:36:34 -07:00 |
|
Sander Roosendaal
|
d0c11a5c22
|
Merge branch 'release/v6.35'
|
2018-03-29 17:34:40 -07:00 |
|
Sander Roosendaal
|
0ed6a4c9e1
|
removed redundant file
|
2018-03-29 17:05:33 -07:00 |
|
Sander Roosendaal
|
5e8d639ef2
|
Merge tag 'uaupload' into develop
bug fix in token refresh under armour
|
2018-03-29 17:05:15 -07:00 |
|
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
|
cf3a3e227d
|
debugging oauth
|
2018-03-29 11:22:05 -07:00 |
|
Sander Roosendaal
|
b134d1cba6
|
improved team coach view
|
2018-03-28 08:32:12 -07:00 |
|
Sander Roosendaal
|
bad96133a5
|
fixed team session coach view
|
2018-03-28 08:17:23 -07:00 |
|
Sander Roosendaal
|
4f735beb98
|
provision for empty data frame in new workout
|
2018-03-26 03:30:17 -07:00 |
|
Sander Roosendaal
|
30a94ae965
|
Merge tag 'v6.34' into develop
new email commands
|
2018-03-25 20:52:57 +02: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 |
|