6916 Commits

Author SHA1 Message Date
e3026cb3fa Merge remote-tracking branch 'origin/develop' into develop 2013-10-30 13:47:54 +01:00
50940f70d6 Removed unused class. 2013-10-30 13:47:50 +01:00
Emil Siverhall
b3d472d9e5 Added feedback message for examiners when submitting thesis comments 2013-10-30 13:47:43 +01:00
Richard
8a5e481f66 Fixed issue with users not being able to click on a checkbox on the peers-page. 2013-10-30 13:46:06 +01:00
Emil Siverhall
44c273ba31 Merge remote-tracking branch 'origin/develop' into develop 2013-10-30 13:33:03 +01:00
Emil Siverhall
8f30438279 Added feedback message for supervisors when creating final seminars 2013-10-30 13:32:43 +01:00
2025c0e126 Removed unused classes. 2013-10-30 13:26:43 +01:00
06c2830368 Fixed WARN logs from using StringResourceModel#getString in the constructor. 2013-10-30 12:36:37 +01:00
a2246074bd Minor sonar fixes. 2013-10-30 11:31:56 +01:00
1df6135f3d Removed ProjectTeamMember from Role hierarchy since it served no purpose.
Lombok'd Employee, Project, ProjectFollower, Role.
2013-10-30 11:09:18 +01:00
bda987139d Added missing generics. 2013-10-30 10:46:56 +01:00
7c61bf11d4 A valid project is now required for supervisor project detail pages. If no project can be found they are send to the start page. If a project is found but they do not have access they are sent to an access denied page. 2013-10-30 10:08:58 +01:00
59cf0a016b Changed log in redirect logic. First time you are now sent to the system while further requests for LoginPage stays at LoginPage. 2013-10-30 09:19:15 +01:00
a48ea14918 Reverted change to log in page to always redirect to home page. 2013-10-30 09:00:12 +01:00
fc83f08a17 Added required id parameter to all landing page tests. 2013-10-30 08:54:40 +01:00
183376e6c8 Only redirect to home page from log in page after authenticating with remote user the first time. 2013-10-30 08:43:57 +01:00
415e49ff07 If no id parameter was provided for landing page, redirect to home page instead of erroring out on findOne(null). 2013-10-30 08:40:37 +01:00
Emil Siverhall
f93c62f910 milestone highlighting for both supervisors and authors 2013-10-29 20:48:04 +01:00
5d81616717 Removed user names from log in log statement to prevent LazyInitializationException 2013-10-29 18:21:32 +01:00
1e0c588699 Changed log level to prevent useless mails when users log in with faulty credentials. 2013-10-29 17:02:23 +01:00
cbc969b6f1 Fixed warning about StringResourceModel#getString 2013-10-29 16:59:31 +01:00
7a8fe88a4a Merge remote-tracking branch 'origin/develop' into develop 2013-10-29 16:56:15 +01:00
1cc814038e Automatic redirection if user has Shibboleth session. 2013-10-29 16:56:01 +01:00
Emil Siverhall
b2fb87f337 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-10-29 15:18:30 +01:00
4884ad7d9a Merge remote-tracking branch 'origin/develop' into develop 2013-10-29 15:14:59 +01:00
e27998e7bf Fixed bad property. 2013-10-29 15:14:53 +01:00
Emil Siverhall
e75a092015 added checkbox status filter to peer review list 2013-10-29 15:13:19 +01:00
fred-fri
d69c5e4fe4 fixed setreviewer method 2013-10-29 19:58:04 +09:00
fred-fri
f31d9ce530 fixed some notification urls 2013-10-29 15:36:10 +09:00
fred-fri
45effaa596 forum subject changed 2013-10-29 14:45:38 +09:00
Leo
7aacef9536 Merge remote-tracking branch 'origin/develop' into develop 2013-10-28 16:34:57 +01:00
Leo
69465dd541 Ajax debugger no longer complains at ProjectNewIdeaSubmissionPage and SupervisorNewEditIdeaPanel 2013-10-28 16:34:50 +01:00
Richard
596f3b7457 Merge remote-tracking branch 'origin/develop' into develop 2013-10-28 16:24:17 +01:00
Richard
2332446e01 Changed text about the purpose of peer reviews. 2013-10-28 16:24:11 +01:00
Emil Siverhall
7519c4bcc3 made sure help icon dialogs doesn't lose their title when closed and reopened 2013-10-28 16:19:15 +01:00
Leo
e4673e17ce Merge remote-tracking branch 'origin/develop' into develop 2013-10-28 15:55:13 +01:00
Leo
7e6c6c2fd7 Fixed a bug where you could not remove authors from ideas 2013-10-28 15:55:03 +01:00
fred-fri
fe54e8c91b fixed order 2013-10-28 22:18:09 +09:00
fred-fri
f033aea537 added code 2013-10-28 22:13:32 +09:00
fred-fri
dbe25fbdf6 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-10-28 22:04:37 +09:00
fred-fri
d615c30211 added onlyactive filter 2013-10-28 22:00:02 +09:00
Leo
e40bf22b89 Merge remote-tracking branch 'origin/develop' into develop 2013-10-28 13:52:27 +01:00
Leo
4b8565ec55 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/NewIdeaServiceImpl.java
2013-10-28 13:51:43 +01:00
Leo
e625415b41 Fixed a bug where you could not add exemptions 2013-10-28 13:47:32 +01:00
fred-fri
c1829983b5 changed from start to final seminar page 2013-10-28 21:41:27 +09:00
fred-fri
9a2ecc11f9 fixed admin supervisor create idea issue 2013-10-28 15:23:57 +09:00
fred-fri
7766df53ed fixed my ideas filter 2013-10-28 15:08:15 +09:00
fred-fri
6c72ab0530 fixed info 2013-10-28 14:11:15 +09:00
fred-fri
3fdb7c0686 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-10-28 13:10:11 +09:00
fred-fri
75ffdaff7f changed rules for export ideas 2013-10-28 12:59:27 +09:00