6916 Commits

Author SHA1 Message Date
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
fred-fri
0f0c2d10e9 adding components 2013-09-24 12:49:44 +09:00
fred-fri
9263c3bf67 adding new panel for displaying students 2013-09-24 12:36:58 +09:00
Leo
c3ac7fcb7e removed WorkerDataDao 2013-09-23 17:20:29 +02:00
Leo
973283856c Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-09-23 16:58:51 +02:00
Emil Siverhall
d8a34f9bd7 removed UserSettingsDao 2013-09-23 16:57:29 +02:00
Emil Siverhall
0c400fed09 removed ScheduleTemplateDao 2013-09-23 16:12:33 +02:00
Leo
d8ee48c469 merge 2013-09-23 15:51:47 +02:00
Emil Siverhall
c2d8688c5f removed ProjectScheduleEventDao and fixed bug with date selection on activity plan panel 2013-09-23 15:20:20 +02:00
Emil Siverhall
aade094a1d revert unrelated changes that followed last commit 2013-09-23 13:10:47 +02:00
Emil Siverhall
77ac009ccd made paging work better when combining external data provider with springs PageRequest 2013-09-23 13:06:59 +02:00
Richard
e8db23efab Merge remote-tracking branch 'origin/develop' into develop 2013-09-23 10:05:47 +02:00
Dan Lagnöhed
be6f4f8c9b Clean up of pom-files. Ignored some non unit-tests 2013-09-23 08:22:44 +02:00
Dan Lagnöhed
00eb651585 Introduced dependency management in pom-files 2013-09-22 19:36:54 +02:00
Richard
f2ad8ebdec Continued styling - overview page. 2013-09-20 16:54:00 +02:00
Leo
7a6bed150b Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-09-20 16:14:32 +02:00
Leo
ba58e71efd removed ProjectPartnerDao 2013-09-20 16:13:48 +02:00
99f45b0f0e Moved finalName parameter to where it matters. 2013-09-20 15:42:39 +02:00
7954ee23de Merge remote-tracking branch 'origin/develop' into develop 2013-09-20 15:36:47 +02:00
7c64a0956a Fixed broken test after implementing Lombok @ToString 2013-09-20 15:36:02 +02:00
53233ff371 Import related service methods implemented. 2013-09-20 15:35:45 +02:00
Leo
8d241861f4 removed FileDescriptionDao 2013-09-20 14:49:53 +02:00
Leo
58de77a047 removed CommentThreadDao 2013-09-20 13:59:04 +02:00