fred-fri
|
5b3667169d
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2014-03-26 19:06:54 +09:00 |
|
fred-fri
|
aa701d439d
|
test
|
2014-03-26 19:06:24 +09:00 |
|
Golrokh Moattar
|
e437ea7d3f
|
Added FileSource Enum as a property to fileDescription
|
2014-03-26 11:05:49 +01:00 |
|
Golrokh Moattar
|
45c086571d
|
Added a fileSource Column to FileDescriptionTable
|
2014-03-26 11:03:00 +01:00 |
|
Emil Siverhall
|
a8d9f3593e
|
activated/inactivate projects fix
|
2014-03-26 10:58:05 +01:00 |
|
Emil Siverhall
|
7005c8ea7b
|
hide perform review when finished
|
2014-03-26 10:48:18 +01:00 |
|
Emil Siverhall
|
14819f502c
|
ignore exceptions on peer review submission transactional annotation
|
2014-03-26 10:38:48 +01:00 |
|
Richard
|
7817ad0469
|
Added bootstrap styling to radio buttons and checkbox on FinalSeminarDataPanel.
|
2014-03-26 10:36:38 +01:00 |
|
fred-fri
|
b6893d08f1
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2014-03-26 18:15:56 +09:00 |
|
Emil Siverhall
|
bfb96d3681
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-26 10:07:12 +01:00 |
|
Emil Siverhall
|
72c738b756
|
ajax, yay
|
2014-03-26 10:06:55 +01:00 |
|
|
|
b9d5c5545c
|
Disabled "perform a review" link if you are already on that page.
|
2014-03-26 09:44:07 +01:00 |
|
|
|
693f0beee4
|
Remove isThesisFile from FileDescription.
|
2014-03-26 09:39:38 +01:00 |
|
fred-fri
|
aec0017b24
|
bleh
|
2014-03-26 16:48:44 +09:00 |
|
Emil Siverhall
|
c00362e1e6
|
peers
|
2014-03-26 08:26:10 +01:00 |
|
fred-fri
|
6c11df307c
|
fixed hierarchy
|
2014-03-26 15:18:40 +09:00 |
|
fred-fri
|
fa55c0ed13
|
implemented method
|
2014-03-26 14:13:21 +09:00 |
|
fred-fri
|
0f66c3864d
|
changed to ajaxconfirmationlink for deletion
|
2014-03-26 13:43:02 +09:00 |
|
fred-fri
|
91618b29df
|
added confirmation
|
2014-03-26 12:33:47 +09:00 |
|
fred-fri
|
a058027f0a
|
removing label, using body instead
|
2014-03-26 11:53:34 +09:00 |
|
fred-fri
|
d85f708bc7
|
adding linkpanel, just link doesnt render as link
|
2014-03-26 11:30:10 +09:00 |
|
Emil Siverhall
|
f06407fdf2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-25 20:45:52 +01:00 |
|
Emil Siverhall
|
d62d19fe99
|
editing of internal users research areas fixed
|
2014-03-25 20:45:18 +01:00 |
|
Emil Siverhall
|
81804b0e15
|
editing of internal users fixed
|
2014-03-25 20:41:30 +01:00 |
|
Golrokh Moattar
|
a8ff2d2552
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-25 16:57:43 +01:00 |
|
Golrokh Moattar
|
cda2b0d0b7
|
On Admin milestone statistic, milestones can be filtered by projectTypes
|
2014-03-25 16:57:37 +01:00 |
|
Emil Siverhall
|
ae01a6f896
|
supervisor peer menu highlighting
|
2014-03-25 15:56:53 +01:00 |
|
Emil Siverhall
|
5279a06fb3
|
admin peer page extending the wrong base page
|
2014-03-25 15:55:03 +01:00 |
|
Emil Siverhall
|
42212dd2ff
|
menu highlighting not working when being used in abstract parent page
|
2014-03-25 15:54:22 +01:00 |
|
Emil Siverhall
|
e92e9db0d5
|
cleanup
|
2014-03-25 15:53:57 +01:00 |
|
Emil Siverhall
|
0ea13e982b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-25 15:38:50 +01:00 |
|
Emil Siverhall
|
be8a18c36a
|
de-ajaxified tests
|
2014-03-25 15:33:50 +01:00 |
|
Emil Siverhall
|
dd8f4eae82
|
removed useless webmarkupcontainer from comment thread panel
|
2014-03-25 15:26:52 +01:00 |
|
|
|
6a5fa5118e
|
Now only try to export co-supervisors and reviewers who have a Daisy ID.
|
2014-03-25 15:10:07 +01:00 |
|
Emil Siverhall
|
f25c1c8670
|
some de-ajaxification on comment thread panel
|
2014-03-25 15:08:50 +01:00 |
|
|
|
72f5502c9d
|
Fixed test.
|
2014-03-25 14:45:24 +01:00 |
|
|
|
0808fe3540
|
Removed stupid boolean that basically told the submit method not to submit.
|
2014-03-25 14:33:40 +01:00 |
|
Emil Siverhall
|
994d2cb6cb
|
AbstractProjectPeerPage, bye
|
2014-03-25 13:09:36 +01:00 |
|
|
|
c95a75e89d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-25 11:39:19 +01:00 |
|
|
|
c73a5fdb32
|
Editing checklist template questions is now done using event-based javascript. Nobody will ever be able to maintain it :)
|
2014-03-25 11:39:14 +01:00 |
|
Golrokh Moattar
|
54f7a50b6c
|
Fixed styling
|
2014-03-25 10:46:21 +01:00 |
|
Emil Siverhall
|
7bcee1b269
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-25 10:37:41 +01:00 |
|
Golrokh Moattar
|
0be50800f3
|
Added ProjectType filter to Peer Requests Statistic
|
2014-03-25 10:36:22 +01:00 |
|
Emil Siverhall
|
7e788e05b9
|
check co-supervisor and reviewers as well
|
2014-03-25 10:33:28 +01:00 |
|
Emil Siverhall
|
0242aed828
|
only get project types where logged in user is supervisor
|
2014-03-25 10:07:52 +01:00 |
|
Emil Siverhall
|
ee50e5ab30
|
removed inner class MySupervisorMyProjectsPanel since it was the only one overriding SupervisorMyProjectsPanel..
|
2014-03-25 08:51:40 +01:00 |
|
|
|
0b4db492a9
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-25 08:42:42 +01:00 |
|
fred-fri
|
92c6ed4e45
|
line
|
2014-03-25 16:07:15 +09:00 |
|
fred-fri
|
cc2d204374
|
order by
|
2014-03-25 12:35:34 +09:00 |
|
fred-fri
|
a2ead31d40
|
filter fix
|
2014-03-25 11:39:50 +09:00 |
|
