Sander Roosendaal
aa6574218a
removed try except around email in tasks.py
2017-10-31 20:55:22 +01:00
Sander Roosendaal
e96c74f4fd
Merge tag 'v4.70' into develop
...
jquery fix
2017-10-31 15:57:13 +01:00
Sander Roosendaal
c6a82acce2
Merge branch 'hotfix/v4.70'
2017-10-31 15:56:49 +01:00
Sander Roosendaal
0c9e1a5748
replaced jquery source with https version
2017-10-31 15:54:43 +01:00
Sander Roosendaal
370b9c3920
Merge tag 'v4.69' into develop
...
hot fix
2017-10-31 15:38:32 +01:00
Sander Roosendaal
5568e0029f
Merge branch 'hotfix/v4.69'
2017-10-31 15:38:13 +01:00
Sander Roosendaal
3ee1b2edbd
hotfix nr 2
2017-10-31 15:36:14 +01:00
Sander Roosendaal
b4981a8899
Merge tag 'v4.68' into develop
...
hotfix
2017-10-31 15:32:44 +01:00
Sander Roosendaal
a423744ba8
Merge branch 'hotfix/v4.68'
2017-10-31 15:32:17 +01:00
Sander Roosendaal
d88ef21e25
added status to no job error
2017-10-31 15:29:48 +01:00
Sander Roosendaal
f7b4ada1af
Merge tag 'v4.67' into develop
...
kill job hotfix
2017-10-31 15:23:39 +01:00
Sander Roosendaal
c5144d7f87
Merge branch 'hotfix/v4.67'
2017-10-31 15:23:19 +01:00
Sander Roosendaal
f952ffa23d
hotfix
2017-10-31 15:20:55 +01:00
Sander Roosendaal
aac6094ac3
Merge tag 'v4.66' into develop
...
major improvement in async task management
2017-10-31 15:08:53 +01:00
Sander Roosendaal
d36530be70
Merge branch 'release/v4.66'
2017-10-31 15:08:06 +01:00
Sander Roosendaal
24482cca8a
removed some debug print statements
2017-10-31 14:57:41 +01:00
Sander Roosendaal
41f348a70d
Merge branch 'feature/autoqueue' into develop
2017-10-31 14:54:41 +01:00
Sander Roosendaal
0ecd8c588d
debugged some odd behavior
2017-10-31 14:52:52 +01:00
Sander Roosendaal
2939accbf2
added myqueue wrapper to teams.py
2017-10-31 11:18:14 +01:00
Sander Roosendaal
8c31f5b778
a wrapper around the task queue
2017-10-31 11:12:00 +01:00
Sander Roosendaal
092d24d9b2
reload uses timeout
2017-10-31 08:37:47 +01:00
Sander Roosendaal
6616fb0ac8
Merge tag 'v4.65' into develop
...
hotfix on import from c2
2017-10-31 07:53:56 +01:00
Sander Roosendaal
541c4841ba
Merge branch 'hotfix/v4.65'
2017-10-31 07:53:02 +01:00
Sander Roosendaal
0949b3cec9
hotfix - check for nan in dataprep windowsize
...
f could get value NaN. Added is not np.isinf()
2017-10-31 07:48:41 +01:00
Sander Roosendaal
473c8e39e7
Merge branch 'feature/betterqueues' into develop
2017-10-30 22:35:34 +01:00
Sander Roosendaal
98abc68289
with jquery to refresh when tasks are complete
...
jquery lives in basebase.html. Perhaps should live in individual pages
2017-10-30 22:32:34 +01:00
Sander Roosendaal
21be4d278b
bux fix
2017-10-30 21:22:07 +01:00
Sander Roosendaal
5fe6db02dc
bug fix
2017-10-30 17:33:58 +01:00
Sander Roosendaal
537b7392e6
works on development - needs testing on production
2017-10-30 17:27:13 +01:00
Sander Roosendaal
c37a0e6b24
Merge tag 'v4.64' into develop
...
CP chart recalc improvements
2017-10-29 21:15:50 +01:00
Sander Roosendaal
cd5daedb39
Merge branch 'release/v4.64'
2017-10-29 21:14:59 +01:00
Sander Roosendaal
060e9bc283
Merge branch 'feature/workflowconfig' into develop
2017-10-29 21:06:16 +01:00
Sander Roosendaal
40fedbe4c4
bug fix nr of comments on workflow middle panel
2017-10-29 21:04:31 +01:00
Sander Roosendaal
13fc8e1fed
import now defaults to default landing page
2017-10-29 21:00:40 +01:00
Sander Roosendaal
60447b8d30
default landing page toggle button on workflow config
2017-10-29 20:52:24 +01:00
Sander Roosendaal
6b793724ed
redis monitor for CP update jobs
...
Stores job id in a cookie. Upon reload, checks if job is still busy. If
busy, no new jobs are started. Some messaging for users to give them
information about the job status.
2017-10-27 11:52:47 +02:00
Sander Roosendaal
c0f785ed3b
Merge tag 'v4.63' into develop
...
bug fix
2017-10-26 23:19:26 +02:00
Sander Roosendaal
6a898e2211
Merge branch 'hotfix/v4.63'
2017-10-26 23:18:07 +02:00
Sander Roosendaal
32efe6b7eb
bug fix hopefully
2017-10-26 23:16:15 +02:00
Sander Roosendaal
ff1696cd43
Merge tag 'v4.62' into develop
...
alternative OTE ranking page
2017-10-26 23:01:11 +02:00
Sander Roosendaal
eccf5f8069
Merge branch 'release/v4.62'
2017-10-26 23:00:44 +02:00
Sander Roosendaal
70c8098f11
Merge branch 'feature/altranking' into develop
2017-10-26 22:56:54 +02:00
Sander Roosendaal
7152971bfd
forgot to save views.py
2017-10-26 22:55:19 +02:00
Sander Roosendaal
29243516ae
does Alternative OTE ranking
...
added an OTE ranking piece calculator based on manually added ranking
instead of automatically detected ranking
2017-10-26 22:53:02 +02:00
Sander Roosendaal
0f5c49de62
slightly improved email processing
2017-10-26 22:15:01 +02:00
Sander Roosendaal
f13f0a9a7c
Merge tag 'v4.61' into develop
...
bug fix
2017-10-26 19:10:28 +02:00
Sander Roosendaal
5c3186cd83
Merge branch 'hotfix/v4.61'
2017-10-26 19:10:01 +02:00
Sander Roosendaal
50a17f97ac
bug fix flex chart
2017-10-26 19:08:22 +02:00
Sander Roosendaal
94a94a7496
Merge tag 'v4.6' into develop
...
asynchronous ranking calculations
2017-10-26 18:50:17 +02:00
Sander Roosendaal
39ca755c59
Merge branch 'release/v4.6'
2017-10-26 18:49:38 +02:00
