DMC/scipro
7
0
Fork 0
Code Issues 27 Pull Requests 4 Actions Projects 1 Wiki Activity
3,718 Commits 8 Branches 416 Tags
Commit Graph

3418 Commits

Author SHA1 Message Date
Emil Siverhall
d7073d8422 fixed failing unit test for peer requests 2011-09-03 10:43:33 +02:00
Emil Siverhall
454818943e unit test modifications 2011-09-03 10:39:18 +02:00
Emil Siverhall
0d22d5d068 Merge branch 'adminPeerList' into develop 
* adminPeerList:
  Added unit tests for admin peer pages and peer review/request dao
 2011-09-03 10:10:49 +02:00
Emil Siverhall
79938681b8 Added unit tests for admin peer pages and peer review/request dao 2011-09-03 10:10:28 +02:00
Emil Siverhall
3fc0229c0d Merge branch 'adminPeerList' into develop 
* adminPeerList:
  Delete function is added to the Peer request list
  PeerRequestList is now sorted to show the latest created request first
  Added links to peer reviews in the admin list of all reviews. Reviews are displayed in new page AdminPeerReviewPage to keep the Admin tab highlighted.
  only waiting peer requests are now deletable.
  All peer requests and reviews are now listed for admins.
 2011-09-03 08:40:00 +02:00
Emil Siverhall
2df9037cd0 Delete function is added to the Peer request list 2011-09-03 08:30:36 +02:00
Fredrik Norberg
cb6a4ebe28 added functionality to edit checklistTemplates 2011-09-02 11:38:27 +02:00
Fredrik Norberg
f34b03c1ab started with functionality to add questions to checklist templates 2011-09-02 11:38:26 +02:00
Fredrik Friis
cddf80d1d7 Revert "css klass för underflikarna supervisor" 
This reverts commit 0e65a3d592583d2fc5225fdcc9dd1a5b04a9b4d5.

commitade av misstag
 2011-09-02 17:48:38 +09:00
Fredrik Friis
0e65a3d592 css klass för underflikarna supervisor 2011-09-02 16:42:53 +09:00
Fredrik Friis
4e963fe365 fixade till menysystemet supervisor>project details så det liknar mockuperna mer. 2011-09-01 20:57:05 +09:00
Fredrik Norberg
1e68cae726 changed color 2011-08-31 16:16:35 +02:00
Fredrik Norberg
414bcd1fa7 changed picture 2011-08-31 13:34:42 +02:00
Fredrik Norberg
623f88252a added classes for git demo 2011-08-31 11:57:58 +02:00
Emil Siverhall
25c34d237a PeerRequestList is now sorted to show the latest created request first 2011-08-30 16:45:52 +02:00
Emil Siverhall
4d5deca1c4 Added links to peer reviews in the admin list of all reviews. Reviews are displayed in new page AdminPeerReviewPage to keep the Admin tab highlighted. 2011-08-30 16:39:30 +02:00
Robin Eklund
79c6b9428f Added unit tests of error pages, and some minor refactoring. 2011-08-30 14:50:36 +02:00
Robin Eklund
036c62e3e4 Added some minor previewability stuff, not sure if we can do anything with this due to 
the aggressive modularization of our components but it's worth considering for new UI stuff.
 2011-08-30 13:19:33 +02:00
Fredrik Friis
3bc6b5f7ad fixade snyggare tabell supervisormyprojects 2011-08-30 17:19:35 +09:00
Fredrik Friis
04ba73b1fa Merge branch 'myfeature' into develop 2011-08-30 16:44:50 +09:00
Fredrik Friis
fa48377794 testar minska storleken på bilder 2011-08-30 15:38:30 +09:00
Fredrik Friis
05c88645a1 testar minska storleken på bilder 2011-08-30 15:32:56 +09:00
Robin Eklund
25abebfa15 Merge branch 'customErrorPages' into develop 2011-08-29 17:13:46 +02:00
Robin Eklund
3bc1f03da2 Added ability to create custom error pages, implementation might be a bit 
abstract but extending should be fairly straight forward.
 2011-08-29 17:13:14 +02:00
