3962 Commits

Author SHA1 Message Date
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
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
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
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