Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4836 Change authoring to accommodate importing questions from QB

  1. … 75 more files in changeset.
Merge remote-tracking branch 'origin/develop' into LDEV-4834

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

# lams_central/web/includes/javascript/ckconfig_custom.js

# lams_central/web/main.jsp

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_tool_assessment/conf/language/lams/ApplicationResources.properties

# lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

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

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

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

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

# lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp

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

# lams_tool_lamc/conf/language/lams/ApplicationResources.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java

# lams_tool_lamc/web/authoring/BasicContent.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/authoring/itemlist.jsp

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java

# lams_tool_scratchie/web/pages/learning/learning.jsp

# lams_tool_scratchie/web/pages/learning/scratchies.jsp

# lams_tool_scratchie/web/pages/monitoring/summary.jsp

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

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

  1. … 54 more files in changeset.
LDEV-4765 Further UI improvements

* True/False type of questions now use bootstrap-toggle widget

* Update jqeuryvalidate plugin. And make it show bootstrap-like warnings

* Disable autocomplete for all form inputs

* A few other minor fixes

  1. … 12 more files in changeset.
LDEV-4814 Wrap text properly in jqGrid

Move responsible CSS rules to the _learner_base.scss, so it affects all

jqGrid instances.

  1. … 7 more files in changeset.
LDEV-4765 UI improvements

* Use switches instead of checkboxes

* Properly use toggle in Mark hedging question type

    • -0
    • +28
    ./bootstrap-toggle.scss
  1. … 12 more files in changeset.
LDEV-4765 UI improvements

* Show CKEditor placeholder properly in cases when it's initially not

blank

* Proper transition on expanding/collapsing options

  1. … 3 more files in changeset.
LDEV-4765 Further work on this feature

* shrinking and expanding question options on selecting them

* improved placeholder for CKEditor

* arranged questions' Settings tab items

  1. … 17 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-4765 Fixed essay's slider CSS and validation

  1. … 1 more file in changeset.
LDEV-4765 Experimental switch and radio button for Mark hedging question

Also several other CSS and JS fixes.

  1. … 9 more files in changeset.
LDEV-4765 Apply new UI to other question types

  1. … 23 more files in changeset.
LDEV-4582 Able to add letter prefix to Assessment MCQ Answers

  1. … 11 more files in changeset.
LDEV-4451 Add scss files and fix their names

  1. … 9 more files in changeset.
LDEV-4367 CSS Files removed if they are now generated files using SASS

  1. … 41 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.

    • -0
    • +112
    ./assessment.scss
  1. … 155 more files in changeset.
LDEV-4352: Adding the Use Leader version of the Mark Charts to Assessment and fixing an update issue with ToolOutput settings.

  1. … 9 more files in changeset.
LDEV-4329 Fixed marked hedging questions' table formatting

  1. … 2 more files in changeset.
LDEV-4212: Improving the look of the result attempts table. Removed no longer used entries from css file. Using bootstrap css values where possible.

LDEV-4273: Initial check of Assessment's use of histogram. Added a simple summary table of results to the first worksheet in the spreadsheet export - grouping the overall marks received. Modified the SQL code used to do the Monitor screen paging as the CASE appears to be causing the marks to sort as if they were strings, rather than numbers.

  1. … 14 more files in changeset.
LDEV-4133:Mark hedging validation for justification is not showing properly

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

  1. … 1 more file in changeset.
LDEV-4036 Readjust thickbox positioning

  1. … 9 more files in changeset.
LDEV-3804 Update Assessment Author and Monitor to Bootstrap

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

  1. … 9 more files in changeset.
LDEV-3716 Update Assessment learner to bootstrap

  1. … 23 more files in changeset.
LDEV-3489 New question type for marks hedging

  1. … 21 more files in changeset.
LDEV-3489 New question type for marks hedging

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

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

  1. … 16 more files in changeset.