11909 Commits

Author SHA1 Message Date
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
Leo
4f9f655024 removed CommentDao and the old CommentThreadPanel 2013-09-20 11:12:44 +02:00
Leo
f7be332d19 set comments id to auto increment 2013-09-20 10:59:41 +02:00
Leo
4a75b8e373 CommentThreadPanelNew now works as intended 2013-09-20 10:56:40 +02:00
Richard
33a11e69f0 Continued styling - project state. 2013-09-20 09:53:02 +02:00
d247083b05 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	core/src/main/java/se/su/dsv/scipro/io/facade/ImporterFacade.java
2013-09-20 08:53:43 +02:00
47ce3f6753 Whole import rewritten.
Still not importing project participants/authors.
2013-09-20 08:50:31 +02:00
Richard
fc83fdb3ff Merge remote-tracking branch 'origin/develop' into develop 2013-09-20 08:46:39 +02:00
fred-fri
ed84cb7e38 subtracted matched ideas from ideaslefttocreate 2013-09-20 12:58:40 +09:00
fred-fri
48be8f2b3a added sql 2013-09-20 11:03:32 +09:00
Leo
f838c3b4f3 Started removing CommentDao and rewriting CommentThreadPanel. Not done and note working due to MySQL constraint of strange origins 2013-09-19 16:57:02 +02:00
Richard
5b45aeede7 Styling - project state. 2013-09-19 16:37:03 +02:00
Richard
d72d5e47c1 Styling - project details. 2013-09-19 16:20:55 +02:00
Leo
f034298ffc Added a ChecklistCategoryService mock to SciproTest 2013-09-19 14:06:49 +02:00
Leo
d4977a46ea removed CheckListCategoryDao 2013-09-19 13:48:32 +02:00
Leo
2e86b85a9a fixed the bug where the wrong file was uploaded 2013-09-19 11:39:58 +02:00
Leo
1925b6fc5a removed FinalSeminarDao 2013-09-19 11:20:58 +02:00
Leo
73a04bd25b Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-09-19 10:55:18 +02:00
Leo
37fb95e21f URL added 2013-09-19 10:55:09 +02:00
Leo
dcd0eecf92 added more info about research areas. URL to link missing 2013-09-19 10:38:29 +02:00
fred-fri
e44b390ff5 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-09-19 17:16:40 +09:00
fred-fri
052a5d97b0 made newfirstmeeting and tuple implement serializable in order to fix peer page 2013-09-19 17:16:14 +09:00
Leo
e7d8880ac1 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-09-19 10:13:01 +02:00
Leo
09c7d67683 more info when thesis is uploaded to final seminar 2013-09-19 10:12:15 +02:00
fred-fri
20f538d5e5 drop unused weights 2013-09-19 16:25:16 +09:00
fred-fri
b29c8fd21a removed unused stringresource 2013-09-19 16:24:04 +09:00
fred-fri
b2726fc5d2 removed unused checklistupload 2013-09-19 14:19:46 +09:00
fred-fri
25fba0e5de added core and view target folders to gitignore 2013-09-19 12:45:20 +09:00
a6d6014d6d Merge stuff 2013-09-18 16:30:22 +02:00
483b0ae730 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	src/main/java/se/su/dsv/scipro/checklists/panels/AnswerDialogPanel.java
	src/main/java/se/su/dsv/scipro/checklists/panels/ChecklistQuestionPanel.java
	src/main/java/se/su/dsv/scipro/project/panels/NewIdeaWatsonCompletionPanel.java
2013-09-18 16:19:48 +02:00
5ec3c88c79 Split SciPro into modules separating view from logic. 2013-09-18 16:13:08 +02:00
Leo
ad8ed46229 Checklists only sends notifications when all questions have been answered by one user 2013-09-18 15:59:26 +02:00
Leo
23bce49dca Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-09-18 13:09:33 +02:00
Leo
8433572732 Added maximum string validator to watson boxes, and feedbackpanels 2013-09-18 13:09:03 +02:00
Dan Lagnöhed
31f0d82cea Merge remote-tracking branch 'origin/develop' into develop 2013-09-18 11:09:15 +02:00
Dan Lagnöhed
f0f231d787 Removed lib-folder 2013-09-18 11:09:05 +02:00