9767 Commits

Author SHA1 Message Date
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
a8f5f633c0 Made generated DTOs work with Calendar instead of XMLGregorianCalendar.
Deleted ignored test.
2013-09-26 10:56:21 +02:00
Emil Siverhall
975312de7d minor changes 2013-09-26 10:52:33 +02:00
Emil Siverhall
2e12611d35 new idea service fixes 2013-09-26 10:46:08 +02:00
Leo
ed3bdfb9af Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-09-26 10:37:29 +02:00
Leo
e23c82e39a updated hibernate 2013-09-26 10:36:59 +02:00
fred-fri
0542bfa2e6 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-09-26 17:23:29 +09:00
fred-fri
b985f4d60f merge 2013-09-26 17:22:29 +09:00
fred-fri
54cb50485d switched from xml to json 2013-09-26 17:13:55 +09:00
Leo
4d82d3ebbb Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-09-26 10:01:09 +02:00
Leo
70213f3493 removed all SuperDaos 2013-09-26 10:00:57 +02:00
Leo
7944f812d2 removed RoleDao 2013-09-26 09:45:41 +02:00
Emil Siverhall
dfb0ec9ad1 added some tests to peer review service 2013-09-26 08:57:28 +02:00
fred-fri
ba15588fda test 2013-09-26 15:50:19 +09:00
fred-fri
0b8e376c14 using new constructor 2013-09-26 15:46:54 +09:00
fred-fri
7481cc3dab added new constrcutor with set, using it once 2013-09-26 15:29:13 +09:00
fred-fri
b5874b2319 fixed display 2013-09-26 14:57:33 +09:00
fred-fri
20875716df fixed display 2013-09-26 14:49:03 +09:00
fred-fri
9028ec813c fixed display 2013-09-26 14:45:43 +09:00
fred-fri
6544eca364 fixed display 2013-09-26 13:33:26 +09:00
fred-fri
f4dd1dba34 fixed display 2013-09-26 13:00:47 +09:00
Leo
dcf2d0822e started removing RoleDao 2013-09-25 17:01:56 +02:00
Richard
14d34db47d Continued styling - overview page. 2013-09-25 16:57:56 +02:00
Leo
24c83e675d Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-09-25 16:42:08 +02:00
Leo
c927b51002 removed ChecklistTemplateDao 2013-09-25 16:41:55 +02:00
Emil Siverhall
a05974dfe3 lacking tests in peer request service added 2013-09-25 16:24:47 +02:00
Leo
3856f522e2 removed ProjectClassDao 2013-09-25 15:58:11 +02:00
Leo
83eb142353 removed PeerReviewDao 2013-09-25 15:10:10 +02:00
Emil Siverhall
76f521ae85 small test fix 2013-09-25 14:08:26 +02:00
Leo
642d643b00 *removed ProjectDao
*changed CreateOrUpdate to updateExternalResearchArea in ResearchAreaService
2013-09-25 13:59:16 +02:00