DMC/scipro
7
0
Fork 0
Code Issues 20 Pull Requests 8 Actions Projects 1 Wiki Activity
2,327 Commits 11 Branches 410 Tags 74 MiB
2011-12-08
Commit Graph

2327 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fredrik Norberg
e72b8d16eb added funtionality for default checklists and fixed some bugs with checklist uploads 2011-09-27 15:40:59 +02:00
Fredrik Norberg
57510dbc7d Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro: (26 commits)
  mounted page urls for peer reviews from admin perspective.
  removed more classes that is used by old peer review templates and removed associations to those files from persistence and test files.
  replaced StaticImage with ContextImage so traffic lights in peer reviews works with mounted bookmarkable pages.
  removed files associated with old peer review templates and made minor changes to those pages that used these files.
  tog bort gamla paneler
  bytte till dataview på logen, nu finns paginering
  buggfixar på loggen
  Forgot some cleanup, nothing to see here folks
  Implemented selection-box style uploads on peer requests.
  små fixar på state of mind texten och fliknamn project details
  Basic adding of sortable field-headers (with a DataView+Provider pair) on the admin->projectmanagement page.
  fixade så man ser vem som skrivit logginlägg
  loggens basfunktionalitet fungerar!
  loggens basfunktionalitet fungerar!
  loggens basfunktionalitet fungerar!
  lade till kommentarer
  fixat logg? ajaxknapp kvar
  added orderBy annotation to list of answers in peer reviews
  rewrite of peer unit tests to match new checklists
  some changes to traffic light panel behavior so the correct answered peer questions is being saved when a peer review is not validated for submission.
  ...
 2011-09-27 15:24:18 +02:00
Fredrik Friis
fcfd3836ef har fixat dålig ajax nu 2011-09-27 19:06:17 +09:00
Fredrik Friis
e89c062d59 har fixat dålig ajax nu 2011-09-27 19:03:51 +09:00
Emil Siverhall
dac415c97a Merge branch 'checkListPeer' into develop 
* checkListPeer:
  mounted page urls for peer reviews from admin perspective.
  removed more classes that is used by old peer review templates and removed associations to those files from persistence and test files.
  replaced StaticImage with ContextImage so traffic lights in peer reviews works with mounted bookmarkable pages.
  removed files associated with old peer review templates and made minor changes to those pages that used these files.
  added orderBy annotation to list of answers in peer reviews
  rewrite of peer unit tests to match new checklists
  some changes to traffic light panel behavior so the correct answered peer questions is being saved when a peer review is not validated for submission.
  minor design changes when adjusting peer for new checklist templates
  some design adjustments on display of traffic lights in submitted peer reviews
  Peer reviews now use traffic lights and correct traffic light is being displayed when review is submitted. Peers now only use peer specific templates as well.
  new preview dialog for checklist templates in peer
  Peer checklists with traffic lights and free text comments
  adding trafficLights and new checklist templates to peer reviews
 2011-09-27 11:25:32 +02:00
Emil Siverhall
05e8f464c6 mounted page urls for peer reviews from admin perspective. 2011-09-27 11:14:06 +02:00
Emil Siverhall
47d90e88e1 removed more classes that is used by old peer review templates and removed associations to those files from persistence and test files. 2011-09-27 11:04:48 +02:00
Robin Eklund
30b46d8fd5 Changed some faulty usage of SimpleDateFormat to use our own controllable DateFormatter 2011-09-27 10:17:53 +02:00
Emil Siverhall
e1a2ec5bab replaced StaticImage with ContextImage so traffic lights in peer reviews works with mounted bookmarkable pages. 2011-09-27 10:08:38 +02:00
Robin Eklund
cd680960a9 Changed verbosity on external auth logging 2011-09-27 09:50:44 +02:00
Emil Siverhall
b07d149100 resolved merge conflicts in peer request submission page. 2011-09-27 09:35:57 +02:00
Emil Siverhall
3b87a1c750 removed files associated with old peer review templates and made minor changes to those pages that used these files. 2011-09-27 08:41:51 +02:00
Fredrik Friis
9523d4a4da tog bort gamla paneler 2011-09-27 15:22:03 +09:00
Fredrik Friis
6d2b0a961d bytte till dataview på logen, nu finns paginering 2011-09-26 15:13:09 +09:00
Fredrik Friis
1f38d81ca2 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-09-26 14:14:08 +09:00
Fredrik Friis
41f657379d buggfixar på loggen 2011-09-26 14:13:42 +09:00
Robin Eklund
e346b2668b Forgot some cleanup, nothing to see here folks 2011-09-23 15:27:19 +02:00
Robin Eklund
e9b6f42904 Added new style upload functionality to peer requests, had to remodel the api a bit to support subtyping better. 2011-09-23 15:22:30 +02:00
Robin Eklund
db38f09783 Implemented selection-box style uploads on peer requests. 2011-09-23 15:09:36 +02:00
Fredrik Friis
52ce72abb5 små fixar på state of mind texten och fliknamn project details 2011-09-23 14:35:26 +09:00
Robin Eklund
1d1fa76f6d Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2011-09-22 12:44:26 +02:00
Robin Eklund
bc0de59c00 Basic adding of sortable field-headers (with a DataView+Provider pair) on the admin->projectmanagement page. 
This is not intended to serve as an example on how to do something like, just proof of concept.
 2011-09-22 12:42:31 +02:00
