Sander Roosendaal
|
6bcdc0e44c
|
mail template improvement
|
2018-06-27 09:52:21 +02:00 |
|
Sander Roosendaal
|
e849f670ea
|
Merge tag 'v7.02' into develop
hotfix
|
2018-06-27 09:30:40 +02:00 |
|
Sander Roosendaal
|
c776dddc9a
|
Merge branch 'hotfix/v7.02'
|
2018-06-27 09:30:26 +02:00 |
|
Sander Roosendaal
|
301f33e813
|
hotfix strava auto import
|
2018-06-27 09:29:44 +02:00 |
|
Sander Roosendaal
|
783cc4b08d
|
Merge tag 'v7.01' into develop
releasing autostrava
|
2018-06-27 07:53:29 +02:00 |
|
Sander Roosendaal
|
852c5c0dfd
|
Merge branch 'release/v7.01'
|
2018-06-27 07:51:10 +02:00 |
|
Sander Roosendaal
|
39c2c23842
|
Merge branch 'feature/refactoring' into develop
|
2018-06-26 13:16:15 +02:00 |
|
Sander Roosendaal
|
bc173cbd9a
|
changed tests to use NoTokenError
|
2018-06-26 13:15:31 +02:00 |
|
Sander Roosendaal
|
55dd757823
|
removed some more old notokenerrors
|
2018-06-26 12:54:27 +02:00 |
|
Sander Roosendaal
|
3dc998d623
|
C2NoTokenError = NoTokenError
|
2018-06-26 12:50:36 +02:00 |
|
Sander Roosendaal
|
586cc2b209
|
unified all notokenerrors
|
2018-06-26 12:20:24 +02:00 |
|
Sander Roosendaal
|
0152c8d20b
|
removing some duplicate code
|
2018-06-26 12:14:00 +02:00 |
|
Sander Roosendaal
|
2350d5aedf
|
bug fix
|
2018-06-26 08:07:23 +02:00 |
|
Sander Roosendaal
|
8e14d3e87b
|
Merge branch 'feature/autostrava' into develop
|
2018-06-25 22:22:08 +02:00 |
|
Sander Roosendaal
|
8c2c995aab
|
seems to auto import well
|
2018-06-25 22:08:47 +02:00 |
|
Sander Roosendaal
|
b313726478
|
sort of works
|
2018-06-25 18:59:47 +02:00 |
|
Sander Roosendaal
|
90dcb2f4f9
|
sort of working
|
2018-06-25 18:42:16 +02:00 |
|
Sander Roosendaal
|
1e9caf244c
|
Merge branch 'develop' into feature/autostrava
|
2018-06-25 17:24:37 +02:00 |
|
Sander Roosendaal
|
84cba40065
|
added workstrokesonly keyword to empower force curve
|
2018-06-25 12:52:22 +02:00 |
|
Sander Roosendaal
|
19ded52e57
|
missing request info
|
2018-06-25 11:46:12 +02:00 |
|
Sander Roosendaal
|
a2c0048ba1
|
small bug fixes
|
2018-06-25 10:22:39 +02:00 |
|
Sander Roosendaal
|
ddab8080fb
|
Merge tag 'v7.00' into develop
bug fix
|
2018-06-22 17:25:11 +02:00 |
|
Sander Roosendaal
|
9ddd6e6b7f
|
Merge branch 'release/v7.00'
|
2018-06-22 17:24:52 +02:00 |
|
Sander Roosendaal
|
6e73ab2d69
|
bug fix interval coloring
|
2018-06-22 17:02:51 +02:00 |
|
Sander Roosendaal
|
80cbcb9512
|
not working yet, need to complete in tasks.py
|
2018-06-22 16:45:19 +02:00 |
|
Sander Roosendaal
|
486f47bbb4
|
Merge branch 'feature/autoc2import' into develop
|
2018-06-22 14:42:08 +02:00 |
|
Sander Roosendaal
|
82ad2d90db
|
concept2 auto import
|
2018-06-22 14:40:49 +02:00 |
|
Sander Roosendaal
|
c7c7199a7b
|
added ritmo time logo
|
2018-06-22 12:50:34 +02:00 |
|
Sander Roosendaal
|
aad5020723
|
Merge tag 'v6.99' into develop
bug fix
|
2018-06-21 21:58:20 +02:00 |
|
Sander Roosendaal
|
0852401a60
|
Merge branch 'hotfix/v6.99'
|
2018-06-21 21:57:31 +02:00 |
|
Sander Roosendaal
|
40a4774178
|
bug fix
|
2018-06-21 21:56:26 +02:00 |
|
Sander Roosendaal
|
d19029cb0b
|
Merge tag 'v6.98' into develop
better pop ups
|
2018-06-21 21:25:05 +02:00 |
|
Sander Roosendaal
|
3f44f0e8df
|
Merge branch 'release/v6.98'
|
2018-06-21 21:23:21 +02:00 |
|
Sander Roosendaal
|
7482c6e9e3
|
improved pop ups
|
2018-06-21 21:18:51 +02:00 |
|
Sander Roosendaal
|
e17e5f5a86
|
adding drive energy
|
2018-06-21 18:52:23 +02:00 |
|
Sander Roosendaal
|
9661bb2124
|
solving issue #331
|
2018-06-21 18:13:04 +02:00 |
|
Sander Roosendaal
|
172ea9e974
|
Merge tag 'v6.97' into develop
bug fix
|
2018-06-21 14:18:37 +02:00 |
|
Sander Roosendaal
|
dfe7658e6a
|
Merge branch 'hotfix/v6.97'
|
2018-06-21 14:18:20 +02:00 |
|
Sander Roosendaal
|
29972188fd
|
changed color to violet and fixed bug
|
2018-06-21 14:17:23 +02:00 |
|
Sander Roosendaal
|
127bac8c8f
|
Merge tag 'v6.96' into develop
ritmo support
|
2018-06-21 13:57:43 +02:00 |
|
Sander Roosendaal
|
8fa5221251
|
Merge branch 'release/v6.96'
|
2018-06-21 13:57:29 +02:00 |
|
Sander Roosendaal
|
a794b96bdf
|
error correction
|
2018-06-21 13:56:28 +02:00 |
|
Sander Roosendaal
|
19faa93877
|
Merge tag 'v6.95' into develop
intervals pink
|
2018-06-21 13:51:18 +02:00 |
|
Sander Roosendaal
|
b718d5c47f
|
Merge branch 'release/v6.95'
|
2018-06-21 13:50:39 +02:00 |
|
Sander Roosendaal
|
adbb91dddd
|
localization off in summary_edit
|
2018-06-21 13:47:58 +02:00 |
|
Sander Roosendaal
|
67b9879f7f
|
code reuse
|
2018-06-21 11:07:39 +02:00 |
|
Sander Roosendaal
|
a8ca762ee9
|
ritmotime implemented
|
2018-06-20 20:30:01 +02:00 |
|
Sander Roosendaal
|
4ec6dd2a4e
|
Merge branch 'feature/intervals' into develop
|
2018-06-20 15:46:56 +02:00 |
|
Sander Roosendaal
|
ddc8d08c3f
|
coloring pink
|
2018-06-20 15:44:01 +02:00 |
|
Sander Roosendaal
|
d7b7b0b6d4
|
graying out the intervals
|
2018-06-19 22:17:36 +02:00 |
|