6885 Commits

Author SHA1 Message Date
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
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
Richard
aa4802c7c9 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	core/pom.xml
2013-09-26 16:45:29 +02:00
Richard
ef06d3d80f Continued styling - overview page. 2013-09-26 16:41:32 +02:00
Emil Siverhall
2e12611d35 new idea service fixes 2013-09-26 10:46:08 +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
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
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
c927b51002 removed ChecklistTemplateDao 2013-09-25 16:41:55 +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
Leo
642d643b00 *removed ProjectDao
*changed CreateOrUpdate to updateExternalResearchArea in ResearchAreaService
2013-09-25 13:59:16 +02:00
Emil Siverhall
22344ae4ee added missing tests for comment thread panel 2013-09-25 09:04:49 +02:00
Richard
9fdf22508d Continued styling - overview page. 2013-09-25 08:52:23 +02:00
fred-fri
9e6a2f8a2d fixing display 2013-09-25 14:15:01 +09:00
fred-fri
ce07349560 removed tostring from role, employee and student and fixing display 2013-09-25 13:11:54 +09:00
fred-fri
493c0410e2 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-09-25 11:55:45 +09:00
fred-fri
a6068e15bd refactored panel and fixed display 2013-09-25 11:55:08 +09:00
fred-fri
58b9127c11 fixed displays 2013-09-25 11:15:12 +09:00
Leo
d78f7d607a removed PeerRequestDao 2013-09-24 16:56:12 +02:00
Leo
f0a12b5148 removed PeerReviewDao 2013-09-24 16:03:01 +02:00
Leo
0b3484e0ab removed SupervisorDao and QueryableDao 2013-09-24 14:33:43 +02:00
Leo
ca9ee995b3 started removing SupervisorDao 2013-09-24 14:18:34 +02:00
fred-fri
56977c29bc hooked project class display to name attribute 2013-09-24 20:02:44 +09:00
fred-fri
5da66a00c7 hooked project class display to name attribute 2013-09-24 19:56:56 +09:00
Leo
4c2825910e removed AuthorrDao 2013-09-24 11:57:50 +02:00
Leo
c243466b74 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-09-24 10:30:42 +02:00
Leo
57d80aa7ec removed UserDao 2013-09-24 10:30:28 +02:00
Dan Lagnöhed
8e364a2d3b Merge remote-tracking branch 'origin/develop' into develop 2013-09-24 08:29:54 +02:00
Dan Lagnöhed
a1d1bec63d Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	core/src/main/java/se/su/dsv/scipro/activityplan/facade/ProjectScheduleFacadeImpl.java
2013-09-24 08:27:02 +02:00
fred-fri
9fc705790c made it possible to run jetty locally 2013-09-24 15:23:36 +09:00
Dan Lagnöhed
de29529a9f Removed all dependencies to Wicket in the core-module 2013-09-24 08:23:31 +02:00
fred-fri
29635ae31a fixed display 2013-09-24 14:44:55 +09:00
fred-fri
addcb1c619 fixed display 2013-09-24 14:43:58 +09:00
fred-fri
812cce6e48 fixed display 2013-09-24 14:20:39 +09:00
fred-fri
c9b61f51e9 some refactoring 2013-09-24 13:19:50 +09:00