Fredrik Friis
d3b2dcdfef fixade så man ser vem som skrivit logginlägg 2011-09-22 17:39:54 +09:00
Fredrik Friis
7365a82b13 loggens basfunktionalitet fungerar! 2011-09-22 16:01:22 +09:00
Fredrik Friis
616dc110d5 loggens basfunktionalitet fungerar! 2011-09-22 15:55:16 +09:00
Fredrik Friis
da64e54761 loggens basfunktionalitet fungerar! 2011-09-22 15:45:21 +09:00
Fredrik Friis
e36e9cfd6d lade till kommentarer 2011-09-22 14:55:31 +09:00
Fredrik Friis
bd5b9c9b94 fixat logg? ajaxknapp kvar 2011-09-21 21:29:54 +09:00
Fredrik Norberg
41eef54787 fixed merge conflicts 2011-09-21 10:01:00 +02:00
Emil Siverhall
f2a2b0bced added orderBy annotation to list of answers in peer reviews 2011-09-20 16:39:38 +02:00
Fredrik Norberg
4caa4a3242 Merge branch 'checklists' into develop 
* checklists:
  fixed checklist url, changed imagetype in trafficlightspanel and did adressed some minor bugs in answering checklists
 2011-09-20 15:31:18 +02:00
Fredrik Norberg
6e885b3d38 fixed checklist url, changed imagetype in trafficlightspanel and did adressed some minor bugs in answering checklists 2011-09-20 15:28:07 +02:00
Emil Siverhall
241064fb97 rewrite of peer unit tests to match new checklists 2011-09-20 14:27:07 +02:00
Fredrik Norberg
17a3dc356f Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
  Changed title of link to Turnitin report
  tog bort logfliken eftersom den ännu inte är klar
  some more fixes to make the sending of documents to Turnitin work properly.
  Fixed bug that gave page error when clicking on Turnitin link in supervisor view
  kommenterade ut buggraden
  sciprologgan skall leda till https://thesis.dsv.su.se
  log halvfärdigt, problem med model och daosarna
  skapat panel för inläggning av logginlägg samt instantierng av loggar och logginlägg
  fixar sidor för införing av logginlägg
 2011-09-20 13:16:31 +02:00
Emil Siverhall
8573045eec Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
  tog bort logfliken eftersom den ännu inte är klar
 2011-09-20 10:36:49 +02:00
Emil Siverhall
7c011b8519 Merge branch 'turnitinTest' into develop 
* turnitinTest:
  Changed title of link to Turnitin report
 2011-09-20 10:36:30 +02:00
Emil Siverhall
9aa3ced058 Changed title of link to Turnitin report 2011-09-20 10:36:08 +02:00
Fredrik Friis
7fd8f0f28c tog bort logfliken eftersom den ännu inte är klar 2011-09-20 16:35:50 +09:00
Emil Siverhall
6c9021ce08 Merge branch 'turnitinTest' into develop 
* turnitinTest:
  some more fixes to make the sending of documents to Turnitin work properly.
 2011-09-19 15:22:58 +02:00
Emil Siverhall
4d8628d206 some more fixes to make the sending of documents to Turnitin work properly. 2011-09-19 15:22:38 +02:00
Emil Siverhall
1d58dbaa40 Merge branch 'turnitinTest' into develop 
* turnitinTest:
  Fixed bug that gave page error when clicking on Turnitin link in supervisor view
 2011-09-19 13:13:50 +02:00
Emil Siverhall
ffe081269b Fixed bug that gave page error when clicking on Turnitin link in supervisor view 2011-09-19 13:05:27 +02:00
Fredrik Friis
38de64e383 Merge branch 'logimpl' into develop 2011-09-19 17:06:12 +09:00
Fredrik Friis
14b0280c3c kommenterade ut buggraden 2011-09-19 16:59:44 +09:00
Fredrik Friis
0bdf7d27c4 sciprologgan skall leda till https://thesis.dsv.su.se 2011-09-19 16:37:09 +09:00
Fredrik Friis
e8158d6cf7 log halvfärdigt, problem med model och daosarna 2011-09-19 16:13:02 +09:00
Fredrik Norberg
3447769470 Merge branch 'checklists' into develop 
* checklists:
  fixed a bugg where checklist answers were replicated
 2011-09-16 17:40:57 +02:00
Fredrik Norberg
1880d10f4c fixed a bugg where checklist answers were replicated 2011-09-16 17:39:54 +02:00
Fredrik Norberg
38a6a7254a Merge branch 'checklists' into develop 
* checklists:
  improved the checklist admin functionality
 2011-09-16 14:34:21 +02:00
Fredrik Norberg
140f817b22 improved the checklist admin functionality 2011-09-16 14:33:11 +02:00