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 |
|
Sander Roosendaal
|
12bb31553b
|
small bug fixes
|
2018-06-18 14:07:42 +02:00 |
|
Sander Roosendaal
|
77e52ac9c1
|
fxed submission with teams
|
2018-06-18 12:30:56 +02:00 |
|
Sander Roosendaal
|
521aa945fd
|
Merge tag 'v6.94' into develop
bug fix
|
2018-06-15 08:12:59 +02:00 |
|
Sander Roosendaal
|
9e8e93e638
|
Merge branch 'release/v6.94'
|
2018-06-15 08:12:44 +02:00 |
|
Sander Roosendaal
|
3997b0ac08
|
bugfix & save data to strokedata table
|
2018-06-15 07:52:44 +02:00 |
|
Sander Roosendaal
|
d89cb831f1
|
Merge tag 'v6.93' into develop
release
|
2018-06-14 21:16:05 +02:00 |
|
Sander Roosendaal
|
29974633e3
|
Merge branch 'release/v6.93'
|
2018-06-14 21:15:35 +02:00 |
|
Sander Roosendaal
|
fe9d29a465
|
split smooth interval back to 15 sec
|
2018-06-14 21:13:21 +02:00 |
|
Sander Roosendaal
|
93696cfb62
|
enlarged smooth window
|
2018-06-14 16:50:38 +02:00 |
|
Sander Roosendaal
|
2d7f2af364
|
Merge tag 'v6.92' into develop
bug fixes
|
2018-06-14 13:16:57 +02:00 |
|
Sander Roosendaal
|
60046efc39
|
Merge branch 'release/v6.92'
|
2018-06-14 13:14:39 +02:00 |
|
Sander Roosendaal
|
72be79d932
|
Merge branch 'bugfix/power' into develop
|
2018-06-14 12:33:30 +02:00 |
|
Sander Roosendaal
|
e3f6cf0e3f
|
better value for normv
|
2018-06-14 11:45:41 +02:00 |
|
Sander Roosendaal
|
b1a8e84bd5
|
improved form processing in summary edit
|
2018-06-14 11:38:00 +02:00 |
|
Sander Roosendaal
|
a14517154c
|
Merge branch 'feature/useradmin' into develop
|
2018-06-14 10:33:59 +02:00 |
|
Sander Roosendaal
|
c1cb399ed0
|
tried to customize password_reset.html
|
2018-06-14 10:33:18 +02:00 |
|
Sander Roosendaal
|
3bbc014c42
|
user admin better organized
|
2018-06-14 08:35:52 +02:00 |
|
Sander Roosendaal
|
c8d1eb4be4
|
Merge tag 'v6.91' into develop
MVP of intervals by pace/power
|
2018-06-13 21:45:56 +02:00 |
|
Sander Roosendaal
|
061fe8a997
|
Merge branch 'release/v6.91'
|
2018-06-13 21:45:40 +02:00 |
|
Sander Roosendaal
|
973195c93b
|
Merge branch 'feature/powerintervals' into develop
|
2018-06-13 21:15:41 +02:00 |
|
Sander Roosendaal
|
f9167c1b88
|
changes
|
2018-06-13 21:14:33 +02:00 |
|
Sander Roosendaal
|
48632841da
|
Merge tag 'v6.90' into develop
more sticky rankingonly
|
2018-06-12 20:56:06 +02:00 |
|
Sander Roosendaal
|
e30e639048
|
Merge branch 'release/v6.90'
|
2018-06-12 20:54:22 +02:00 |
|
Sander Roosendaal
|
8a9984a24d
|
making rankingonly sticky
|
2018-06-12 20:53:28 +02:00 |
|