6916 Commits

Author SHA1 Message Date
Emil Siverhall
4038ade960 fixed lazy init on supervisor -> all student ideas 2014-03-07 10:15:20 +01:00
Emil Siverhall
f2cf5f7124 fixed lazy init on supervisor -> all supervisor ideas 2014-03-07 09:41:31 +01:00
Emil Siverhall
7dc2b4878e fixed lazy init on supervisor idea submission 2014-03-07 09:33:59 +01:00
Emil Siverhall
5ec15f9b64 fixed lazy init in threaded forum 2014-03-07 08:39:05 +01:00
b05b8ade45 Removed unused private field. 2014-03-06 19:47:00 +01:00
Emil Siverhall
3f835926ae Merge remote-tracking branch 'origin/develop' into develop 2014-03-06 19:34:02 +01:00
55435148ac Sonar issues. 2014-03-06 19:33:55 +01:00
Emil Siverhall
d2cd00149a fixed some role/user issues on application periods -> edit targets 2014-03-06 19:28:53 +01:00
b17ce4fad1 Compilation errors. 2014-03-06 19:27:50 +01:00
1712c60723 Sonar issues. 2014-03-06 19:24:12 +01:00
3681a36976 Simplified. 2014-03-06 19:23:09 +01:00
59b7dfd699 Simplified. 2014-03-06 19:21:06 +01:00
72c949b668 Use isEmpty() 2014-03-06 19:18:06 +01:00
797772fdb8 Removed unused private field. 2014-03-06 19:16:58 +01:00
66f491a024 Removed defunct UserProfilePanelFactory. 2014-03-06 19:16:32 +01:00
69df664be7 Final clean up. 2014-03-06 17:58:58 +01:00
900cc525cf Fixed tests 2014-03-06 17:46:03 +01:00
bac334a225 Merge remote-tracking branch 'origin/develop' into improvement/roles
Conflicts:
	core/src/main/java/se/su/dsv/scipro/project/ProjectFollower.java
2014-03-06 17:34:09 +01:00
faae5862c7 Fixed more lazy init 2014-03-06 17:33:30 +01:00
af1eecfee7 Fixed more lazy init 2014-03-06 17:32:12 +01:00
0d1a8fe1d6 Fixed more lazy init 2014-03-06 17:22:50 +01:00
7b29c49cec Fixed lazy init exceptions. 2014-03-06 17:16:27 +01:00
leosu
8dd0597d84 Merge remote-tracking branch 'origin/develop' into develop 2014-03-06 16:56:57 +01:00
leosu
dd3792a918 inactive projects info 2014-03-06 16:56:52 +01:00
7144a19246 Fixed property models. 2014-03-06 16:47:19 +01:00
f2e3d939c0 Improved autocomplete role speed. 2014-03-06 16:47:13 +01:00
Emil Siverhall
fa6e679a00 Merge remote-tracking branch 'origin/develop' into develop 2014-03-06 16:15:33 +01:00
Emil Siverhall
9c648993ad redirect if not valid page parameters when reaching peer page 2014-03-06 16:14:14 +01:00
1af1fed02a Fixed merge problems. 2014-03-06 16:06:02 +01:00
b701518530 Merge branch 'develop' into improvement/roles
Conflicts:
	core/src/main/java/se/su/dsv/scipro/springdata/services/SupervisorService.java
	view/src/main/java/se/su/dsv/scipro/admin/panels/AdminIdeaPopupPanel.java
	view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectDataPanel.java
	view/src/test/java/se/su/dsv/scipro/match/panel/ApplicationPeriodInfoPanelTest.java
2014-03-06 15:59:21 +01:00
4289bac410 Fixed UserService filter 2014-03-06 15:53:30 +01:00
2af975990f Fixed autocomplete to ignore case. 2014-03-06 15:52:12 +01:00
leosu
4c171cbcce removed mountPage that caused errors 2014-03-06 15:38:18 +01:00
b8289e3679 Removed RoleBuilder. 2014-03-06 15:33:01 +01:00
3c84dac775 Removed Examiner repo and role reference. 2014-03-06 15:30:39 +01:00
863431d4c8 Changed examiner in FinalSeminar to User. 2014-03-06 15:25:17 +01:00
leosu
b648bdaada Merge remote-tracking branch 'origin/develop' into develop 2014-03-06 15:16:46 +01:00
leosu
d7bd4daf18 fixed broken cancel button 2014-03-06 15:16:40 +01:00
25d27e71db Removed SupervisorRepo 2014-03-06 15:14:02 +01:00
03a5905008 Removed StudentRepo 2014-03-06 15:08:48 +01:00
bef2d3843f Removed RoleService. 2014-03-06 15:01:46 +01:00
45127ec63e View updated to use role enums. 2014-03-06 14:42:58 +01:00
Emil Siverhall
dff8845807 removed use of findByCode from peer 2014-03-06 14:42:52 +01:00
Emil Siverhall
f09e4ed0f1 Merge remote-tracking branch 'origin/develop' into develop 2014-03-06 14:08:46 +01:00
Emil Siverhall
28e314ef9e some changes to project partner page 2014-03-06 14:07:53 +01:00
3002f6cd36 Fixed bug caused by severe mis-match between Wicket IDataProvider and Spring Pageable. 2014-03-06 14:06:33 +01:00
Golrokh Moattar
f17cb9d990 Description added to the checklist modal 2014-03-06 13:44:12 +01:00
Emil Siverhall
8f39128207 removed projectType connection from ProjectPartner since this never was used 2014-03-06 13:37:13 +01:00
Golrokh Moattar
8d982570a6 Merge remote-tracking branch 'origin/develop' into develop 2014-03-06 11:20:13 +01:00
Golrokh Moattar
b62ddf2e51 View mail content when admin clicks on a mail subject in log- is completed 2014-03-06 11:20:05 +01:00