Private
Public Access
1
0
Commit Graph

2055 Commits

Author SHA1 Message Date
Sander Roosendaal
0f88d004b1 adds distance pieces to OTE ranking piece (PRO)
The PRO ranking piece calculation for erg pieces now also calculates
distance based pieces.
2017-11-18 15:45:51 -07:00
Sander Roosendaal
d0ebf56cef Merge tag 'v5.09' into develop
bug fix
2017-11-17 05:31:42 -07:00
Sander Roosendaal
665b7f7688 Merge branch 'release/v5.09' 2017-11-17 05:31:28 -07:00
Sander Roosendaal
ebc7ff7e8a fixes bug in import all 2017-11-16 08:00:45 -06:00
Sander Roosendaal
c3ad8a8500 solving issue #232 and #234 2017-11-15 20:05:14 -06:00
Sander Roosendaal
7e02f4ab37 Merge tag 'v5.07' into develop
more than 50 C2 workouts to import
2017-11-14 21:55:11 -06:00
Sander Roosendaal
7e8032744f Merge branch 'release/v5.07' 2017-11-14 21:53:02 -06:00
Sander Roosendaal
ffd2abc815 imports more than 50 workouts from C2 2017-11-14 21:49:53 -06:00
Sander Roosendaal
8f3c59fa2f Merge tag 'v5.06' into develop
bug fixes
2017-11-14 00:59:11 +01:00
Sander Roosendaal
343a64c794 Merge branch 'release/v5.06' 2017-11-14 00:56:45 +01:00
Sander Roosendaal
14a10becf1 some bug fixes
Email processing now correctly processes message body on AttributeError
Workflow page now loads correctly - threw Error 500 when user deleted
all his FavoriteCharts
2017-11-13 14:51:28 +01:00
Sander Roosendaal
f1bed2ec4f Merge tag 'v5.05' into develop
improved email queue management
2017-11-10 14:17:33 +01:00
Sander Roosendaal
0028b93f30 Merge branch 'release/v5.05' 2017-11-10 14:17:18 +01:00
Sander Roosendaal
9e636ccd67 more robust for parser errors 2017-11-10 14:10:42 +01:00
Sander Roosendaal
bb77efb6fc bug fix javascript upload 2017-11-10 13:56:04 +01:00
Sander Roosendaal
92e49fe468 Merge branch 'bugfix/emails' into develop 2017-11-10 13:23:58 +01:00
Sander Roosendaal
ec4e756e50 type correction 2017-11-10 12:54:29 +01:00
Sander Roosendaal
4f34668c27 tests if message encoded 2017-11-10 11:53:08 +01:00
Sander Roosendaal
d19ddec79e some fixes email processing 2017-11-10 11:40:47 +01:00
Sander Roosendaal
768d1540e6 Merge tag 'v5.04' into develop
bug fix
2017-11-08 15:28:06 +01:00
Sander Roosendaal
23ff227096 Merge branch 'release/v5.04' 2017-11-08 15:27:49 +01:00
Sander Roosendaal
7acc41fa6f small refinement upload 2017-11-08 15:16:05 +01:00
Sander Roosendaal
29b93a00fd Merge tag 'v5.03' into develop
bug fix
2017-11-08 14:23:22 +01:00
Sander Roosendaal
009ed6db13 Merge branch 'release/v5.03' 2017-11-08 14:22:40 +01:00
Sander Roosendaal
c9b3c03efb http to https on ajax libraries 2017-11-08 14:21:59 +01:00
Sander Roosendaal
5f9292c04c Merge tag 'v5.02' into develop
email checks and supports Quiske
2017-11-08 13:53:27 +01:00
Sander Roosendaal
a5e535c291 Merge branch 'release/v5.02' 2017-11-08 13:53:09 +01:00
Sander Roosendaal
9f96a875d2 better numbering for zip file content 2017-11-08 13:33:25 +01:00
Sander Roosendaal
1489e9c47a checks email for uniqueness upon change 2017-11-08 13:19:25 +01:00
Sander Roosendaal
a5c34c85d1 Merge branch 'feature/betteremailbody' into develop 2017-11-08 11:42:00 +01:00
Sander Roosendaal
cc9a004e92 fix 2017-11-08 11:41:30 +01:00
Sander Roosendaal
7e0e8dcfea added watermark to drag area 2017-11-08 10:20:45 +01:00
Sander Roosendaal
a8eae5911d upload options work in background upload 2017-11-08 09:22:15 +01:00
Sander Roosendaal
70b5529029 alternative natural language for plot,sync,privacy 2017-11-07 22:21:01 +01:00
Sander Roosendaal
518c7fd999 Merge branch 'develop' into feature/betteremailbody 2017-11-07 21:16:35 +01:00
Sander Roosendaal
e7926811d3 Merge tag 'v5.01' into develop
should now also work on safari
2017-11-07 21:09:41 +01:00
Sander Roosendaal
a696f8a155 Merge branch 'hotfix/v5.01' 2017-11-07 21:08:50 +01:00
Sander Roosendaal
4d50a53ee4 upload page tested on various browers
Safari, Chrome on iOS
Firefox, Internet Explorer, Chrome on Windows
Chrome on Android
2017-11-07 21:04:06 +01:00
Sander Roosendaal
5061cbcd1c work in progress: now has alternative way to find chart settings 2017-11-07 17:00:18 +01:00
Sander Roosendaal
9561245756 zip file now with enumerated workout title 2017-11-07 16:09:37 +01:00
Sander Roosendaal
ae3ce88baf Merge tag 'v5.00' into develop
drop and drag upload
2017-11-07 15:20:34 +01:00
Sander Roosendaal
2d3d5dfdbe Merge branch 'release/v5.00' 2017-11-07 15:20:04 +01:00
Sander Roosendaal
b53201be4c last minute bug fix 2017-11-07 15:10:28 +01:00
Sander Roosendaal
75a195394a Merge branch 'feature/ziphandle' into develop 2017-11-07 13:01:52 +01:00
Sander Roosendaal
e22e084552 adds testing of email 2017-11-07 12:56:10 +01:00
Sander Roosendaal
4f9539835f background processed email now create Django_Mailbox message object 2017-11-07 11:15:35 +01:00
Sander Roosendaal
212f6b323c Merge branch 'feature/droparea' into develop 2017-11-07 08:34:46 +01:00
Sander Roosendaal
663576a369 code reduces using request.is_ajax() 2017-11-07 08:32:07 +01:00
Sander Roosendaal
edcd1f1c86 another small cosmetic change 2017-11-06 23:38:24 +01:00
Sander Roosendaal
fe11d30b1a small cosmetic change 2017-11-06 23:32:27 +01:00