|
|
7954ee23de
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-09-20 15:36:47 +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
|
4a75b8e373
|
CommentThreadPanelNew now works as intended
|
2013-09-20 10:56:40 +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 |
|
fred-fri
|
ed84cb7e38
|
subtracted matched ideas from ideaslefttocreate
|
2013-09-20 12:58:40 +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 |
|
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 |
|
