Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Monthly merge from master to lams31

Conflicts:

lams_build/3rdParty.userlibraries

lams_build/build.xml

lams_build/conf/j2ee/jboss-deployment-structure.xml

lams_build/lib/lams/lams.jar

lams_build/liblist.txt

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

  1. … 26 more files in changeset.
LDEV-4599 API keys management

  1. … 19 more files in changeset.
LDEV-4599 Add monitor start meeting flow

  1. … 6 more files in changeset.
LDEV-4599 Initial implementation of Zoom tool

    • -0
    • +210
    ./struts-config.xml
    • -0
    • +53
    ./tags/AdvancedAccordian.tag
    • -0
    • +133
    ./tags/AuthoringButton.tag
    • -0
    • +420
    ./tags/AuthoringRatingAllStyleCriteria.tag
    • -0
    • +348
    ./tags/AuthoringRatingCriteria.tag
    • -0
    • +100
    ./tags/CKEditor.tag
    • -0
    • +80
    ./tags/CommentsAuthor.tag
    • -0
    • +66
    ./tags/DefineLater.tag
    • -0
    • +84
    ./tags/FileUpload.tag
    • -0
    • +37
    ./tags/ImgButtonWrapper.tag
  1. … 120 more files in changeset.