fred-fri
|
6c11df307c
|
fixed hierarchy
|
2014-03-26 15:18:40 +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 |
|
|
|
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
|
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
|
a2ead31d40
|
filter fix
|
2014-03-25 11:39:50 +09:00 |
|
fred-fri
|
35b6329e36
|
typo
|
2014-03-25 11:14:23 +09:00 |
|
Emil Siverhall
|
b649d650f2
|
review completed by label to authors view review page
|
2014-03-24 20:11:51 +01:00 |
|
Emil Siverhall
|
a6e6edbf5c
|
unused methods/services
|
2014-03-24 16:42:20 +01:00 |
|
Golrokh Moattar
|
d3dab29ed6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-24 16:30:23 +01:00 |
|
Golrokh Moattar
|
1cc1ff4252
|
Replace Statistic-Peer with ProjectManagement-Peers
|
2014-03-24 16:29:53 +01:00 |
|
Emil Siverhall
|
cb4b272db8
|
different text if review in progress..
|
2014-03-24 16:28:15 +01:00 |
|
Emil Siverhall
|
0cdc88ea3f
|
allow request submission even when review in progress..
|
2014-03-24 15:55:17 +01:00 |
|
|
|
47c5ed827a
|
Minor HTML changes.
|
2014-03-24 15:32:45 +01:00 |
|
Golrokh Moattar
|
8bda47bc5b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-24 15:31:29 +01:00 |
|
Emil Siverhall
|
2ca6e445f8
|
add/remove methods for active participations
|
2014-03-24 15:27:30 +01:00 |
|
|
|
ae374a1e48
|
Removed test that did nothing.
|
2014-03-24 15:16:39 +01:00 |
|
Golrokh Moattar
|
d2d91b321e
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-24 15:01:23 +01:00 |
|
Golrokh Moattar
|
4fa412c4bc
|
Added ProjectType to Admin>Peers filtering
|
2014-03-24 15:01:05 +01:00 |
|
Emil Siverhall
|
51c2313399
|
removed peer priority from settings
|
2014-03-24 14:53:01 +01:00 |
|
Emil Siverhall
|
2a9c377e14
|
feedback when selection fails
|
2014-03-24 14:30:53 +01:00 |
|
Emil Siverhall
|
bc749f3542
|
count reviews doesn't count expired
|
2014-03-24 14:19:44 +01:00 |
|
Emil Siverhall
|
81a7d6098b
|
peer level settings only available for project types with peer module
|
2014-03-24 14:17:51 +01:00 |
|
Richard
|
f607e03a30
|
Removed help icon from ProjectIdeaStartPage.
Moved help info from modal to the page.
|
2014-03-24 13:14:14 +01:00 |
|
Richard
|
da0d186733
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-03-24 13:06:45 +01:00 |
|
Emil Siverhall
|
bd0a54425c
|
Hide button on request submission panel always visible..
|
2014-03-24 12:58:01 +01:00 |
|
