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
|
8e364a2d3b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-09-24 08:29:54 +02: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 |
|
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 |
|
fred-fri
|
11925cebdc
|
added *.log to gitignore
|
2013-09-24 12:08:12 +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 |
|
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
|
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 |
|
Dan Lagnöhed
|
d7f26723d0
|
Prevented saves of duplicate username in daisy-import
|
2013-09-23 11:20:41 +02:00 |
|
Richard
|
e8db23efab
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-09-23 10:05:47 +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 |
|
Richard
|
f2ad8ebdec
|
Continued styling - overview page.
|
2013-09-20 16:54:00 +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 |
|
|
|
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 |
|
|
|
e375743afc
|
Import fully done.
Still some service methods missing
|
2013-09-20 11:47:39 +02:00 |
|
Leo
|
c2869b63f9
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-09-20 11:15:15 +02:00 |
|
