Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4836 Cope with random questions

* Properly set content_folder_id for old and new QB questions

* Prepare for recalculate marks after edit in monitor

  1. … 14 more files in changeset.
LDEV-4836 Change authoring to accommodate importing questions from QB

  1. … 74 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.
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. … 93 more files in changeset.
LDEV-4828 Add QB collections link on index page

  1. … 3 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.
Merge remote-tracking branch 'origin/master' into develop

LDEV-4811 Solve the problem of working with several open monitor dialogs

  1. … 1 more file in changeset.
LDEV-4814 Update free-jqGrid to the latest 4.15.5 version

  1. … 1 more file in changeset.
LDEV-4805 Finally switch to using free-jqGrid

  1. … 26 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-4804 Prevent Add Lesson button from being double clicked

  1. … 1 more file 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. … 18 more files in changeset.
Merge remote-tracking branch 'origin/master' into develop

    • -45
    • +45
    ./authoring/authoringProperty.js
  1. … 2 more files in changeset.
LDEV-4792 Rewrite authoring spinners from jQuery UI to plain HTML 5

    • -45
    • +45
    ./authoring/authoringProperty.js
  1. … 1 more file in changeset.
Merge branch 'master' into develop

  1. … 1 more file in changeset.
LDEV-4797 Remove isGateActivityCompletionBased flag in case schedule gate doesn't have preceding activity

  1. … 1 more file in changeset.
LDEV-4791 Fix link to delete course grouping controller

LDEV-4788 All learning outcomes are now global

  1. … 20 more files in changeset.
LDEV-4787 Fix incorrect spacing when copying activities in authoring

  1. … 5 more files in changeset.
LDEV-4751 Fix the issue of CKEditor not opening properly sometimes

(cherry picked from commit e7ead50c9d81d481127f232f4851c0cd56047639)

  1. … 1 more file in changeset.
LDEV-4751 Fix the issue of CKEditor not opening properly sometimes

  1. … 1 more file in changeset.
LDEV-4777 Initial implementation of question bank search feature

    • -0
    • +107
    ./jquery.highlight.js
  1. … 10 more files in changeset.
LDEV-4759 Tablesorter, Learner Progress Bar tweaked

  1. … 122 more files in changeset.
LDEV-4759 Gradebook and jqGrid restyled.

  1. … 50 more files in changeset.
Merge remote-tracking branch 'origin/master' into develop

LDEV-4780 Properly detect if authoring is in a frame

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

LDEV-4780 Use callbak to resize iframe instead of load detection

When iframe with LD for importing activities gets loaded, the SVG is not

ready yet and reports false height. Instead of detecting when it is

ready, authoring JS code in the iframe reports height when it loads

completely to its parent frame.

LDEV-4771 Remove close activity authoring confirmation screen

The JSP that controls the close action stays as it works differently in

various environments (authoring, monitoring, IE). It is just run

immediately instead of waiting for button click.

    • -10
    • +14
    ./authoring/authoringActivity.js
  1. … 25 more files in changeset.