Marcus Höjvall
a05f45fd47
Minor fixes
2011-08-17 16:05:17 +02:00
Fredrik Norberg
2ff36248fe
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
lade in freddes legend
2011-08-17 16:05:04 +02:00
Fredrik Norberg
9c479e1ba1
design changes to checklist supervisor, admins and projectpartner
2011-08-17 16:04:29 +02:00
Marcus Höjvall
29cb519dc2
Minor bugfix
2011-08-17 15:57:54 +02:00
Marcus Höjvall
715a2d44ed
Removed message board link which didn't link to anything
2011-08-17 15:56:03 +02:00
Marcus Höjvall
eeb662c36b
Added a header to the panel
2011-08-17 15:54:25 +02:00
Marcus Höjvall
c829b310a1
Made the labels null safe by using PropertyModel
2011-08-17 15:53:43 +02:00
Marcus Höjvall
29ebe09b8c
Removed header for projectProgressPanel
2011-08-17 15:50:24 +02:00
Marcus Höjvall
1a64cda3fd
Renamed and moved ProjectDetailsPanel to project
2011-08-17 15:48:00 +02:00
Fredrik Friis
bd5d428ac2
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-08-17 19:46:12 +09:00
Fredrik Friis
64c2b3b928
lade in freddes legend
2011-08-17 19:45:59 +09:00
Fredrik Norberg
3753508fb0
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
lade in bilder
lade till bilder på demosidan
2011-08-17 11:23:58 +02:00
Fredrik Norberg
98a2fe24b9
minor html fix
2011-08-17 11:23:23 +02:00
Fredrik Friis
2be81dd6e2
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-08-17 17:42:49 +09:00
Fredrik Friis
6a79c91511
lade in bilder
2011-08-17 17:42:35 +09:00
Fredrik Friis
0d2da61d4e
lade till bilder på demosidan
2011-08-17 17:41:48 +09:00
Fredrik Norberg
f3f9f4a013
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
redigerade demosidan
2011-08-17 10:18:26 +02:00
Fredrik Norberg
0d7c7a30af
Merge branch 'checklists' into develop
...
* checklists:
tooltips dont show for empy comments
2011-08-17 10:18:02 +02:00
Fredrik Norberg
c8217e2900
tooltips dont show for empy comments
2011-08-17 10:17:33 +02:00
Fredrik Friis
32cb2d5f08
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-08-17 16:56:42 +09:00
Fredrik Friis
b8f506897b
redigerade demosidan
2011-08-17 16:56:02 +09:00
Fredrik Norberg
018f66dce3
Merge branch 'checklists' into develop
...
* checklists:
small design fixes
design improvements
added picture for no answer and made the trafficLights interactive
2011-08-16 17:36:11 +02:00
Fredrik Norberg
524e0bfb2e
small design fixes
2011-08-16 17:35:45 +02:00
Fredrik Norberg
7bccab0e0e
design improvements
2011-08-16 17:35:45 +02:00
Fredrik Norberg
b7a5f08d6e
added picture for no answer and made the trafficLights interactive
2011-08-16 17:35:45 +02:00
Fredrik Norberg
34b491bb3e
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
rensade demosidan
tog bort fieldview från demosidan
fixed some errors in peer portal feedback messages.
added a label for deadline date for peer reviews in progress or completed.
added details button to see abort reasons in a new dialog.
2011-08-16 17:35:09 +02:00
Marcus Höjvall
594eab64d4
Added panel for showing project details
2011-08-16 17:10:13 +02:00
Marcus Höjvall
647eed3cb9
Changed to title to link to project details
2011-08-16 17:10:02 +02:00
Marcus Höjvall
1bcea8b14a
Added panel for showing project details
2011-08-16 17:03:54 +02:00
Marcus Höjvall
9f5885aeee
Removed getEventParticipantAsString and added getNameAsString
2011-08-16 17:00:45 +02:00
Marcus Höjvall
ed98cd11cd
Added method getNameAsString()
2011-08-16 16:59:27 +02:00
Marcus Höjvall
82db1e2fb7
Added methods:
...
getProjectReviewers()
getProjectReviewersAsString()
getProjectCoSupervisors()
getProjectCoSupervisorsAsString()
Fixed methods:
getProjectParticipantsAsString()
2011-08-16 16:55:32 +02:00
Emil Siverhall
01dad3998d
added textfield for number of days waiting peers should stay in the system without being accepted. + small css fix for textarea widths.
2011-08-16 16:19:20 +02:00
Fredrik Friis
9eed81af23
rensade demosidan
2011-08-16 18:24:35 +09:00
Fredrik Friis
a451117f5c
tog bort fieldview från demosidan
2011-08-16 11:58:40 +09:00
Emil Siverhall
fb311b1850
Merge branch 'peerWorkerThreads' into develop
...
* peerWorkerThreads:
fixed some errors in peer portal feedback messages.
2011-08-15 20:06:35 +02:00
Emil Siverhall
d4a2349670
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
added funtionality for everyone related to a project to answer checklists, tooltips and comments
2011-08-15 20:06:04 +02:00
Emil Siverhall
9a5d84ceaa
fixed some errors in peer portal feedback messages.
2011-08-15 20:03:38 +02:00
Fredrik Norberg
7e00ccda72
Merge branch 'checklists' into develop
...
* checklists:
added funtionality for everyone related to a project to answer checklists, tooltips and comments
2011-08-15 16:59:25 +02:00
Fredrik Norberg
008f114ff4
added funtionality for everyone related to a project to answer checklists, tooltips and comments
2011-08-15 16:51:58 +02:00
Fredrik Norberg
22ec44f377
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
Fixed css for firefox in supervisor, project details
fixade så att flikarnas storlek nu kan modifieras ifrån en enda klass
2011-08-15 16:51:42 +02:00
Emil Siverhall
33208428b0
Merge branch 'abortPeerImprovements' into develop
...
* abortPeerImprovements:
added a label for deadline date for peer reviews in progress or completed.
added details button to see abort reasons in a new dialog.
2011-08-15 10:21:43 +02:00
Emil Siverhall
6002cc3032
added a label for deadline date for peer reviews in progress or completed.
2011-08-15 10:13:54 +02:00
Emil Siverhall
8e6f0fb74b
added details button to see abort reasons in a new dialog.
2011-08-15 08:49:42 +02:00
Marcus Höjvall
7d90fc1366
Merge branch 'fixes_for_ff' into develop
...
* fixes_for_ff:
Fixed css for firefox in supervisor, project details
2011-08-12 15:21:32 +02:00
Marcus Höjvall
415490b26a
Fixed css for firefox in supervisor, project details
2011-08-12 15:21:09 +02:00
Fredrik Friis
0ff3376f37
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-08-12 19:06:56 +09:00
Fredrik Friis
2a2aaac1fe
fixade så att flikarnas storlek nu kan modifieras ifrån en enda klass
2011-08-12 19:06:18 +09:00
Fredrik Norberg
6e3b5f93cd
changed to deployment
2011-08-12 11:20:59 +02:00
Fredrik Norberg
aeee6134aa
Merge branch 'checklists' into develop
...
* checklists:
bugfixes, supervisors can now see cheklists and admin is working again
implemented functionality to delete checklists and fixed some bugs
added delete functionality for checklistfiles
Implemented funtionality to upload files to checklists
daily commit
added design to the checklist listviews
finalized funtionality to answer checklists and change your answer
trafficlight now uses new images
partially added the functionality to answer checklists
added functionality to show a checklist
added functionality to add checklists to projects
many additions to checklist classes
started on addCheckListToProjectPanel
2011-08-12 11:15:42 +02:00