DMC/scipro
7
0
Fork 0
Code Issues 31 Pull Requests 3 Actions Projects 1 Wiki Activity
2,925 Commits 7 Branches 413 Tags
Commit Graph

2925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Fredrik Norberg
254edc1a57 bugfixes, supervisors can now see cheklists and admin is working again 2011-08-12 11:07:33 +02:00
Fredrik Norberg
b4d0b1655f implemented functionality to delete checklists and fixed some bugs 2011-08-12 11:07:33 +02:00
Fredrik Norberg
099292d02e added delete functionality for checklistfiles 2011-08-12 11:07:33 +02:00
Fredrik Norberg
ece5764800 Implemented funtionality to upload files to checklists 2011-08-12 11:07:33 +02:00
Fredrik Norberg
20f626dca2 daily commit 2011-08-12 11:07:33 +02:00
Fredrik Norberg
ad431891a0 added design to the checklist listviews 2011-08-12 11:07:33 +02:00
Fredrik Norberg
ef063072a9 finalized funtionality to answer checklists and change your answer 2011-08-12 11:07:33 +02:00
Fredrik Norberg
d90db16aa2 trafficlight now uses new images 2011-08-12 11:07:32 +02:00
Fredrik Norberg
4d32853ab3 partially added the functionality to answer checklists 2011-08-12 11:07:32 +02:00
Fredrik Norberg
868299100e added functionality to show a checklist 2011-08-12 11:07:32 +02:00
Fredrik Norberg
718cf0bd35 added functionality to add checklists to projects 2011-08-12 11:07:32 +02:00
Fredrik Norberg
f43b8c069a many additions to checklist classes 2011-08-12 11:07:32 +02:00
Fredrik Norberg
7294571f77 started on addCheckListToProjectPanel 2011-08-12 11:07:32 +02:00
Fredrik Norberg
0923f38e10 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 author, conference
  Fixed css for firefox in supervisor, schedule
 2011-08-12 11:05:25 +02:00
Marcus Höjvall
c7c2709c87 Merge branch 'fixes_for_ff' into develop 
Made layout fixes for firefox where some components where floating outside the website to the right

* fixes_for_ff:
  Fixed css for firefox in author, conference
  Fixed css for firefox in supervisor, schedule
 2011-08-12 10:55:20 +02:00
Fredrik Norberg
8d3c312bb3 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
  css fix
 2011-08-12 08:59:51 +02:00
Emil Siverhall
78a73b9d5f css fix 2011-08-12 08:58:58 +02:00
Fredrik Norberg
cf5fd7878a Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro: (21 commits)
  code cleanup after failed wicket test
  design changes when performing reviews and feedback panel error fix.
  Design changes when a reviewer is performing a review.
  Added cancel button to aborted peer panel
  fixade så att flikarnas storlek  nu kan modifieras ifrån en enda klass
  gjorde toppdelen lite mindre
  Aborting accepted peer reviews with notification to requester and reviewers supervisor.
  fixade positionering av toppflikarna igen
  flyttade resources och communications mer till höger
  fixade bakgrund på flikarna och rundade kanter
  tog bort border från multitabmenu
  fixade så alla flikar använder multitabmenucssklass
  fixade bort bakgrunder och lite borders på multitab
  fixade tillbaka, gjorde fel
  fixade så att både toppflikarna och underflikarna är samma css klasser
  flyttade in resource o messagesfliken lite till höger
  removed icons from buttons in peer portal.
  tog bort hänvisning till css klass som inte finns (abstract-menu)
  flyttade ner toppflikarna
  Aborting peer review features. Dialog in My requests and reviews added.
  ...
 2011-08-12 08:53:26 +02:00