Sander Roosendaal
|
94d2b8b7f5
|
Merge branch 'hotfix/v7.12'
|
2018-06-28 16:15:35 +02:00 |
|
Sander Roosendaal
|
e67e55bbb7
|
fixed
|
2018-06-28 16:14:24 +02:00 |
|
Sander Roosendaal
|
120b105118
|
Merge branch 'hotfix/v7.11'
|
2018-06-28 15:32:03 +02:00 |
|
Sander Roosendaal
|
35b71c0b63
|
through emails now
|
2018-06-28 15:31:21 +02:00 |
|
Sander Roosendaal
|
6acb5d9f49
|
through email now
|
2018-06-28 14:26:08 +02:00 |
|
Sander Roosendaal
|
f3edead9b9
|
Merge branch 'hotfix/v7.10'
|
2018-06-28 13:35:55 +02:00 |
|
Sander Roosendaal
|
13f98d1f54
|
trying reading rdata
|
2018-06-28 13:34:52 +02:00 |
|
Sander Roosendaal
|
3f9ccd3962
|
Merge branch 'hotfix/v7.09'
|
2018-06-28 10:09:22 +02:00 |
|
Sander Roosendaal
|
5eb2edc60f
|
moving save routine to dataprepnodjango
|
2018-06-28 10:07:34 +02:00 |
|
Sander Roosendaal
|
608a773566
|
Merge branch 'hotfix/v7.08'
|
2018-06-27 21:43:30 +02:00 |
|
Sander Roosendaal
|
7b93833056
|
adding message when saving import settings
|
2018-06-27 21:42:32 +02:00 |
|
Sander Roosendaal
|
2f31234aea
|
adding dropna
|
2018-06-27 21:41:11 +02:00 |
|
Sander Roosendaal
|
9439fa33ac
|
Merge branch 'hotfix/v7.07'
|
2018-06-27 21:12:56 +02:00 |
|
Sander Roosendaal
|
ca598438a1
|
removing velo
|
2018-06-27 21:12:05 +02:00 |
|
Sander Roosendaal
|
c15e0f8ad2
|
Merge branch 'hotfix/v7.06'
|
2018-06-27 21:07:50 +02:00 |
|
Sander Roosendaal
|
8c1e953acf
|
changed dict
|
2018-06-27 21:04:53 +02:00 |
|
Sander Roosendaal
|
571d61b22c
|
Merge branch 'hotfix/v7.05'
|
2018-06-27 19:04:03 +02:00 |
|
Sander Roosendaal
|
b78a443a5c
|
another attempt
|
2018-06-27 19:03:27 +02:00 |
|
Sander Roosendaal
|
38139eda15
|
Merge branch 'hotfix/v7.04'
|
2018-06-27 18:23:22 +02:00 |
|
Sander Roosendaal
|
c10c6fafe1
|
improved dataprepnodjango?
|
2018-06-27 18:22:24 +02:00 |
|
Sander Roosendaal
|
f578f9911e
|
Merge branch 'hotfix/v7.03'
|
2018-06-27 15:00:51 +02:00 |
|
Sander Roosendaal
|
cb2c067516
|
no changes
|
2018-06-27 14:59:14 +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
|
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 |
|