Private
Public Access
1
0
Commit Graph

1997 Commits

Author SHA1 Message Date
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
Sander Roosendaal
8bb7e9bfc2 Merge tag 'v4.80' into develop
has new signup email and protection against big file timeouts
2017-11-02 18:32:40 +01:00
Sander Roosendaal
aac9a68ffc Merge branch 'release/v4.80' 2017-11-02 18:32:03 +01:00
Sander Roosendaal
bee89206cd new welcome email 2017-11-02 18:20:13 +01:00
Sander Roosendaal
c974927192 processes files > 1 MB offline 2017-11-02 15:53:54 +01:00
Sander Roosendaal
c871d69097 emailprocessing stops in a controlled way 2017-11-02 10:27:05 +01:00
Sander Roosendaal
b94ef5e5ac added secret password to /rowers/record-progress 2017-11-02 09:25:19 +01:00
Sander Roosendaal
7347c8548f Merge tag 'v4.79' into develop
manually created job id for rq
2017-11-02 08:42:25 +01:00
Sander Roosendaal
1635bd460d Merge branch 'release/v4.79' 2017-11-02 08:41:52 +01:00
Sander Roosendaal
b17cf3d6dd sets own job ID on RQ jobs in production 2017-11-02 08:32:55 +01:00
Sander Roosendaal
df7577813f Merge tag 'v4.78' into develop
settings in non django way
2017-11-01 23:17:07 +01:00
Sander Roosendaal
96c52cfcee Merge branch 'release/v4.78' 2017-11-01 23:16:32 +01:00
Sander Roosendaal
a08861b17b site_url in non django way 2017-11-01 23:09:50 +01:00
Sander Roosendaal
59fc248925 Merge tag 'v4.77' into develop
fix bug
2017-11-01 22:57:57 +01:00
Sander Roosendaal
150ea91edf Merge branch 'release/v4.77' 2017-11-01 22:57:17 +01:00
Sander Roosendaal
6ff95a3ab6 bug fix progress posting 2017-11-01 22:52:33 +01:00
Sander Roosendaal
f2039a2533 Merge tag 'v4.76' into develop
post progress to url approach
2017-11-01 22:46:08 +01:00
Sander Roosendaal
994d3bcac5 Merge branch 'release/v4.76' 2017-11-01 22:45:25 +01:00