9546 Commits

Author SHA1 Message Date
Emil Siverhall
76355c5045 test in comment service impl 2013-09-27 08:45:50 +02:00
Emil Siverhall
866af398dc test in checklist category service 2013-09-27 08:37:36 +02:00
fred-fri
2f1e9d0e6b removed unnecessary semicolons 2013-09-27 15:10:27 +09:00
fred-fri
e0cab18c88 fixed display 2013-09-27 11:05:29 +09:00
fred-fri
28f55112a4 typo 2013-09-27 10:29:47 +09:00
Emil Siverhall
d0f5f20218 tests for checklist template service 2013-09-26 23:57:59 +02:00
Emil Siverhall
5154457881 tests for user service 2013-09-26 23:11:34 +02:00
Emil Siverhall
d7dd99ee08 Merge branch 'application' into develop 2013-09-26 21:06:42 +02:00
Emil Siverhall
2a4eafeda0 some cleanup of unused methods and comments 2013-09-26 20:57:55 +02:00
Emil Siverhall
b6fa67878d removed target association from ProjectClass entity since this created problems when saving new application periods 2013-09-26 20:57:53 +02:00
Emil Siverhall
ee40f21404 moved target count methods to facade class to avoid circular dependencies between application period service and idea service 2013-09-26 20:57:51 +02:00
Leo
f23b301665 added tests to ApplicationPeriodServiceImpl 2013-09-26 20:57:49 +02:00
37acd38340 Added SQL statements for the new tables containing Program related data.
Updated entity mappings with explicit columns/table names.
2013-09-26 19:28:32 +02:00
Richard
f92f61dba8 Merge remote-tracking branch 'origin/develop' into develop 2013-09-26 16:58:58 +02:00
d56b67af01 Reverted lombok equals/hashCode on DomainObject since it can not use the abstract getter when property is missing. 2013-09-26 16:59:18 +02:00
Richard
aa4802c7c9 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	core/pom.xml
2013-09-26 16:45:29 +02:00
c25463d20e Lombok: FileDescription 2013-09-26 16:44:21 +02:00
Richard
ef06d3d80f Continued styling - overview page. 2013-09-26 16:41:32 +02:00
3f74cef715 Removed unnecessary annotations 2013-09-26 16:41:31 +02:00
003b7f0f7a Lombok: Employee 2013-09-26 16:39:39 +02:00
366a1aef48 Lombok: DomainObject 2013-09-26 16:38:11 +02:00
0f8cedca22 Lombok: CommentThread 2013-09-26 16:35:28 +02:00
a9ae1285ac Lombok: Comment 2013-09-26 16:26:24 +02:00
c726ab21d7 Lombok: CheckListTemplate 2013-09-26 16:10:56 +02:00
f994ee02b9 Lombok: ChecklistQuestion 2013-09-26 16:04:24 +02:00
fd746f09f6 Lombok: ChecklistCategory 2013-09-26 15:58:56 +02:00
f22da58afc Removed unused constructor. 2013-09-26 15:57:26 +02:00
80ff78f7c7 Removed stupid text file. 2013-09-26 15:55:50 +02:00
76f310578b Lombok: CheckListAnswer 2013-09-26 15:53:33 +02:00
9dd0a2d12e Lombok: CheckList 2013-09-26 15:49:21 +02:00
6e66cfd8e4 Lombok: Admin 2013-09-26 15:45:01 +02:00
aac07b9b9e Mocked method in mock test. 2013-09-26 15:29:05 +02:00
19affae92d Importing programs when importing users that are students. 2013-09-26 15:20:55 +02:00
638072d749 Updated Daisy API XSD. 2013-09-26 15:20:34 +02:00
c7ab30abae Not very smart to make SpringConfigurationTest run by maven since there is obviously no mysql database on the build server. 2013-09-26 14:19:43 +02:00
5a35c6092b Made lombok work. 2013-09-26 14:14:58 +02:00
56bccf1227 Made external importer use constructor injection. 2013-09-26 13:37:33 +02:00
62669bda04 Renamed spring configuration test so that it is run by maven. 2013-09-26 13:34:32 +02:00
e74e03a17f Made ExporterFacade use constructor injection. 2013-09-26 13:34:10 +02:00
ad0bf24695 Removed dependency on importer from exporter facade.
Removed no longer necessary method in ExternalImporter interface.
2013-09-26 13:29:46 +02:00
0aec3cb118 Deleted ImporterFacade since did not do anything. 2013-09-26 13:25:36 +02:00
4da854a32f Made the public methods in ImporterFacade private methods inside ExternalImporterDaisyImpl since that was the only place they were used. 2013-09-26 13:24:53 +02:00
3d614118f7 Trying to fix path error. 2013-09-26 13:14:53 +02:00
b2b223a93a Merge remote-tracking branch 'origin/develop' into develop 2013-09-26 13:06:56 +02:00
d55e3de83e Updated Daisy API XSD to latest version. 2013-09-26 13:06:44 +02:00
Leo
14c38c646e Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-09-26 11:20:03 +02:00
Leo
fae4115b4b updated spring framework 2013-09-26 11:19:37 +02:00
Emil Siverhall
516ef3071b Merge branch 'newidea' into develop 2013-09-26 11:10:10 +02:00
Leo
02dd25c3ab updated QueryDSL and spring data 2013-09-26 11:00:53 +02:00
c156abf201 Merge remote-tracking branch 'origin/develop' into develop 2013-09-26 10:56:25 +02:00