6238 Commits

Author SHA1 Message Date
a67ee0fba4 Changed default sort order. 2014-02-21 13:32:57 +01:00
Golrokh Moattar
3f74bd2ec3 Show Feedback message when project updated 2014-02-21 13:30:51 +01:00
fred-fri
549de8ba59 fixing issues 2014-02-21 20:05:16 +09:00
Emil Siverhall
b242993fb6 pass page parameters to setResponsePage to keep sorting.. 2014-02-21 10:53:30 +01:00
fred-fri
6214ee443e fixing style issues 2014-02-21 18:40:21 +09:00
fred-fri
8a670c1bb5 adding phd stuff 2014-02-21 16:29:05 +09:00
fred-fri
145a843674 Merge remote-tracking branch 'origin/develop' into develop 2014-02-21 15:56:18 +09:00
fred-fri
afa124ae36 adding phd stuff 2014-02-21 15:55:51 +09:00
Emil Siverhall
2bd88754a0 delete link not visible if not file uploader 2014-02-20 20:29:04 +01:00
Emil Siverhall
0a291886bc Merge remote-tracking branch 'origin/develop' into develop 2014-02-20 20:21:45 +01:00
Emil Siverhall
15f0f5a4f8 No more AbstractFilePanel 2014-02-20 20:21:38 +01:00
Emil Siverhall
b27b1a44df deletable always true in WicketProjectFileUpload 2014-02-20 20:07:32 +01:00
Golrokh Moattar
fd281f81a2 Merge remote-tracking branch 'origin/develop' into develop 2014-02-20 17:06:09 +01:00
Golrokh Moattar
a0efc43864 just a small change for a better code 2014-02-20 17:05:54 +01:00
Golrokh Moattar
ddf7031c3a Test method for deletion added 2014-02-20 17:03:13 +01:00
Emil Siverhall
476837714f Merge remote-tracking branch 'origin/develop' into develop 2014-02-20 16:53:58 +01:00
Emil Siverhall
b7a17278fc failing test.. 2014-02-20 16:51:45 +01:00
Emil Siverhall
746be07c36 delete link in file list 2014-02-20 16:45:08 +01:00
4735114514 Fixed closing of dialog. 2014-02-20 16:23:00 +01:00
leosu
e74455c681 Merge remote-tracking branch 'origin/develop' into develop 2014-02-20 15:43:40 +01:00
leosu
077e2e2b59 fixed failing tests 2014-02-20 15:43:30 +01:00
Emil Siverhall
3dfa7193f0 files uploaded through files tab sets deletable = true 2014-02-20 15:23:21 +01:00
Golrokh Moattar
06bab82ab9 Test class added 2014-02-20 15:22:42 +01:00
Golrokh Moattar
4576a132f3 Code reviewed and fixed 2014-02-20 15:13:54 +01:00
Richard
9ab9ea077c Merge remote-tracking branch 'origin/develop' into develop 2014-02-20 15:13:41 +01:00
Richard
cbd1c321b3 Minor changes to the AdminEditChecklistTemplatePage.
Replaced "Reviewer" with "Peer review completed by:" on the  ReviewPageReviewDetailsPanel
2014-02-20 15:13:19 +01:00
leosu
ad780ebcd3 Merge remote-tracking branch 'origin/develop' into develop 2014-02-20 14:49:39 +01:00
leosu
76bddfcf88 ESCAPEABLE MODAL WINDOWS :D :D :D 2014-02-20 14:49:32 +01:00
Golrokh Moattar
966b391b9a Code reviewed and fixed 2014-02-20 14:40:18 +01:00
2782ef6fe4 Merge remote-tracking branch 'origin/develop' into develop 2014-02-20 14:30:50 +01:00
9dee342ded Made the final dialog bootstrap. 2014-02-20 14:30:44 +01:00
leosu
e41fde1441 moved things being checked in view to where they belong 2014-02-20 13:38:35 +01:00
leosu
15585cc747 moved things being checked in view to where they belong 2014-02-20 12:02:14 +01:00
Golrokh Moattar
efba1a428c SupervisorEditProjectPanel overwritten, does not use AbstractCRUD anymore 2014-02-20 11:53:00 +01:00
Richard
72c3e69db3 Merge remote-tracking branch 'origin/develop' into develop 2014-02-20 11:22:13 +01:00
Richard
3f654ea813 Minor design changes to the peer-pages. 2014-02-20 11:21:50 +01:00
Emil Siverhall
ff7ce46795 Merge remote-tracking branch 'origin/develop' into develop 2014-02-20 11:19:10 +01:00
Emil Siverhall
1bcb7f6c3d cleanup 2014-02-20 11:18:44 +01:00
Golrokh Moattar
fdd2ae1eeb 1-Test cases implemented for SupervisorEditProjectPanel
2-Edit page changed, extra info deleted
2014-02-20 10:50:58 +01:00
Emil Siverhall
7c7b9b7dfe removed unused service field 2014-02-20 10:34:38 +01:00
Golrokh Moattar
ac595b7b87 Test cases implemented for SupervisorEditProjectPage 2014-02-20 10:06:08 +01:00
Richard
05904321aa Changed default rows per page on AdminMailLogPage to 20. 2014-02-20 09:45:47 +01:00
Richard
0a8807c43e Changed participants to authors on AdminAuthorStatisticsPage 2014-02-20 09:23:44 +01:00
Golrokh Moattar
eeba72ed27 Merge remote-tracking branch 'origin/develop' into develop 2014-02-20 09:04:17 +01:00
fred-fri
d837051fbf Merge branch 'phd' into develop 2014-02-20 15:42:30 +09:00
Golrokh Moattar
2391a3a9c4 Test classes created 2014-02-19 17:11:50 +01:00
Emil Siverhall
e453d8e795 Merge remote-tracking branch 'origin/develop' into develop 2014-02-19 16:57:40 +01:00
Emil Siverhall
52b0d45840 IdeaParticipation toString issues, datatables + excel exports 2014-02-19 16:57:25 +01:00
4056e253b8 Made filter save between page changes in admin mail log. 2014-02-19 16:39:35 +01:00
2ba6238baa Merge remote-tracking branch 'origin/develop' into develop 2014-02-19 16:31:56 +01:00