6506 Commits

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