Private
Public Access
1
0
Commit Graph

2014 Commits

Author SHA1 Message Date
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
Sander Roosendaal
911cb204d1 delayed load of data on cum_flex
Ajax call to load data for cumulative flex chart. It works. Yay!
2017-11-05 12:03:30 +01:00
Sander Roosendaal
f0e345c689 Added a waiting message to workflow.html 2017-11-05 09:34:29 +01:00
Sander Roosendaal
cff3cfb50b Merge branch 'feature/loadthumbnails' into develop 2017-11-04 20:34:54 +01:00
Sander Roosendaal
7fd17fb3b4 loads thumbnails asynchronously
loads thumbnails on workflow view asynchronously using jQuery and Ajax
2017-11-04 20:28:58 +01:00
Sander Roosendaal
80f4ca585b able to load scripts but cannot get them to go to the right place
Work in progress
2017-11-04 17:12:40 +01:00
Sander Roosendaal
54f06baf48 some more sofistication in the upload form 2017-11-04 16:14:09 +01:00
Sander Roosendaal
1c8d27df4f Merge tag 'v4.82' into develop
improved upload page
2017-11-04 15:46:27 +01:00
Sander Roosendaal
748cf8f3de Merge branch 'release/v4.82' 2017-11-04 15:45:56 +01:00
Sander Roosendaal
bc941b3670 added thumbnail Ajax endpoint 2017-11-04 15:39:34 +01:00
Sander Roosendaal
aa22ce1b47 upload form now allowing direct uploads between 1MB & 10 MB 2017-11-04 15:19:39 +01:00
Sander Roosendaal
ce22a4173b reversed task list order 2017-11-03 14:15:51 +01:00
Sander Roosendaal
8e0a8181a2 Merge tag 'v4.81' into develop
releasing some improvements
2017-11-03 14:11:05 +01:00
Sander Roosendaal
fdb308a6ac Merge branch 'release/v4.81' 2017-11-03 14:10:37 +01:00
Sander Roosendaal
df82b53018 landingpage sticky in uploadoptions 2017-11-03 13:53:59 +01:00
Sander Roosendaal
657e9e9cd0 has "Make Ranking" on left panel workflow page 2017-11-03 13:39:53 +01:00
Sander Roosendaal
e19b3631f1 fixed issue #226: notes dont show up in fav chart library 2017-11-03 12:50:03 +01:00
Sander Roosendaal
c07c6311ca reload only on selected pages
Doesn't refresh page when a form has been edited
2017-11-03 12:37:26 +01:00
Sander Roosendaal
89fb917707 Merge branch 'feature/physicsprogress' into develop 2017-11-03 09:26:45 +01:00
Sander Roosendaal
b266881858 configuration of Physics calc to report progress
Needs rowingdata >= 1.3.2
2017-11-03 09:23:51 +01:00
Sander Roosendaal
f1694793b0 unfinished business
Need to create a post_progress view taking progress and job id as a POST
parameter so that we can send the entire url to rowingdata
2017-11-02 23:10:35 +01:00