sanderroosendaal
|
02a12585a2
|
removed static plots from commit
|
2016-11-07 14:47:26 +01:00 |
|
sanderroosendaal
|
bbcbee2bb1
|
Merge tag 'bugfix_c2callback' into develop
bugfix_c2callback
|
2016-11-07 14:25:38 +01:00 |
|
sanderroosendaal
|
bb43018fda
|
Merge branch 'release/bugfix_c2callback'
|
2016-11-07 14:25:05 +01:00 |
|
sanderroosendaal
|
51de3f9c5e
|
Fixed bug when user pressed Red Deny Access button on C2 logbook
|
2016-11-07 14:20:51 +01:00 |
|
sanderroosendaal
|
57243e3187
|
Updated
|
2016-11-06 18:52:59 +01:00 |
|
sanderroosendaal
|
52f6d180df
|
Merge branch 'feature/restapitesting' into develop
|
2016-11-06 17:56:41 +01:00 |
|
sanderroosendaal
|
1a1b1d403f
|
Added simple test for C2 Stroke data
|
2016-11-06 17:55:51 +01:00 |
|
sanderroosendaal
|
689749567b
|
Merge tag 'dragfactor' into develop
Dragfactor 1.1
|
2016-11-06 17:02:19 +01:00 |
|
sanderroosendaal
|
aa02d10bfc
|
Merge branch 'release/dragfactor'
|
2016-11-06 17:02:02 +01:00 |
|
sanderroosendaal
|
3a1bee888f
|
Merge branch 'feature/dragfactor' into develop
|
2016-11-06 16:58:26 +01:00 |
|
sanderroosendaal
|
d1a8bacc9a
|
Updated C2 import function to add zero drag factor
|
2016-11-06 16:57:35 +01:00 |
|
sanderroosendaal
|
464550deb9
|
Added minimock and created new class in tests.py - work in progress
|
2016-11-06 16:35:41 +01:00 |
|
sanderroosendaal
|
cb4784e214
|
Edited settings.py to make mail processing work
|
2016-11-05 13:39:18 +01:00 |
|
sanderroosendaal
|
a32fdcf636
|
Merge branch 'master' into develop
|
2016-11-03 15:17:18 +01:00 |
|
sanderroosendaal
|
08120c5192
|
Merge branch 'master' of https://bitbucket.org/sanderroosendaal/rowsandall
|
2016-11-03 15:12:21 +01:00 |
|
sanderroosendaal
|
57938ef19d
|
Merge tag 'dataprep' into develop
dataprep
|
2016-11-03 15:10:04 +01:00 |
|
sanderroosendaal
|
7006ccc008
|
Merge branch 'release/dataprep'
|
2016-11-03 15:09:43 +01:00 |
|
sanderroosendaal
|
3cba8e5e45
|
Fixed Ranking distances
|
2016-11-03 12:03:56 +01:00 |
|
sanderroosendaal
|
8a0518d7eb
|
All Interactive plots now use the dataprep functions
|
2016-11-03 10:26:59 +01:00 |
|
sanderroosendaal
|
902357ba5c
|
gitignore updated
|
2016-11-02 21:14:03 +01:00 |
|
Sander
|
ff4cc5dfa2
|
Merge branch 'master' of bitbucket.org:sanderroosendaal/rowsandall
Conflicts:
manage.py
|
2016-11-02 21:07:18 +01:00 |
|
Sander
|
7ab14e8980
|
added manage.py to gitignore
|
2016-11-02 21:04:50 +01:00 |
|
sanderroosendaal
|
04c1b2ef13
|
Added manage.py to git
|
2016-11-02 20:50:56 +01:00 |
|
sanderroosendaal
|
886d5417ed
|
Added manage.py to gitignore
|
2016-11-02 20:46:28 +01:00 |
|
sanderroosendaal
|
0b1f542e26
|
Added media to gitignore
|
2016-11-02 20:41:45 +01:00 |
|
sanderroosendaal
|
c39bffc8ed
|
Added /media to gitignore
|
2016-11-02 20:40:50 +01:00 |
|
sanderroosendaal
|
a14ab53415
|
Flex Chart updated
|
2016-11-02 17:41:54 +01:00 |
|
sanderroosendaal
|
030e2df146
|
Merge tag 'c2import' into develop
1.0.6
|
2016-11-01 22:42:01 +01:00 |
|
sanderroosendaal
|
47569c23c4
|
Merge branch 'hotfix/c2import'
c2import
|
2016-11-01 22:41:41 +01:00 |
|
sanderroosendaal
|
23266b02c0
|
Fixed Concept2 Import bug (empty notes field)
|
2016-11-01 22:38:56 +01:00 |
|
sanderroosendaal
|
9d2633bfde
|
Finished improving cum_flex chart
|
2016-11-01 22:08:33 +01:00 |
|
sanderroosendaal
|
01ea80c539
|
Make plotintervals more rational (dataprep) - continue at cum_flex
|
2016-11-01 17:43:46 +01:00 |
|
sanderroosendaal
|
a892188e85
|
Added fillna to pace and time calculations
|
2016-11-01 10:02:10 +01:00 |
|
sanderroosendaal
|
4dd42d43c7
|
Rewrote interactiveplots to use timedelta everywhere for time and pace
|
2016-11-01 09:48:03 +01:00 |
|
sanderroosendaal
|
12c3ead542
|
Merge tag 'paceline' into develop
1.0.4
|
2016-10-31 21:19:02 +01:00 |
|
sanderroosendaal
|
86ad96d6c0
|
Merge branch 'hotfix/paceline'
paceline
|
2016-10-31 21:18:26 +01:00 |
|
sanderroosendaal
|
cc93ec9ccb
|
Fixed bugs for pace rendering on charts and in text
|
2016-10-31 21:16:08 +01:00 |
|
sanderroosendaal
|
5a280afd0b
|
Merge tag 'twitter' into develop
1.0.2
|
2016-10-31 19:18:43 +01:00 |
|
sanderroosendaal
|
3298259400
|
Merge branch 'release/twitter'
twitter
|
2016-10-31 19:18:20 +01:00 |
|
sanderroosendaal
|
7f92f1f4d4
|
Added Twitter and Bitbucket to contact/email page
|
2016-10-31 19:16:59 +01:00 |
|
sanderroosendaal
|
8bc3699e12
|
Merge branch 'feature/timedelta' into develop
|
2016-10-31 17:30:24 +01:00 |
|
sanderroosendaal
|
17a7e236b8
|
Fixed some time rendering bugs
|
2016-10-31 17:29:30 +01:00 |
|
sanderroosendaal
|
faf23c3162
|
Changed get_datetimes to timedelta
|
2016-10-31 16:57:58 +01:00 |
|
sanderroosendaal
|
1806d8a36b
|
Merge tag 'emailsubject' into develop
1.0.1
|
2016-10-31 16:37:39 +01:00 |
|
sanderroosendaal
|
21db90ffe9
|
Merge branch 'release/emailsubject'
emailsubject
|
2016-10-31 16:37:19 +01:00 |
|
sanderroosendaal
|
0a0e21ae07
|
If name is empty, name will be set to - imported through email -
|
2016-10-31 16:31:54 +01:00 |
|
sanderroosendaal
|
caedf5392f
|
Merge tag 'sliders' into develop
1.0.0
|
2016-10-31 15:54:49 +01:00 |
|
sanderroosendaal
|
c66b309e11
|
Merge branch 'release/sliders'
sliders
|
2016-10-31 15:54:23 +01:00 |
|
sanderroosendaal
|
042a83f254
|
sliders final
|
2016-10-31 15:53:31 +01:00 |
|
sanderroosendaal
|
7fb67ff176
|
publishing sliders
|
2016-10-31 15:52:12 +01:00 |
|