Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4853 Fix a minor issue with empty folder display

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

LDEV-4853 Add comments to code. Adjust layout. Minor fixes.

LDEV-4853 Rewrite YUI folder tree in Add Lesson dialog to bootstrap

Initial YUI clean up.

Fix minor issues.

    • binary
    ./images/css/yui/folders/loading.gif
  1. … 14 more files in changeset.
LDEV-4853 Rewrite YUI folder tree in LD authoring to bootstrap

    • -0
    • +43
    ./css/bootstrap-treeview.css
    • -3241
    • +3204
    ./includes/javascript/authoring/authoringGeneral.js
    • -0
    • +1425
    ./includes/javascript/bootstrap-treeview.js
    • -0
    • +145
    ./includes/javascript/learning-design-treeview.js
  1. … 1 more file in changeset.
LDEV-4848 Internationalise labels in Question Bank

  1. … 1 more file in changeset.
LDEV-4827, LDEV-4844 Prevent question merging if admin setting if OFF

  1. … 1 more file in changeset.
LDEv-4844 Allow manual QB question merging

  1. … 5 more files in changeset.
LDEV-4838 Move collection processing to common utils method

  1. … 3 more files in changeset.
LDEV-4836 Display limited set of question types for MCQ and Scratchie

LDEV-4836 Advanced search on authoring basic tab

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

button + collections dropdown

    • -0
    • +6
    ./css/bootstrap-select.css
    • -0
    • +9
    ./includes/javascript/bootstrap-select.js
    • -14
    • +19
    ./includes/javascript/qb-search.js
  1. … 10 more files in changeset.
LDEV-4746 Skip validation CKEditor for question description

jQuery validation plugin does not seem to work well with CKEditor.

LDEV-4834 Allow LO widget on add new QB question screen

  1. … 1 more file in changeset.
LDEV-4746 Use table as question ID generator for QbQuestion

In the future we can add new columns to lams_sequence_generator, so we

have a single table for generating new IDs instead table-per-ID.

  1. … 10 more files in changeset.
LDEV-4834 Revert to panel LO widget in QB question authoring

LDEV-4834 Use panel-less LO widget in QB question authoring

    • -10
    • +33
    ./WEB-INF/tags/OutcomeAuthor.tag
  1. … 62 more files in changeset.
LDEV-4834 Move Learning Outcomes widget to Settings tab

LDEV-4745 Remove CSS files generated from SCSS

LDEV-4834 Add Learning Outcomes widget to edit QB question screen

  1. … 2 more files in changeset.
LDEV-4745 Add Stats button to QB search

LDEV-4839 Refine import QB questions feature

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

    • -0
    • +44
    ./includes/javascript/qb-search.js
  1. … 13 more files in changeset.
LDEV-4828 Allow question sorting by usage in lessons on collection page

  1. … 1 more file in changeset.
LDEV-4782 Sort lessons by organisation. Include only active lessons.

  1. … 1 more file in changeset.
LDEV-4782 Add a link to open lesson monitor on QB stats page

LDEV-4837 Removing white line that appears on iPad partway down dialog

Merge branch 'LDEV-4834' into LDEV-4745

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java

lams_central/web/qb/collection.jsp

lams_central/web/qb/stats.jsp

lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java

lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java

lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

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

  1. … 9 more files in changeset.
LDEV-4836 Properly assign collections

  1. … 5 more files in changeset.
Merge branch 'LDEV-4745' into LDEV-4836

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

    • -0
    • +7
    ./css/bootstrap-toggle.css
    • -0
    • +28
    ./css/bootstrap-toggle.scss
    • -0
    • +394
    ./css/qb-question.scss
    • -0
    • +9
    ./includes/javascript/bootstrap-toggle.js
    • -0
    • +135
    ./includes/javascript/qb-option.js
    • -0
    • +80
    ./includes/javascript/qb-question.js
    • -0
    • +29
    ./qb/authoring/addQuestionFooter.jsp
    • -0
    • +28
    ./qb/authoring/addQuestionHeader.jsp
    • -0
    • +231
    ./qb/authoring/addessay.jsp
    • -0
    • +211
    ./qb/authoring/addmarkhedging.jsp
    • -0
    • +191
    ./qb/authoring/addmatchingpairs.jsp
    • -0
    • +292
    ./qb/authoring/addmultiplechoice.jsp
  1. … 62 more files in changeset.