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 |
|
Sander Roosendaal
|
188c48aca1
|
got most of it working now
|
2017-11-06 23:23:52 +01:00 |
|
Sander Roosendaal
|
76a69236aa
|
Merge tag 'v4.93' into develop
recognizes KML
|
2017-11-06 22:13:21 +01:00 |
|
Sander Roosendaal
|
4d27fb2286
|
Merge branch 'release/v4.93'
|
2017-11-06 22:10:02 +01:00 |
|
Sander Roosendaal
|
6e06e38cef
|
adds two more coxswain calls
|
2017-11-06 21:44:51 +01:00 |
|
Sander Roosendaal
|
9ea2720dc9
|
recognizes and refuses kml (through email)
|
2017-11-06 17:06:05 +01:00 |
|
Sander Roosendaal
|
1f477d3b7c
|
stops on error
|
2017-11-06 16:56:38 +01:00 |
|
Sander Roosendaal
|
c6346f9ed2
|
small change
|
2017-11-06 15:39:11 +01:00 |
|
Sander Roosendaal
|
355329dd36
|
drag/drop is working
|
2017-11-06 15:21:36 +01:00 |
|
Sander Roosendaal
|
2b1df1438c
|
css
|
2017-11-06 12:02:17 +01:00 |
|
Sander Roosendaal
|
13f62e465f
|
Merge tag 'v4.92' into develop
typo fix
|
2017-11-05 19:52:18 +01:00 |
|
Sander Roosendaal
|
27d265c68a
|
Merge branch 'hotfix/v4.92'
|
2017-11-05 19:52:06 +01:00 |
|
Sander Roosendaal
|
23a7e0855a
|
typo fix
|
2017-11-05 19:51:28 +01:00 |
|
Sander Roosendaal
|
ad3401bb24
|
Merge tag 'v4.91' into develop
fixed tasks
|
2017-11-05 19:46:32 +01:00 |
|
Sander Roosendaal
|
f4958e67a2
|
Merge branch 'hotfix/v4.91'
|
2017-11-05 19:46:22 +01:00 |
|
Sander Roosendaal
|
7b518516a0
|
background tasks must be able to accept jobkey keyword
|
2017-11-05 19:43:27 +01:00 |
|
Sander Roosendaal
|
7329f42aa8
|
Merge tag 'v4.9' into develop
lazy loading!
|
2017-11-05 17:31:11 +01:00 |
|
Sander Roosendaal
|
7e6a8c1a95
|
Merge branch 'release/v4.9'
|
2017-11-05 17:31:01 +01:00 |
|
Sander Roosendaal
|
9b14d7f0c7
|
cox's calls on workflow
|
2017-11-05 17:30:21 +01:00 |
|
Sander Roosendaal
|
6727125a01
|
Merge branch 'feature/countingstrokes' into develop
|
2017-11-05 17:24:00 +01:00 |
|
Sander Roosendaal
|
1a5d2e35f4
|
lazy loads trend flex, boxplot, cum_flex
|
2017-11-05 17:22:59 +01:00 |
|
Sander Roosendaal
|
5337560bca
|
lazy loads box chart
|
2017-11-05 13:12:29 +01:00 |
|