|
|
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 |
|
Leo
|
64bac63c36
|
Added a feedback panel to SupervisorChecklistPage
|
2013-09-18 10:55:51 +02:00 |
|
Leo
|
60e15f1ec8
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-09-18 10:25:44 +02:00 |
|
Leo
|
d485cdb8a5
|
Fixed the bug where you couldn't see active participations and oppositions after signing up for them
|
2013-09-18 10:23:59 +02:00 |
|
fred-fri
|
910afcd723
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-09-18 17:14:06 +09:00 |
|
fred-fri
|
25e25eae58
|
removed unused assert
|
2013-09-18 17:01:17 +09:00 |
|
fred-fri
|
6fb8dd81ae
|
removed workshop stuff
|
2013-09-18 16:20:34 +09:00 |
|
fred-fri
|
4d070d0132
|
removed unused expirednewideaparticipationsworker
|
2013-09-18 16:17:48 +09:00 |
|
fred-fri
|
23041205cf
|
removed unused changeurlworker
|
2013-09-18 16:16:53 +09:00 |
|
fred-fri
|
141c40a3a3
|
removed unused pushapple
|
2013-09-18 16:14:25 +09:00 |
|
fred-fri
|
14e8b37f1e
|
removed unused loginutils
|
2013-09-18 16:13:27 +09:00 |
|
fred-fri
|
6244c4197a
|
removed unused keyvaluepair
|
2013-09-18 16:12:59 +09:00 |
|
fred-fri
|
a7f090cbce
|
removed unused autocompletestringformatter
|
2013-09-18 16:09:44 +09:00 |
|
fred-fri
|
95a846cd0d
|
removed unused userfacade
|
2013-09-18 16:08:50 +09:00 |
|
fred-fri
|
73e1984f54
|
removed unused supervisorscheduletemplateseditorpage
|
2013-09-18 15:58:10 +09:00 |
|
fred-fri
|
22d7baa019
|
removed duplicate lines in sciproapplication
|
2013-09-18 15:56:00 +09:00 |
|
fred-fri
|
dbc56b9d9f
|
removed unused page supervisorantiplagiarismlinkpage
|
2013-09-18 15:55:00 +09:00 |
|
Emil Siverhall
|
1003ab4882
|
minor changes to milestone checkbox panel
|
2013-09-18 08:45:22 +02:00 |
|
fred-fri
|
4aa02ae553
|
removed unused scheduletemplatesmodel
|
2013-09-18 15:38:05 +09:00 |
|
fred-fri
|
e74ced5c0a
|
removed unused scheduletemplatedetailspage
|
2013-09-18 15:37:22 +09:00 |
|
