15099 Commits

Author SHA1 Message Date
76686dde61 Added admin setting for specifying priority days. 2014-06-17 13:42:03 +02:00
b97999d6df People with their own seminar now have priority when it comes to opposing new seminars. 2014-06-17 13:39:13 +02:00
Golrokh Moattar
c4446d3962 test fixed 2014-06-17 11:24:32 +02:00
Golrokh Moattar
c604c9864f Fixed reviewing tab 2014-06-17 11:15:24 +02:00
0178882058 The text answers when filling in a peer review are now automatically saved. 2014-06-17 09:50:44 +02:00
e410af6656 Stop test from failing if it takes > 0ms to run 2014-06-17 09:38:49 +02:00
8fd559ab12 Sonar 2014-06-17 09:24:25 +02:00
c812557575 Merge remote-tracking branch 'origin/develop' into develop 2014-06-17 09:21:46 +02:00
17dc1efebb Re-ordered columns. 2014-06-17 09:21:41 +02:00
ae2f4e13b6 Added status column to reviewer deadline followup. 2014-06-17 09:20:02 +02:00
2240080687 Styled headers in tables enhanced by the DataTable plugin. 2014-06-17 09:16:33 +02:00
Golrokh Moattar
b02dca5e9f Role Student changed to Author 2014-06-17 09:14:54 +02:00
Golrokh Moattar
97e0400ccb Role Student changed to Author 2014-06-17 09:14:25 +02:00
edbc44171d Added requested date. 2014-06-17 09:13:44 +02:00
Golrokh Moattar
8918ee8096 Role Student changed to Author 2014-06-16 15:06:33 +02:00
Golrokh Moattar
5c2ce7e35e Role Employee changed to Supervisor 2014-06-16 13:49:25 +02:00
Golrokh Moattar
86d70eeaa6 test fixed 2014-06-16 13:21:17 +02:00
Golrokh Moattar
729c231e4e two separate columns for reviewers thesis approvals 2014-06-16 13:03:52 +02:00
051100f233 Escape ' in JavascriptEventConfirmation. 2014-06-13 16:42:11 +02:00
234d43dfe4 Removed unfinished stuff. 2014-06-13 16:14:27 +02:00
700d6be161 Changed final seminar approval deadlines to use the new way of checking per decision rather than the whole reviewer approval. 2014-06-13 11:50:33 +02:00
f0fa6d9b13 Merge remote-tracking branch 'origin/develop' into develop 2014-06-13 11:50:06 +02:00
f307215738 Added fake NonWorkDayPeriodService to the ReviewingModuleTest 2014-06-13 11:50:02 +02:00
golrokh
cfea2313c8 Merge remote-tracking branch 'origin/develop' into develop 2014-06-13 11:32:58 +02:00
golrokh
ba6c0c0316 fixed updating of address in footer 2014-06-13 11:32:44 +02:00
71da45739a Changed rough draft deadlines to use the new way of checking per decision rather than the whole reviewer approval. 2014-06-13 11:26:12 +02:00
0c7ab5ed19 Forgot one place. 2014-06-13 10:57:54 +02:00
c4e4816754 Merge remote-tracking branch 'origin/develop' into develop 2014-06-13 10:56:53 +02:00
4b27a5b54c Changed getDeadline to getCurrentDeadline (working with the latest decision) and now takes into account non-working days. 2014-06-13 10:56:48 +02:00
golrokh
7ad531b559 fixed null id problem with footer address 2014-06-13 10:41:49 +02:00
0722416ac4 Added getDeadline to Decision. Refactored isLate to use the new getDeadline. Will hang in an infinite loop if every day is a holiday. 2014-06-13 10:26:42 +02:00
3417d57ee8 Renamed migration script since 160 got taken. 2014-06-12 15:58:26 +02:00
5819ba14be Merge remote-tracking branch 'origin/develop' into develop 2014-06-12 15:56:10 +02:00
bb16703678 [SCIPRO-17846] SciPro is not stateless. 2014-06-12 15:55:56 +02:00
b12a1fbf5e Added request and decision date to decision class. Can now determine if the decision is late or not. 2014-06-12 15:24:23 +02:00
Golrokh Moattar
e3a152b115 updatable footer address 2014-06-12 13:59:42 +02:00
Golrokh Moattar
4d7d2f59b7 updatable footer address 2014-06-12 13:23:47 +02:00
fred-fri
e0756bfb86 Merge branch 'users' into develop 2014-06-10 14:45:56 +09:00
fred-fri
6cd40be8b3 cleanup 2014-06-10 14:45:02 +09:00
fred-fri
57c9c134fa working on user page 2014-06-10 12:48:53 +09:00
e67ee9c1ee Fixed last missing method for the workaround for the Wicket bug. 2014-06-09 14:16:02 +02:00
fred-fri
9fa187b47a working on user form 2014-06-09 15:16:24 +09:00
5a0352143f Fixed test 2014-06-05 15:01:02 +02:00
0f83f35541 Moved ReviewerDeadline stuff to reviewing package. 2014-06-05 15:00:09 +02:00
68de7c366a Styled DataTable sorted column headers. 2014-06-05 14:35:11 +02:00
983370b228 Enabled filtering and removed Bootstrap DataTables CSS since it was only in the way. 2014-06-05 14:31:26 +02:00
327e61162e Added some bottom-margin to the .nav-tabs 2014-06-05 14:30:23 +02:00
a7f52ee7e2 Minor JavaScript fixes. 2014-06-05 14:06:18 +02:00
a1d6bea167 Added help text. 2014-06-05 13:52:52 +02:00
9b6a5dd9b1 Styling and catch the error thrown from DataTable plugin to enable the other JavaScript to run properly. 2014-06-05 13:47:55 +02:00