lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4589 Lower log levels, as involved situations are not necessarily errors

LDEV-4589 Lower log levels, as involved situations are not necessarily errors

LDEV-4589 Pass lsId parameter as Long

LDEV-4589 Pass lsId parameter as Long

Merge branch 'master' into develop

LDEV-4589 Add proper label to lineitem

LDEV-4589 Add proper label to lineitem

Merge branch 'master' of github.com:lamsfoundation/lams

Merge branch 'master' into develop

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java

lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java

Merge branch 'master' of github.com:lamsfoundation/lams

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

LDEV-4853 Fix a minor issue with empty folder display

LKC-214 In sysadmin add entry point for blueprint management page

LDEV-4589 Adjust LTI Deep Linking & Membership services for Blackboard

LDEV-4589 Correctly spell "givenName" parameter

Merge branch 'master' of github.com:lamsfoundation/lams

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

    • -0
    • +4
    /lams_central/web/css/bootstrap-treeview.css
LDEV-4853 Add comments to code. Adjust layout. Minor fixes.

    • -2
    • +2
    /lams_central/web/css/bootstrap-treeview.css
    • -9
    • +24
    /lams_central/web/includes/javascript/addLesson.js
LDEV-4853 Rewrite YUI folder tree in Add Lesson dialog to bootstrap

Initial YUI clean up.

Fix minor issues.

    • -64
    • +0
    /lams_central/web/css/yui/folders.css
    • -7
    • +0
    /lams_central/web/css/yui/treeview.css
    • binary
    /lams_central/web/images/css/yui/folders/lm.gif
    • binary
    /lams_central/web/images/css/yui/folders/lmh.gif
    • binary
    /lams_central/web/images/css/yui/folders/ln.gif
    • binary
    /lams_central/web/images/css/yui/folders/lp.gif
    • binary
    /lams_central/web/images/css/yui/folders/lph.gif
    • binary
    /lams_central/web/images/css/yui/folders/tm.gif
    • binary
    /lams_central/web/images/css/yui/folders/tmh.gif
    • binary
    /lams_central/web/images/css/yui/folders/tn.gif
    • binary
    /lams_central/web/images/css/yui/folders/tp.gif
    • binary
    /lams_central/web/images/css/yui/folders/tph.gif
  1. … 14 more files in changeset.
LDEV-4853 Rewrite YUI folder tree in LD authoring to bootstrap

    • -6
    • +3
    /lams_central/web/authoring/authoring.jsp
    • -0
    • +43
    /lams_central/web/css/bootstrap-treeview.css
    • -0
    • +145
    /lams_central/web/includes/javascript/learning-design-treeview.js
LDEV-4852 Adding createDateTime to XML outputs

Merge remote-tracking branch 'origin/develop' into v4.0

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

Merge branch 'LDEV-4848' into LDEV-4745

LDEV-4848 Internationalise labels in Question Bank

    • -28
    • +32
    /lams_central/web/qb/collection.jsp
    • -11
    • +12
    /lams_central/web/qb/collectionList.jsp
LDEV-4827, LDEV-4844 Prevent question merging if admin setting if OFF

Merge branch 'LDEV-4827' into LDEV-4844

LDEV-4827, LDEV-4844 Toggle question merging is admin panel

LDEV-4745 Set tool content ID in MCQ questions when importing a LD

Merge branch 'LDEV-4846' into LDEV-4745

LDEV-4846 Export/import QB questions' content folders