DMC/scipro
7
0
Fork 0
Code Issues 27 Pull Requests 5 Actions Projects 1 Wiki Activity
17,144 Commits 9 Branches 416 Tags
Commit Graph

6146 Commits

Author SHA1 Message Date
Andreas Svanberg
0d1a8fe1d6 Fixed more lazy init 2014-03-06 17:22:50 +01:00
Andreas Svanberg
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
Andreas Svanberg
7144a19246 Fixed property models. 2014-03-06 16:47:19 +01:00
Andreas Svanberg
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
Andreas Svanberg
1af1fed02a Fixed merge problems. 2014-03-06 16:06:02 +01:00
Andreas Svanberg
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
Andreas Svanberg
4289bac410 Fixed UserService filter 2014-03-06 15:53:30 +01:00
Andreas Svanberg
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
Andreas Svanberg
b8289e3679 Removed RoleBuilder. 2014-03-06 15:33:01 +01:00
Andreas Svanberg
3c84dac775 Removed Examiner repo and role reference. 2014-03-06 15:30:39 +01:00
Andreas Svanberg
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
Andreas Svanberg
25d27e71db Removed SupervisorRepo 2014-03-06 15:14:02 +01:00
Andreas Svanberg
03a5905008 Removed StudentRepo 2014-03-06 15:08:48 +01:00
Andreas Svanberg
bef2d3843f Removed RoleService. 2014-03-06 15:01:46 +01:00
Andreas Svanberg
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
Andreas Svanberg
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
Emil Siverhall
605447d2e3 fixed large excel exports since we don't want to create a new cellstyle for each of the 4k+ cells 2014-03-06 10:33:24 +01:00
Emil Siverhall
907777b54c Merge remote-tracking branch 'origin/develop' into develop 2014-03-06 09:48:00 +01:00
Emil Siverhall
8785a851a2 excel export safety nets.. 2014-03-06 09:47:07 +01:00
Golrokh Moattar
6f7fa1d8fe Merge remote-tracking branch 'origin/develop' into develop 2014-03-06 09:32:10 +01:00
Golrokh Moattar
e64f973f00 Delete opponentReport and OppositionReport is possible by Admin Role 2014-03-06 09:24:56 +01:00
Richard
9ce8415b66 Replaced Skydrive with Onedrive. Added Box. 2014-03-06 09:21:44 +01:00
Golrokh Moattar
84483ce9fc Merge remote-tracking branch 'origin/develop' into develop 
Conflicts:
	view/src/main/java/se/su/dsv/scipro/seminar/panels/SeminarOppositionPanel.html
	view/src/main/java/se/su/dsv/scipro/seminar/panels/SeminarOppositionPanel.java
 2014-03-06 09:17:08 +01:00
Richard
ec5a400b5a Merge remote-tracking branch 'origin/develop' into develop 2014-03-06 09:15:45 +01:00
fred-fri
b081ce5850 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2014-03-06 10:51:01 +09:00
fred-fri
e463239de2 adding new edit templates page 2014-03-06 10:50:35 +09:00
Andreas Svanberg
127f160a23 Merge branch 'develop' into improvement/roles 
Conflicts:
	core/src/main/java/se/su/dsv/scipro/peer/PeerReview.java
	core/src/main/java/se/su/dsv/scipro/peer/PeerReviewService.java
	core/src/main/java/se/su/dsv/scipro/project/ProjectServiceImpl.java
 2014-03-05 17:10:11 +01:00
Emil Siverhall
94c543ddde Merge remote-tracking branch 'origin/develop' into develop 2014-03-05 16:11:48 +01:00
Emil Siverhall
2a926a3807 count authors with more than one project participation on authors -> statistics 2014-03-05 16:11:33 +01:00
leosu
7c54a046d1 fixed NPE 2014-03-05 15:53:13 +01:00
Richard
a0531c5524 Merge remote-tracking branch 'origin/develop' into develop 2014-03-05 15:43:50 +01:00
Richard
02b79c726a Removed unused css file from BasePage.html. 2014-03-05 15:43:41 +01:00
Emil Siverhall
e7c4feb02c deactivatable date picker on author statistics page 2014-03-05 14:43:52 +01:00
Emil Siverhall
e4f75abcfb removed old date filter 2014-03-05 14:29:34 +01:00
Emil Siverhall
c9b1769389 inactive not default selected 2014-03-05 12:47:11 +01:00
Emil Siverhall
cc112865d3 Merge remote-tracking branch 'origin/develop' into develop 2014-03-05 12:05:27 +01:00