lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-3514 Make logs better for transaction retry mechanism

LDEV-4771 Re-introduce multiple activity authoring dialogs

    • -1
    • +1
    /lams_central/web/authoringConfirm.jsp
Merge branch 'master' into LDEV-4886

Merge branch 'master' into develop

# Conflicts:

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

Merge branch 'LDEV-4907' Password change correctly audited

LDEV-4907 Password changes corrected in audit

LDEV-4769 Updating labels

Norgewian and Greek

Merge branch 'LDEV-4880' into LDEV-4745

LDEV-4880 Add confidence level variations

  1. … 5 more files in changeset.
LDEV-4914 Do not allow NULLs in Lesson settings

LDEV-4914 Do not allow NULLs in Lesson settings

LDEV-4030 Prevent failedAttempts overflow in DB

LDEV-4030 Prevent failedAttempts overflow in DB

Merge remote-tracking branch 'origin/develop' into LDEV-4745

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

LDEV-4535 Use vanilla LAMS label for naming groups in TBL template

Merge branch 'LDEV-4912'

LDEV-4912 Add session time information to Logged In Users in sysadmin

    • -1
    • +13
    /lams_admin/web/sessionmaintain.jsp
LDEV-4746 Make generated question titles longer

LDEV-4911 Create structure for monitoring learning

Merge remote-tracking branch 'origin/develop' into LDEV-4745

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

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java

lams_central/web/includes/javascript/authoring/authoringGeneral.js

lams_central/web/includes/javascript/authoring/authoringProperty.js

    • -0
    • +4
    /lams_central/web/authoring/authoring.jsp
Merge branch 'SP-3'

Merge branch 'LDEV-4909'

LDEV-4909 Validate groupings and input on LD save

    • -0
    • +4
    /lams_central/web/authoring/authoring.jsp
LDEV-4909 Allow any grouping in any activity

Validation will be done before LD save

LDEV-4844 Add a missing label

LDEV-4848 Remove an unnecessary label

LDEV-4746 Make img tag stripping configurable in DB function

Merge branch 'LDEV-4844' into LDEV-4745