Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'develop' into LDEV-4759

# Conflicts:

# lams_tool_assessment/web/pages/learning/parts/ordering.jsp

  1. … 3 more files in changeset.
LDEV-4762 Add drag and drop for answers in ordering question type

(cherry picked from commit 21e3286385ca1c464997e9792460b7712d23dcdd)

  1. … 7 more files in changeset.
LDEV-4762 Add drag and drop for answers in ordering question type

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

  1. … 506 more files in changeset.
LDEV-4708 update marks more skillfully after edit in monitor

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

  1. … 206 more files in changeset.
LDEV-4440 Resetting essay assessment vaildation and escaping

  1. … 1 more file in changeset.
LDEV-4440 Assessment essay type non CKEditor works again

LDEV-4440 Assessment noStruts

  1. … 74 more files in changeset.
LDEV-4470 Fix conflict between query-ui's slider and bootstrap-slider

  1. … 7 more files in changeset.
LDEV-4451 Make slider neater (narrower and with lesser text size)

  1. … 2 more files in changeset.
LDEV-4451 Allow learners to choose confidence levels

Add advanced option in Assessment/MCQ - 'Store Confidences'.

If this option is ON, then in learning show sliders which will allow

choosing confidence levels. Display stored levels in learning and

monitoring.

  1. … 29 more files in changeset.
LDEV-4406: Timing count preserved across page switch, Submit All

Also fixed a validation bug with Essay questions that had a

minimum word count but were not required.

  1. … 1 more file in changeset.
LDEV-4395 Leader related tools use Portrait for leader

Created a tag LeaderDisplay to display the leader consistently

across tools.

  1. … 88 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-4270 Started using redirects after submitting answers. this is done to prevent from sending form second time on page refresh

  1. … 1 more file in changeset.
LDEV-4279 Autosave essay type of questions

LDEV-4271 Refactor Assessment code * use DTO instead of model classes for carrying interim information * split learning.jsp into two pages: actual learning.jsp where user enters his answers and results.jsp where we display results to him

  1. … 44 more files in changeset.
LDEV-4228: Updated double submission handling to match other tools done recently for LDEV-4208. Buttons are disabled after validation and notebook is fixed.

  1. … 1 more file in changeset.
LDEV-4209: Disable Submit All, Next Activity and Finish buttons after clicking to prevent double submit.

LDEV-4133:Mark hedging validation for justification is not showing properly.

LDEV-3801 store the time limit launched time in DB

  1. … 11 more files in changeset.
LDEV-3801 store the time limit launched time in DB

  1. … 22 more files in changeset.
LDEV-4088 Fixed assessment questions that remain highlighted with warning even after answer has been provided

  1. … 1 more file in changeset.
LDEV-3716: fixing growl formatting

  1. … 1 more file in changeset.
LDEV-2951: removing unused images from assessment

  1. … 14 more files in changeset.
LDEV-4003 Fixed assessment timer disappearing on iPads when there are a lot of questions

LDEV-3716: fixing block

LDEV-3750 Ability to push marks to gradebook directly from Assessment

  1. … 8 more files in changeset.
LDEV-3716: Tweaked colours to match and switched images to font awesome

  1. … 9 more files in changeset.