6929 Commits

Author SHA1 Message Date
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
Leo
4f9f655024 removed CommentDao and the old CommentThreadPanel 2013-09-20 11:12:44 +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
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
1925b6fc5a removed FinalSeminarDao 2013-09-19 11:20:58 +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
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