Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5006 cosmetic changes and labels

    • -1
    • +1
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

    • -0
    • +2
    ./lams/ApplicationResources.properties
LDEV-5006 Make Zoom optional, configurable in advanced authoring tab

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 9 more files in changeset.
LDEV-5006 Protect Zoom meetings with passwords

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 8 more files in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

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/TblMonitorController.java

lams_tool_scratchie/web/pages/learning/scratchies.jsp

    • -1
    • +1
    ./lams/ApplicationResources.properties
  1. … 10 more files in changeset.
LDEV-4559 Better error handling in Zoom tool

    • -1
    • +1
    ./lams/ApplicationResources.properties
  1. … 2 more files in changeset.
LDEV-4786 Add missing labels

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 2 more files in changeset.
Merge remote-tracking branch 'origin/LDEV-4644'

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_central/web/WEB-INF/struts-config.xml

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java

lams_gradebook/web/gradebookMonitor.jsp

lams_monitoring/conf/language/lams/ApplicationResources.properties

    • -1
    • +4
    ./lams/ApplicationResources.properties
  1. … 14 more files in changeset.
Merge learning outcomes LDEV-4644 into lams31

    • -1
    • +4
    ./lams/ApplicationResources.properties
  1. … 14 more files in changeset.
LDEV-4599 Display a button for iPad as Zoom iframe does not open

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-4644 Add outcomes in authoring in all tools

    • -1
    • +4
    ./lams/ApplicationResources.properties
  1. … 118 more files in changeset.
LDEV-4599 Add authoring advanced settings: duration and start in monitor

    • -0
    • +3
    ./lams/ApplicationResources.properties
  1. … 8 more files in changeset.
LDEV-4599 In authoring warn of missing API keys

    • -6
    • +6
    ./lams/ApplicationResources.properties
  1. … 1 more file in changeset.
LDEV-4599 API keys management

    • -12
    • +11
    ./lams/ApplicationResources.properties
  1. … 20 more files in changeset.
LDEV-4599 Add monitor start meeting flow

    • -1
    • +1
    ./lams/ApplicationResources.properties
  1. … 6 more files in changeset.
LDEV-4599 Initial implementation of Zoom tool

    • -0
    • +68
    ./lams/ApplicationResources.properties
  1. … 134 more files in changeset.