Property changes on: .
___________________________________________________________________
Added: svn:mergeinfo
   Merged /msub/iu.edu/oncourse/sakai-2.7.1/sam:r92056
   Merged /msub/iu.edu/oncourse/trunk/sam:r90346


Property changes on: samigo-cp
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /msub/iu.edu/oncourse/trunk/sam/samigo-cp:r90346


Property changes on: docs/conversion
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /msub/iu.edu/oncourse/sakai-2.7.1/sam/docs/conversion:r92056
   Merged /msub/iu.edu/oncourse/trunk/sam/docs/conversion:r90346


Property changes on: samigo-app/src/java/org/sakaiproject/tool/assessment/bundle
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /msub/iu.edu/oncourse/trunk/sam/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle:r90346


Property changes on: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/evaluation/HistogramQuestionScoresBean.java
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /msub/iu.edu/oncourse/trunk/sam/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/evaluation/HistogramQuestionScoresBean.java:r90346

Index: samigo-app/src/webapp/jsf/author/editPart.jsp
===================================================================
--- samigo-app/src/webapp/jsf/author/editPart.jsp	(revision 95222)
+++ samigo-app/src/webapp/jsf/author/editPart.jsp	(working copy)
@@ -66,7 +66,7 @@
 
   <h:panelGrid>
    <samigo:wysiwyg rows="140" value="#{sectionBean.sectionDescription}" hasToggle="yes">
-     <f:validateLength minimum="1" maximum="4000"/>
+     <f:validateLength minimum="1" maximum="60000"/>
    </samigo:wysiwyg>
   </h:panelGrid>
 

Property changes on: samigo-app/src/webapp/jsf/evaluation
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /msub/iu.edu/oncourse/trunk/sam/samigo-app/src/webapp/jsf/evaluation:r90346


Property changes on: samlite-impl
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /msub/iu.edu/oncourse/trunk/sam/samlite-impl:r90346


Property changes on: samigo-services
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /msub/iu.edu/oncourse/trunk/sam/samigo-services:r90346


Property changes on: samigo-qti
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /msub/iu.edu/oncourse/trunk/sam/samigo-qti:r90346


Property changes on: samigo-hibernate
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /msub/iu.edu/oncourse/trunk/sam/samigo-hibernate:r90346

Index: samigo-hibernate/src/java/org/sakaiproject/tool/assessment/data/dao/assessment/AssessmentBase.hbm.xml
===================================================================
--- samigo-hibernate/src/java/org/sakaiproject/tool/assessment/data/dao/assessment/AssessmentBase.hbm.xml	(revision 95222)
+++ samigo-hibernate/src/java/org/sakaiproject/tool/assessment/data/dao/assessment/AssessmentBase.hbm.xml	(working copy)
@@ -221,7 +221,7 @@
     <property name="duration" type="integer" column="DURATION" not-null="false" />
     <property name="sequence" type="integer" column="SEQUENCE" not-null="false" />
     <property name="title" type="string" length="255" column="TITLE" not-null="false" />
-    <property name="description" type="string" length="4000" column="DESCRIPTION" not-null="false" />
+    <property name="description" type="text" column="DESCRIPTION" not-null="false" />
     <property name="typeId" type="long" column="TYPEID" not-null="false" />
     <property name="status" type="integer" column="STATUS" not-null="true" />
     <property name="createdBy" type="string" length="255" column="CREATEDBY" not-null="true" />