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 |
|
|
|
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 |
|
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 |
|
|
|
ac5f25b07e
|
I18n and sorting of rough draft and final seminar approvals.
|
2014-06-05 13:16:06 +02:00 |
|
|
|
b9a0177133
|
Added tabs to the reviewer deadline followup for the four different steps.
|
2014-06-05 12:59:11 +02:00 |
|
|
|
8edaa7ea23
|
Show late rough draft approvals and final seminar approvals.
|
2014-06-05 12:50:13 +02:00 |
|
|
|
7d940e6b46
|
Fixed tests.
|
2014-06-05 10:33:11 +02:00 |
|
|
|
15698adbfe
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-06-05 09:47:40 +02:00 |
|
|
|
f82e783f7e
|
Added feedback when saving activity plan as template.
Wicket ajax... :(
|
2014-06-05 09:47:27 +02:00 |
|
|
|
3efd2d7793
|
Added title to the "Save as template" dialog.
|
2014-06-05 09:16:52 +02:00 |
|
fred-fri
|
ebf07e0264
|
adding program crud
|
2014-06-05 14:14:15 +09:00 |
|
|
|
ab785872bc
|
Added feedback panel to save as template panel to show error if name is not filled out.
|
2014-06-04 15:39:09 +02:00 |
|
|
|
5cace5398b
|
Removed stupid callback and made SaveAsTemplatePanel testable.
|
2014-06-04 15:08:31 +02:00 |
|
|
|
c6ee21847f
|
Refactoring.
|
2014-06-04 14:48:13 +02:00 |
|
|
|
9b09285a50
|
Removed stupid User parameter.
|
2014-06-04 14:46:04 +02:00 |
|
|
|
0b4cc37dad
|
Refactoring.
|
2014-06-04 14:42:26 +02:00 |
|
|
|
24c15394f5
|
Fixed test.
|
2014-06-04 14:38:45 +02:00 |
|
|
|
2103d91940
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-06-04 11:17:06 +02:00 |
|
|
|
81686695be
|
Tiny refactor.
|
2014-06-04 10:15:58 +02:00 |
|
fred-fri
|
f1040984aa
|
added reviewer deadlines
|
2014-06-04 16:43:27 +09:00 |
|
fred-fri
|
8ef62b63cb
|
added reviewer deadline settings
|
2014-06-04 14:21:42 +09:00 |
|
fred-fri
|
b4b8280c47
|
added check that makes sure the selected final seminar start date is not a non work day
|
2014-06-04 10:27:57 +09:00 |
|
|
|
b3e261e755
|
Stupid names with apostrophes.
Escapes ' in the javascript confirmation message.
|
2014-06-03 16:12:54 +02:00 |
|
fred-fri
|
c693c144a9
|
test fix
|
2014-06-03 12:48:52 +09:00 |
|
fred-fri
|
05d0a9101d
|
better unit handling
|
2014-06-03 12:22:07 +09:00 |
|
fred-fri
|
bb835438a8
|
better research area handling
|
2014-06-03 11:59:40 +09:00 |
|
fred-fri
|
4ec22bc071
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-06-03 10:28:20 +09:00 |
|
fred-fri
|
f4301df5b2
|
better keyword handling
|
2014-06-03 10:27:46 +09:00 |
|
|
|
5f5aad4326
|
Made the supervisor final thesis panel part of the grading module.
|
2014-06-02 16:51:12 +02:00 |
|
Golrokh Moattar
|
725d4e574e
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-06-02 16:26:13 +02:00 |
|
