Private
Public Access
1
0
Commit Graph

6540 Commits

Author SHA1 Message Date
Sander Roosendaal
47e5ab40d5 Merge branch 'release/v14.93' 2021-01-02 21:25:56 +01:00
Sander Roosendaal
b1585f0790 Merge branch 'feature/duplicatesync' into develop 2021-01-02 21:25:32 +01:00
Sander Roosendaal
e36237a928 no sync for duplicates 2021-01-02 21:25:15 +01:00
Sander Roosendaal
a8c0fb666e sync stops if row is duplicate 2021-01-02 21:18:23 +01:00
Sander Roosendaal
5b77c479b6 Merge branch 'release/v14.92' 2021-01-02 19:10:36 +01:00
Sander Roosendaal
3acfa9d4a0 removing print statements 2021-01-01 11:02:47 +01:00
Sander Roosendaal
96b4b641b6 better api processing (sets duplicate) 2020-12-31 16:33:55 +01:00
Sander Roosendaal
65e580dd92 new python 3.8.6 install - new requirements.txt 2020-12-31 14:08:58 +01:00
Sander Roosendaal
b07de9e967 removing apilog 2020-12-31 11:22:21 +01:00
Sander Roosendaal
f8c44b3c3e adding apilog.log to gitignore 2020-12-31 11:22:06 +01:00
Sander Roosendaal
a85d19c008 improved api logging 2020-12-31 07:13:12 +01:00
Sander Roosendaal
e55682edd0 refactoring and adding email confirmation / trimp calc to api v2 2020-12-31 06:56:50 +01:00
Sander Roosendaal
11cec956b7 fix 2020-12-31 06:30:24 +01:00
Sander Roosendaal
c41718f782 Merge branch 'release/v14.91' 2020-12-29 12:48:29 +01:00
Sander Roosendaal
0b3312d033 improved logging api 2020-12-29 12:44:17 +01:00
Sander Roosendaal
c094cf4761 upgraded rowingdata 2020-12-28 22:05:26 +01:00
Sander Roosendaal
625db38e8a fix permission 2020-12-28 20:51:33 +01:00
Sander Roosendaal
9592c947af Merge branch 'release/v14.90' 2020-12-28 19:56:31 +01:00
Sander Roosendaal
c1b4717c24 fix 2020-12-28 19:51:00 +01:00
Sander Roosendaal
2e48fba67a fixing the fix 2020-12-28 19:49:38 +01:00
Sander Roosendaal
eba9fdaf0a Merge branch 'release/v14.89' 2020-12-28 17:25:04 +01:00
Sander Roosendaal
c497e17f1f adding code to pass tests (cleaning) 2020-12-28 17:23:13 +01:00
Sander Roosendaal
3deb558050 fixing a data selection bug (multiple workouts) 2020-12-28 15:49:23 +01:00
Sander Roosendaal
1b5693826c Merge branch 'release/v14.88' 2020-12-28 12:39:02 +01:00
Sander Roosendaal
0621f73f81 fix for api 2020-12-28 12:35:08 +01:00
Sander Roosendaal
e0cfb1de1c fix 2020-12-21 17:06:07 +01:00
Sander Roosendaal
07930f6181 improved types for c2 import of bike 2020-12-17 09:13:03 +01:00
Sander Roosendaal
eb42e9b892 Merge branch 'release/v14.87' 2020-12-17 08:49:08 +01:00
Sander Roosendaal
1fa7a8c9a2 better use of comments in C2 import 2020-12-17 08:48:36 +01:00
Sander Roosendaal
72d57de068 Merge branch 'release/v14.86' 2020-12-16 15:17:12 +01:00
Sander Roosendaal
f3f35750bb add 2020-12-16 15:16:56 +01:00
Sander Roosendaal
00e4deed76 Merge branch 'release/v14.85' 2020-12-16 08:45:16 +01:00
Sander Roosendaal
a20de1f576 removing debug code 2020-12-16 08:40:24 +01:00
Sander Roosendaal
1092101bfe fixing power cleaning 2020-12-16 08:39:58 +01:00
Sander Roosendaal
6a2811924e Merge branch 'release/v14.84' 2020-12-15 13:53:47 +01:00
Sander Roosendaal
ed6e4ff8fc fx 2020-12-15 13:53:34 +01:00
Sander Roosendaal
3f347c7e19 Merge branch 'release/v14.83' 2020-12-15 13:43:47 +01:00
Sander Roosendaal
c7ac802f47 fix 2020-12-15 13:43:35 +01:00
Sander Roosendaal
d307a538af Merge branch 'release/v14.82' 2020-12-15 13:24:37 +01:00
Sander Roosendaal
e7b9ba4c24 fix #593 updated colormap 2020-12-15 12:57:44 +01:00
Sander Roosendaal
cc13a3b8bd Merge branch 'feature/historyfix' into develop 2020-12-15 08:39:17 +01:00
Sander Roosendaal
05c137898c only flaw now is bar colors not equal to pie colors 2020-12-15 08:39:06 +01:00
Sander Roosendaal
b798a16172 fix mean power in history 2020-12-15 08:28:08 +01:00
Sander Roosendaal
920a56ec7e Merge branch 'release/v14.81' 2020-12-14 21:55:11 +01:00
Sander Roosendaal
55b1157737 fix bug 2020-12-14 21:45:33 +01:00
Sander Roosendaal
f1aae25d02 Merge branch 'release/v14.80' 2020-12-11 14:56:44 +01:00
Sander Roosendaal
325a8adc13 adding a counter 2020-12-11 14:56:27 +01:00
Sander Roosendaal
f1b2195064 Merge branch 'release/v14.79' 2020-12-11 14:47:50 +01:00
Sander Roosendaal
9755f3feb0 fixing a bug 2020-12-11 14:45:46 +01:00
Sander Roosendaal
e527c0d2c9 Merge branch 'release/v14.78' 2020-12-11 08:24:20 +01:00