Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4708 Fix a merge issue

Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java

lams_central/web/forgotPassword.jsp

lams_central/web/forgotPasswordChange.jsp

lams_central/web/forgotPasswordProc.jsp

lams_tool_assessment/web/pages/learning/results.jsp

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

  1. … 33 more files in changeset.
LDEV-4706 Display assessment instructions in case display summary is ON

LDEV-4706 Display assessment instructions in case display summary is ON

LDEV-4440 Clean up shared files

  1. … 204 more files in changeset.
LDEV-4440 Full path is not required in these cases

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

LDEV-4440 Reintroduce custom textarea tags

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

LDEV-4440 Assessment noStruts

  1. … 64 more files in changeset.
LDEV-4586 Letter prefixes shown on results page

LDEV-4582 Able to add letter prefix to Assessment MCQ Answers

  1. … 11 more files in changeset.
LDEV-4540 Fix variable name clash when iterating over options

LDEV-4540 Change layout of other groups' answers for MC questions

  1. … 1 more file in changeset.
LDEV-4540 Show correct answers and user's answers separately

LDEV-4540 Move groups' answers under each question

  1. … 1 more file in changeset.
LDEV-4540 Do not show correct answers until they are disclosed

Till now other groups' answers were marked as correct no matter if

correct answers were disclosed by a monitor.

LDEV-4540 Refresh learners' results page when monitor discloses answers

  1. … 5 more files in changeset.
LDEV-4540 Disclose answers in TBL monitor and reflect it in learner

  1. … 11 more files in changeset.
LDEV-4540 Show other teams' answers on results page

  1. … 1 more file in changeset.
LDEV-4540 Show answers of current team

    • -0
    • +75
    ./results/tblsummary.jsp
  1. … 1 more file in changeset.
LDEV-4531 Essay Question displays 8 rows for text entry

LDEV-4470 Fix conflict between query-ui's slider and bootstrap-slider

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

  1. … 1 more file 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.

    • -0
    • +13
    ./parts/confidencelevel.jsp
    • -0
    • +13
    ./results/confidencelevel.jsp
  1. … 24 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. … 87 more files in changeset.
LDEV-4385: colours for assessment feedback

Depict the tick in green and the cross in red.

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. … 157 more files in changeset.