Clone
 

michael gillian <mgillian@unicon.net> in Sakai.Git

SAM-1560 fix for None of the Above

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1430@103352 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAM-1553 fix

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1430@103270 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAM-1554 fix

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1430@103269 66ffb92e-73f9-0310-93c1-f5514f145a0a

merge 101728 to 102069

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@102070 66ffb92e-73f9-0310-93c1-f5514f145a0a

merging 101727 to 102068

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1430@102069 66ffb92e-73f9-0310-93c1-f5514f145a0a

Clean up merge

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@101753 66ffb92e-73f9-0310-93c1-f5514f145a0a

merge from 101346 to 101728

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@101729 66ffb92e-73f9-0310-93c1-f5514f145a0a

merging 101355 to 101727

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1430@101728 66ffb92e-73f9-0310-93c1-f5514f145a0a

Resolve merge conflict

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1430@101577 66ffb92e-73f9-0310-93c1-f5514f145a0a

Resolve merge conflict

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@101575 66ffb92e-73f9-0310-93c1-f5514f145a0a

Resolve merge conflict

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@101572 66ffb92e-73f9-0310-93c1-f5514f145a0a

Additional cleanup to simplify merge

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@101451 66ffb92e-73f9-0310-93c1-f5514f145a0a

Moving code to support easier merge

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@101449 66ffb92e-73f9-0310-93c1-f5514f145a0a

    • -15
    • +15
    /samigo/samigo-app/src/webapp/js/authoring.js
undo merge with SAM-1430

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@101421 66ffb92e-73f9-0310-93c1-f5514f145a0a

    • -21
    • +0
    /samigo/samigo-app/src/webapp/js/authoring.js
undo merge from SAM-1430

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@101413 66ffb92e-73f9-0310-93c1-f5514f145a0a

merge sam-1430 head to sam-1139 head

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@101383 66ffb92e-73f9-0310-93c1-f5514f145a0a

    • -0
    • +21
    /samigo/samigo-app/src/webapp/js/authoring.js
merge 100754 to 101354

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1430@101355 66ffb92e-73f9-0310-93c1-f5514f145a0a

merging 100753 to 101346

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@101352 66ffb92e-73f9-0310-93c1-f5514f145a0a

    • -0
    • +12
    /samigo/samigo-app/.settings/.jsdtscope
    • -0
    • +9
    /samigo/samigo-app/.settings/org.eclipse.jdt.core.prefs
    • -0
    • +7
    /samigo/samigo-app/.settings/org.eclipse.wst.common.project.facet.core.xml
    • -0
    • +8
    /samigo/samigo-app/.settings/org.maven.ide.eclipse.prefs
Update to variable and formula naming regular expression for Calcualted Questions

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@101310 66ffb92e-73f9-0310-93c1-f5514f145a0a

cleanup old code

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1430@101242 66ffb92e-73f9-0310-93c1-f5514f145a0a

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1430@101239 66ffb92e-73f9-0310-93c1-f5514f145a0a

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1430@101238 66ffb92e-73f9-0310-93c1-f5514f145a0a

Fix to throw an error when Respondus import has more matches than choices.

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1430@101226 66ffb92e-73f9-0310-93c1-f5514f145a0a

Calculated Question - fix to variable and formula naming regex.

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@101210 66ffb92e-73f9-0310-93c1-f5514f145a0a

Cleanup code, add fixes for save confirmation when no variables or formulas are changed.

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@101209 66ffb92e-73f9-0310-93c1-f5514f145a0a

Cleanup old code

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@101208 66ffb92e-73f9-0310-93c1-f5514f145a0a

Calculated Question improvements to online help

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@101086 66ffb92e-73f9-0310-93c1-f5514f145a0a

Calculated Question update to better validate data entry.

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@101085 66ffb92e-73f9-0310-93c1-f5514f145a0a

Calculated Question - reworded instructions to be clearer to the author.

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@101005 66ffb92e-73f9-0310-93c1-f5514f145a0a

Cleanup old code

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/SAM-1139@101004 66ffb92e-73f9-0310-93c1-f5514f145a0a