Fredrik Friis
ee66c22baa fixade supervisor my projects tabellen enligt mockups 2011-08-29 18:22:53 +09:00
Emil Siverhall
e0d5ab7f19 only waiting peer requests are now deletable. 2011-08-28 21:38:54 +02:00
Emil Siverhall
60e92bdcce All peer requests and reviews are now listed for admins. 2011-08-28 20:54:45 +02:00
Robin Eklund
a18cfea73e Logout link removed when external authentication is configured. 2011-08-25 11:32:39 +02:00
Robin Eklund
166f6afbd7 Removed auto-ddl update command not intended for production use 2011-08-24 13:33:56 +02:00
Fredrik Friis
e9526bf6a2 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-08-24 00:06:48 +09:00
Fredrik Friis
d197e7a48f lade in panel på supervisordelen, fixade så att den går att ladda 2011-08-24 00:06:14 +09:00
Fredrik Norberg
fbf52de05d buggfixes where the wrong roles were sent as parameter 2011-08-23 16:39:57 +02:00
Fredrik Friis
6a40889724 fixade lite buggar med bilderna 2011-08-23 15:44:28 +09:00
Fredrik Friis
4e0e8878ba Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-08-22 18:21:58 +09:00
Fredrik Friis
a737d16ca2 fixade hjälpboll på supervisorstateofmindpanelen och ändrade descriptions lite 2011-08-22 18:21:37 +09:00
Emil Siverhall
1076f4c88a added unit test for findAcceptedReviewsAborted 2011-08-22 10:29:00 +02:00
Emil Siverhall
943adba384 minor name change in worker scheduler 2011-08-21 22:16:42 +02:00
Emil Siverhall
245f02069c added abort reason for reviews where deadline is reached. 2011-08-21 22:05:48 +02:00
Emil Siverhall
17fe18f8e3 Merge branch 'develop' into peerAutoCancelPeers 
* develop: (32 commits)
  fixade en bugg
  la in bilder
  fixade bugg
  bytte namn på bilderna
  fixade in supervisorstateofmind
  skapade ny panel för supervisor att se stateofmind
  Changed 'Schedule' to 'Activity plan'
  Changed 'Schedule' to 'Activity plan' and done minor design fixes
  Minor fixes
  design changes to checklist supervisor, admins and projectpartner
  Minor bugfix
  Removed message board link which didn't link to anything
  Added a header to the panel
  Made the labels null safe by using PropertyModel
  Removed header for projectProgressPanel
  Renamed and moved ProjectDetailsPanel to project
  lade in freddes legend
  minor html fix
  lade in bilder
  lade till bilder på demosidan
  ...
 2011-08-21 21:53:59 +02:00
Emil Siverhall
a94a9068d7 Added worker that looks for old waiting peer requests. Also some changes in the way notifications.properties is loaded. 2011-08-21 20:44:39 +02:00
Fredrik Friis
b4da7aeac6 fixade en bugg 2011-08-19 19:19:06 +09:00
Fredrik Friis
6934426b1e Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-08-19 19:13:09 +09:00
Fredrik Friis
2e001efb64 la in bilder 2011-08-19 19:12:41 +09:00
Fredrik Friis
27637f67a9 fixade bugg 2011-08-19 19:11:28 +09:00
Fredrik Friis
e8dbb8322c bytte namn på bilderna 2011-08-19 19:09:24 +09:00
Fredrik Friis
3516f51b53 fixade in supervisorstateofmind 2011-08-19 17:22:44 +09:00
Fredrik Friis
477925ec44 skapade ny panel för supervisor att se stateofmind 2011-08-19 17:07:01 +09:00
Marcus Höjvall
62e3c26f2b Changed 'Schedule' to 'Activity plan' 2011-08-18 11:50:14 +02:00
Marcus Höjvall
bc3067fa63 Changed 'Schedule' to 'Activity plan' and done minor design fixes 2011-08-18 11:43:09 +02:00
Marcus Höjvall
73b7906bbc In supervisor, my projects, you can now click on a project title to get to the project details 
Merge branch 'supervisor_my_projects' into develop

* supervisor_my_projects:
  Minor fixes
  Minor bugfix
  Removed message board link which didn't link to anything
  Added a header to the panel
  Made the labels null safe by using PropertyModel
  Removed header for projectProgressPanel
  Renamed and moved ProjectDetailsPanel to project
  Added panel for showing project details
  Changed to title to link to project details
  Added panel for showing project details
  Removed getEventParticipantAsString and added getNameAsString
  Added method getNameAsString()
  Added methods:
 2011-08-18 10:50:28 +02:00