[sakai] svn commit: r106603 - in msub/iu.edu/oncourse/release-branches/oncourse_release_2012-04-05/sam: . docs docs/conversion samigo-app samigo-app/src/java/org/sakaiproject/tool/assessment/bundle samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/evaluation samigo-app/src/webapp/js samigo-app/src/webapp/jsf/author/item samigo-app/src/webapp/jsf/evaluation samigo-cp/src/java/org/sakaiproject/tool/assessment/contentpackaging

[gjthomas at iupui.edu]

Details: http://source.sakaiproject.org/viewsvn?root=svn&view=rev&rev=106603

Author: gjthomas at iupui.edu
Date: 2012-04-06 11:22:57 -0400 (Fri, 06 Apr 2012)
New Revision: 106603

Modified:
   msub/iu.edu/oncourse/release-branches/oncourse_release_2012-04-05/sam/
   msub/iu.edu/oncourse/release-branches/oncourse_release_2012-04-05/sam/docs/
   msub/iu.edu/oncourse/release-branches/oncourse_release_2012-04-05/sam/docs/conversion/
   msub/iu.edu/oncourse/release-branches/oncourse_release_2012-04-05/sam/samigo-app/
   msub/iu.edu/oncourse/release-branches/oncourse_release_2012-04-05/sam/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/
   msub/iu.edu/oncourse/release-branches/oncourse_release_2012-04-05/sam/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages.properties
   msub/iu.edu/oncourse/release-branches/oncourse_release_2012-04-05/sam/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/
   msub/iu.edu/oncourse/release-branches/oncourse_release_2012-04-05/sam/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/evaluation/HistogramQuestionScoresBean.java
   msub/iu.edu/oncourse/release-branches/oncourse_release_2012-04-05/sam/samigo-app/src/webapp/js/authoring.js
   msub/iu.edu/oncourse/release-branches/oncourse_release_2012-04-05/sam/samigo-app/src/webapp/jsf/author/item/matching.jsp
   msub/iu.edu/oncourse/release-branches/oncourse_release_2012-04-05/sam/samigo-app/src/webapp/jsf/evaluation/
   msub/iu.edu/oncourse/release-branches/oncourse_release_2012-04-05/sam/samigo-cp/src/java/org/sakaiproject/tool/assessment/contentpackaging/
Log:
svn merge -c106583 https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/trunk/sam/
--- Merging r106583 into 'samigo-app/src/java/org/sakaiproject/tool/assessment/bundle':
U    samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages.properties
--- Merging r106583 into 'samigo-app':
U    samigo-app/src/webapp/jsf/author/item/matching.jsp
U    samigo-app/src/webapp/js/authoring.js

svn log -c106583 https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/trunk/sam/
------------------------------------------------------------------------
r106583 | dsobiera at indiana.edu | 2012-04-05 15:19:42 -0400 (Thu, 05 Apr 2012) | 1 line

ONC-4612 - added editingMatch div creation in DOM so JS can check editing state. If editing, hide the first set of radio buttons (add choice/matchpair - add distracter).  If not editing show these radio buttons
------------------------------------------------------------------------