3982 Commits

Author SHA1 Message Date
a9decef4d1 Migrated activity plan templates to support new actions. 2015-01-30 10:57:21 +01:00
bfec3d7a5a Removed old uploadRequired attribute. 2015-01-30 10:43:18 +01:00
ef98964cfa Migrated activity plan panel to handle the new actions. 2015-01-30 10:19:20 +01:00
6a6336fc84 Refactored action to be a simple attribute of Activity rather than tacked on. While good in theory it will be problematic when adding activities from a template so better go with the simple solution. 2015-01-30 10:03:09 +01:00
181ad81349 Added database support for different kinds of actions to activities. 2015-01-29 14:36:22 +01:00
1542c17bdf Fixed FinalSeminarServiceImplIntegrationTest. 2015-01-20 12:22:53 +01:00
13dd441e45 [SCIPRO-26424] Fixed problem when trying to add opponents at the same time as creating the final seminar. 2015-01-20 11:32:18 +01:00
8a19139f1c Delomboked stuff. 2015-01-20 09:53:17 +01:00
dc6b2b9767 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2015-01-16 13:29:16 +01:00
6dfe9dc596 Prepare for project delete phase 1 rollback 2015-01-16 13:28:57 +01:00
4bb4515331 Updated master criteria. 2015-01-16 12:38:13 +01:00
32950fa88d Fixed problem with the wrong event getting posted when approving or rejecting a reviewer request.
Not having enough type information is fun.
2015-01-15 10:51:22 +01:00
137b2606e6 Display grading reports in the reviewer approval process panel. 2015-01-14 16:05:12 +01:00
6a0f7185d2 Made it possible to attach a snapshot of the grading report when denying a request. 2015-01-14 15:36:23 +01:00
37c59cb60e Made it possible to attach a snapshot of the grading report when approving a request. 2015-01-14 15:27:43 +01:00
f830cb61d0 Prepare for project delete phase 1 2015-01-14 14:30:41 +01:00
71858369c2 Moved Scala files to src/main/scala from src/main/java 2015-01-14 11:07:58 +01:00
d100698143 Updated grading criteria for bachelor projects. 2015-01-13 13:53:54 +01:00
Andreas Svanberg
464c4feef0 Pushed member down from GradeCalculator interface since it was never used as a part of the interface. 2015-01-12 11:55:21 +01:00
191469ce0f Merge remote-tracking branch 'origin/develop' into develop 2014-12-19 21:46:50 +01:00
63fca8657e Made peer request deleted notification event based. 2014-12-19 10:27:14 +01:00
0e61024eaa Removed unnecessary dependencies. 2014-12-19 10:15:55 +01:00
bc28922b6f Removed sub-package to peer containing the two workers. 2014-12-18 15:27:00 +01:00
6d251b66fc Fixed circular dependency between peer and workerthreads. 2014-12-18 13:04:08 +01:00
4dad62c797 Fixed circular dependency between forummail and workerthreads. 2014-12-18 12:40:40 +01:00
524e36b155 Removed unused test matchers for google.Optional. 2014-12-18 12:13:44 +01:00
952d6ef0cd Removed unused import. 2014-12-18 12:11:21 +01:00
caa855f6c2 Removed unnecessary implicit conversion after FinalSeminarApprovalService got migrated. 2014-12-18 11:59:59 +01:00
a0ef8d5b7b Migrated thesis reviews to scala.Option from google.Optional 2014-12-18 11:56:34 +01:00
3e69974f0f Migrated report related functions to scala.Option from google.Optional 2014-12-18 11:39:14 +01:00
80b03d5c97 Migrated peer related functions to scala.Option from google.Optional 2014-12-18 10:59:59 +01:00
4c09e9908d Migrated more parts of reviewer approvals to scala.Option from google.Optional 2014-12-17 16:29:27 +01:00
2e87840b70 Migrated some missing parts of reviewer approvals to scala.Option from google.Optional 2014-12-17 16:01:33 +01:00
c7bfd2bdf8 Migrated activity forum integration to scala.Option from google.Optional 2014-12-17 15:50:18 +01:00
a4d5eacd20 Migrated reviewer approvals to scala.Option from google.Optional 2014-12-17 15:46:52 +01:00
c942e2f3d2 Removed unused peer notification REVIEW_ABORTED. 2014-12-17 15:19:57 +01:00
d49ea8ed83 Removed unused idea notification SUPERVISOR_CHANGE. 2014-12-17 15:16:49 +01:00
b306ab39e4 Removed unused idea notification PARTNER_TIMEOUT. 2014-12-17 15:13:36 +01:00
eccf913543 Removed unused notification event configuration (was for editable descriptions). 2014-12-17 15:11:48 +01:00
dd02ff3970 Removed unused idea-related notification events. 2014-12-17 15:09:56 +01:00
8b44b533e2 Cleaned up some old configuration relating to the deleted Turnitin error notification. 2014-12-17 15:05:42 +01:00
dfd2826f6c Removed unused seminar notification event. 2014-12-17 14:48:02 +01:00
3665427c0f Removed unnecessary local variable. 2014-12-17 09:32:50 +01:00
fc581f1723 Used the proper method instead of the stupid one. 2014-12-12 11:23:57 +01:00
debd6adeab Tested adding default activity plan when project gets started from an idea. 2014-12-12 11:21:26 +01:00
ff7e8c2479 This is the method that every consumer wants. 2014-12-12 10:58:27 +01:00
5d0ad7417b Added mock implementations of EventBus and ActivityPlanFacade to the test match module. 2014-12-12 10:50:40 +01:00
5ca59d2828 Delomboked for Scala compatibility. 2014-12-12 10:40:29 +01:00
5914b61067 Removed dependency on match module from activity plan, the dependency should go the other way around. 2014-12-12 10:30:58 +01:00
golrokh
261914e85b change the length of source in NotificationData to LONGTEXT 2014-12-10 10:55:19 +01:00