Daniel Hasselrot
8bb62149ef
Moved switch view link to page
2011-11-14 16:33:26 +01:00
Daniel Hasselrot
da188e928f
Refactored out data to model
2011-11-14 16:33:26 +01:00
Daniel Hasselrot
60fe7db911
Added special bullet for other peoples non-answered questions
2011-11-14 16:33:26 +01:00
Daniel Hasselrot
f9e5c2bbe2
Works for real
2011-11-14 16:33:25 +01:00
Daniel Hasselrot
dca4b5b581
Current user is now allways first
2011-11-14 16:33:25 +01:00
Daniel Hasselrot
38c2ac9912
Refactored check list panel to use members
2011-11-14 16:33:24 +01:00
Daniel Hasselrot
676b9a6008
Added general members to get all involved in a project
2011-11-14 16:31:20 +01:00
Daniel Hasselrot
8d5e488f7e
Addes test for reviewer
2011-11-14 16:31:20 +01:00
Daniel Hasselrot
22e8d90cba
Added test for clicking answer button
2011-11-14 16:31:20 +01:00
Daniel Hasselrot
49f2d135a1
Added test for multiple users and supervisor (some test detect existing bugs and fail)
2011-11-14 16:31:20 +01:00
Daniel Hasselrot
ace3321b6d
Added test for bullets
2011-11-14 16:31:19 +01:00
Daniel Hasselrot
1a388251d4
Added test for author
2011-11-14 16:31:19 +01:00
Daniel Hasselrot
07f0936b8c
Refactored test
2011-11-14 16:31:19 +01:00
Daniel Hasselrot
f2b1eac46e
Change test to use jsoup
2011-11-14 16:31:19 +01:00
Daniel Hasselrot
e0fd42787d
Added simple test for checklist
2011-11-14 16:31:18 +01:00
Daniel Hasselrot
619d05c2fc
Ignoring eclipse build files
2011-11-14 16:31:18 +01:00
Emil Siverhall
d1548d177e
Merge branch 'hotfix-peer_review' into release-2011-11-14
...
* hotfix-peer_review:
small design change to make attachment icons stay on the same line
re-added free text comment on peer reviews when checklist template not is attached. peer review couldn't be submitted without template or free text comment.
2011-11-14 16:23:39 +01:00
Emil Siverhall
5b90d39108
Merge branch 'hotfix-peer_review' into develop
...
* hotfix-peer_review:
small design change to make attachment icons stay on the same line
re-added free text comment on peer reviews when checklist template not is attached. peer review couldn't be submitted without template or free text comment.
buggfix, checklisttemplates can now be edited properly
2011-11-14 15:51:17 +01:00
Emil Siverhall
6d65cc6c28
small design change to make attachment icons stay on the same line
2011-11-14 15:27:30 +01:00
Emil Siverhall
91aef57528
re-added free text comment on peer reviews when checklist template not is attached. peer review couldn't be submitted without template or free text comment.
2011-11-14 15:14:58 +01:00
Emil Siverhall
ccb30b5cde
Merge branch 'noProjectLabel' into develop
...
* noProjectLabel:
added label in user settings when no author project is available
2011-11-13 20:38:51 +01:00
Emil Siverhall
b392e5df11
added label in user settings when no author project is available
2011-11-13 20:38:31 +01:00
Emil Siverhall
6e34a83c0e
Merge branch 'defaultPriority' into develop
...
* defaultPriority:
sets default notification priority to medium if no setting for this already exists.
2011-11-11 21:15:18 +01:00
Emil Siverhall
0e394afbc5
sets default notification priority to medium if no setting for this already exists.
2011-11-11 21:14:15 +01:00
Fredrik Norberg
01e7ecf16f
started to add categories to checklists
2011-11-11 15:07:44 +01:00
Fredrik Friis
b492763a1a
some bugs fixed
2011-11-11 18:34:22 +09:00
Fredrik Norberg
4bc15e66a1
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
SQL-update scripts re-packaged.
Fixed bug making project class erroneously editable
added no checklist info
added info for empty conference
added info for no files and folders
Made sure that a default set of checklist-categories are created at server start when they don't already exist.
Added feedback messaging for empty question text instead of exception throwing
2011-11-11 09:36:02 +01:00
Fredrik Friis
1856b08315
panel pretty much complete except ajax problems
2011-11-11 16:04:41 +09:00
Fredrik Friis
209072b673
ajaxform but list is not updated
2011-11-11 14:55:25 +09:00
Fredrik Friis
4f82170f52
non ajax form and repeater implemented
2011-11-11 12:59:13 +09:00
Fredrik Friis
9f633cc54c
problems with facade createnewlogentry method
2011-11-11 11:49:56 +09:00
Robin Eklund
d2f7ac53ff
Merge branch 'release-2011-11-10' into develop
2011-11-10 17:12:24 +01:00
Robin Eklund
50e39c8a9e
Fixed merge conflict.
2011-11-10
2011-11-10 17:11:19 +01:00
Robin Eklund
bc6516db20
SQL-update scripts re-packaged.
2011-11-10 17:02:59 +01:00
Robin Eklund
597bcaa658
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-11-10 14:17:05 +01:00
Robin Eklund
ac78d1af8c
Merge branch 'editableProjectClassFix' into develop
2011-11-10 14:16:53 +01:00
Robin Eklund
ae277dfecb
Fixed bug making project class erroneously editable
2011-11-10 14:16:32 +01:00
Fredrik Friis
11531ee13a
got halfway with log refactor
2011-11-10 17:43:04 +09:00
Fredrik Friis
3df43e871f
started log refactor
2011-11-10 15:43:25 +09:00
Fredrik Friis
553c6bf444
added no checklist info
2011-11-10 14:12:20 +09:00
Fredrik Friis
a403d693ef
added info for empty conference
2011-11-10 13:40:30 +09:00
Fredrik Friis
c0a490dd48
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-11-10 11:46:46 +09:00
Fredrik Friis
62c57e457d
added info for no files and folders
2011-11-10 11:46:31 +09:00
Robin Eklund
edddc7b8da
Merge branch 'addChecklistTemplateQuestion' into develop
2011-11-09 14:06:38 +01:00
Robin Eklund
1bd70229d8
Merge branch 'develop' into addChecklistTemplateQuestion
2011-11-09 13:55:10 +01:00
Robin Eklund
7abcd49a71
Made sure that a default set of checklist-categories are created at server start when they don't already exist.
...
Without this data, the application crashes whenever a checklist template is saved. Ideally, that should be fixed at some point.
2011-11-09 13:54:53 +01:00
Robin Eklund
082764a4dc
Merge branch 'develop' into addChecklistTemplateQuestion
2011-11-09 11:53:59 +01:00
Fredrik Norberg
8ca797835d
Merge branch 'small_fixes' into develop
...
* small_fixes:
change to checklistquestion compareTo
2011-11-09 11:46:05 +01:00
Fredrik Norberg
230a86e278
change to checklistquestion compareTo
2011-11-09 11:45:46 +01:00
Fredrik Norberg
aaa480e907
Merge branch 'small_fixes' into develop
...
* small_fixes:
changed from set to list in checklist so the questions gets the correct order
2011-11-09 11:09:50 +01:00