Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4879 Create lesson in subgroups at one go

  1. … 4 more files in changeset.
LDEV-4877 Bootstrap tourist replaced tour for Bootstrap 3.4.1

    • -0
    • +12
    ./bootstrap-tourist.min.js
  1. … 7 more files in changeset.
LDEV-4877 Upgrade bootstrap library to version 3.4.1

* bootstrap-slider to 10.6.2

* bootstrap-tour to 0.12.0

  1. … 3 more files in changeset.
LKC-221 Rearrange and regenerate LD SVG after activities were modified

LDEV-4875 Add VSA question type to Assessment and Scratchie

  1. … 75 more files in changeset.
LDEV-4871 Fix query string building when requesting a print page

LDEV-4853 Add info that treeview library has been customised for LAMS

LDEV-4853 Fix a minor issue with empty folder display

LDEV-4853 Make locks on read-only folders red.

  1. … 1 more file in changeset.
LDEV-4853 Add comments to code. Adjust layout. Minor fixes.

  1. … 1 more file in changeset.
LDEV-4853 Rewrite YUI folder tree in Add Lesson dialog to bootstrap

Initial YUI clean up.

Fix minor issues.

  1. … 22 more files in changeset.
LDEV-4853 Rewrite YUI folder tree in LD authoring to bootstrap

    • -3241
    • +3204
    ./authoring/authoringGeneral.js
    • -0
    • +1425
    ./bootstrap-treeview.js
    • -0
    • +145
    ./learning-design-treeview.js
  1. … 3 more files in changeset.
LDEV-4836 Advanced search on authoring basic tab

* "Random questions" page in authoring. Add "Select all questions"

button + collections dropdown

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