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 |
|
Emil Siverhall
|
22344ae4ee
|
added missing tests for comment thread panel
|
2013-09-25 09:04:49 +02: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 |
|
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
|
72f986bd84
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-09-24 14:33:56 +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
|
5da66a00c7
|
hooked project class display to name attribute
|
2013-09-24 19:56:56 +09:00 |
|
fred-fri
|
95185a5d8c
|
removed redundant statements
|
2013-09-24 19:24:48 +09:00 |
|
fred-fri
|
7e96359b17
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-09-24 19:14:45 +09:00 |
|
fred-fri
|
84e67b5f73
|
restored tostring methods
|
2013-09-24 19:14:02 +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 |
|
fred-fri
|
be107eebff
|
fixed typo
|
2013-09-24 16:31:28 +09:00 |
|
Dan Lagnöhed
|
46f3f248e5
|
Removed all dependencies to Wicket in the core-module
|
2013-09-24 08:28:06 +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 |
|
Dan Lagnöhed
|
de29529a9f
|
Removed all dependencies to Wicket in the core-module
|
2013-09-24 08:23:31 +02: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 |
|
Leo
|
d75a12cd8b
|
merge
|
2013-09-23 15:48:32 +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 |
|
Leo
|
e56d012e6c
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-09-23 14:41: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 |
|
Dan Lagnöhed
|
d7f26723d0
|
Prevented saves of duplicate username in daisy-import
|
2013-09-23 11:20:41 +02:00 |
|
Leo
|
35c9883415
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-09-23 09:43:44 +02:00 |
|
Dan Lagnöhed
|
aef86cf032
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-09-23 09:20:40 +02:00 |
|
Dan Lagnöhed
|
be6f4f8c9b
|
Clean up of pom-files. Ignored some non unit-tests
|
2013-09-23 08:22:44 +02:00 |
|
|
|
9267866183
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-09-23 07:33:23 +02:00 |
|
|
|
f3a9f0e8e7
|
Added test that shows username import is not working correctly to prevent deploy until it is fixed.
|
2013-09-23 07:33:16 +02:00 |
|
Dan Lagnöhed
|
c483df6f19
|
fix
|
2013-09-22 19:38:02 +02:00 |
|
Dan Lagnöhed
|
021843ea08
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-09-22 19:37:07 +02:00 |
|
Dan Lagnöhed
|
00eb651585
|
Introduced dependency management in pom-files
|
2013-09-22 19:36:54 +02:00 |
|
|
|
1e0b4dd634
|
Changed how QueryDSL classes are generated to use the java standard annotation processing mechanism. Gets rid of all the compilation errors.
|
2013-09-22 01:24:24 +02:00 |
|
|
|
3f8b6e4dd0
|
Created a proper dummy implementation of the Daisy API.
Created a proper integration test of the importer.
|
2013-09-20 17:54:14 +02:00 |
|
Leo
|
e5086d6dd2
|
started the removal of ProjectScheduleEventDao. not done
|
2013-09-20 17:45:55 +02:00 |
|
Leo
|
f01c70048a
|
ignored a test that sometimes fail
|
2013-09-20 16:26:27 +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 |
|
