Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV Adding CSRF to Scratchie authoring

  1. … 3 more files in changeset.
LDEV-4875 Add VSA question type to Assessment and Scratchie

  1. … 75 more files in changeset.
LDEV-4838 Scratchie authoring to work similarly to Assessment (instantaneous changes to QbQuestions)

* Also changed addItem.jsp to look similarly to Assessment add question

pages

* Proper handling of collections in Scratchie

  1. … 14 more files in changeset.
Merge branch 'develop' into LDEV-4759

# Conflicts:

# lams_central/web/authoring/template/tool/mcquestion.jsp

# lams_central/web/authoringConfirm.jsp

# lams_central/web/css/_learner_base.scss

# lams_central/web/profile/editprofile.jsp

# lams_learning/web/optionsActivity.jsp

# lams_monitoring/web/monitor.jsp

# lams_monitoring/web/tblmonitor/sequence.jsp

# lams_monitoring/web/tblmonitor/teams.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/common/monitoringheader.jsp

# lams_tool_preview/web/pages/monitoring/criteria.jsp

# lams_tool_preview/web/pages/monitoring/reflections.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp

# lams_tool_task/web/common/monitorheader.jsp

  1. … 94 more files in changeset.
LDEV-4746 Rename ScratchieAnswer to QbOptionDTO to reduce ambiguity

  1. … 26 more files in changeset.
LDEV-4746 Ignore CKEditor during validation

There is no rule for Scratchie description anyway. And validate plugin

tries to validate a CKEditor div with contenteditable="true" but with no

id or name. There is no point in doing it as contents get moved to a

named textarea before submit.

LDEV-4785 Fix a reference to incorrect form when displaying description

LDEV-4746 Migrate Scratchie to QB

  1. … 31 more files in changeset.
LDEV-4759 Panels are now cards.

  1. … 506 more files in changeset.
LDEV-4440 Clean up shared files

  1. … 206 more files in changeset.
LDEV-4440 Scratchie NoStruts library

  1. … 27 more files in changeset.
LDEV-4440 Q&A autosave fix

  1. … 13 more files in changeset.
LDEV-4440 Scribe & Scratchie work in progress

  1. … 38 more files in changeset.
LDEV-4367 SASS Used for CSS Development

First pass of converting our .css development to use SASS. Autobuild to

convert .scss to .css files has been set up for all projects where

target .css files were found. The overall ANT build has been modified

so the normal build will generate the .css files from .scss files. The

base variables are defined in lams_build/conf/sccs.

  1. … 158 more files in changeset.
LDEV-4036 Readjust thickbox so it doesn't have extra scrolls * Also made Thickbox to always use default values for width:90% and height:100%. In case when these values should be different, one can provide width and height values as parameters

  1. … 41 more files in changeset.
LDEV-3959: Fixing path - css file was not found resulting in a 404 error.

LDEV-3822: Bootstrapping Admin, Author, Monitor. Tweaked learner to match the colours of the jqgrids

  1. … 39 more files in changeset.
LDEV-2917: Change DOCTYPE tag of files which have not been picked up by previous runs as they had this tag broken into 2 lines and regex had not detected them.

  1. … 340 more files in changeset.
LDEV-3273 switched to the latest version of jQuery Validation Plugin

  1. … 17 more files in changeset.
LDEV-3273 switched to the latest version of jQuery Validation Plugin

  1. … 17 more files in changeset.
LDEV-2895 * Monitoring: showing the order in which students selected answers. * updating jquery libraries names * fixing a few bugs

  1. … 20 more files in changeset.
LDEV-2895 further changes to Scartchie's authoring and learner

  1. … 14 more files in changeset.
LDEV-2895 Multiple scratches is allowed in scratchie tool

  1. … 31 more files in changeset.