Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LKC-225 Add configuration settings for Workflow Automation

  1. … 1 more file in changeset.
LDEV-4962 Fix portraits with complex UUIDs

  1. … 1 more file in changeset.
LDEV-4962 Use complex portrait UUID in tools

  1. … 25 more files in changeset.
LDEV-4962 Use complex portrait UUID in tools

Conflicts:

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java

  1. … 25 more files in changeset.
LDEV-4876 Take into account useAlternativeUseridParameterName LTI server setting when creating users using membership service

LDEV-4962 Introduce complex portrait UUIDs

    • -0
    • +23
    ./lamsfoundation/lams/dbupdates/patch20200204.sql
    • -7
    • +3
    ./lamsfoundation/lams/util/WebUtil.java
  1. … 28 more files in changeset.
LDEV-4962 Introduce complex portrait UUIDs

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java

lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java

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

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

    • -538
    • +538
    ./lamsfoundation/lams/util/WebUtil.java
  1. … 30 more files in changeset.
LDEV-4951 Migrate MCQ tool to Assessment

    • -0
    • +260
    ./lamsfoundation/lams/learningdesign/McqImportContentVersionFilter.java
  1. … 1 more file in changeset.
LDEV-4959 Prevent leader and non-leader from creating two GradebookUserLessons at the same time

    • -0
    • +22
    ./lamsfoundation/lams/dbupdates/patch20200129.sql
  1. … 1 more file in changeset.
LDEV-4914 Fall back to default settings values when creating a lesson

    • -36
    • +36
    ./lamsfoundation/lams/lesson/Lesson.java
LDEV-4945 Fix mysql comments on patch files

  1. … 70 more files in changeset.
LDEV-4945 Fix mysql comments on patch files

  1. … 87 more files in changeset.
LDEV-4846 Prevent creation of QB questions with missing content folder

    • -0
    • +12
    ./lamsfoundation/lams/dbupdates/patch20200116.sql
LDEV-4943 Don't log error message on learner accessing LTI lesson

(cherry picked from commit 9f6b6a7487f9b5cbf283bf95361e3778e93fde95)

  1. … 1 more file in changeset.
LDEV-4943 Don't log error message on learner accessing LTI lesson

  1. … 1 more file in changeset.
LDEV-4941 Prevent "stealing" a QB question

Prevent changing an existing question's collection if it is not in one

of user's own collections

    • -3
    • +14
    ./lamsfoundation/lams/qb/QbUtils.java
    • -4
    • +6
    ./lamsfoundation/lams/qb/dao/IQbDAO.java
    • -5
    • +15
    ./lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
  1. … 3 more files in changeset.
LDEV-4831 Bypass 2FA if using Login-as

(cherry picked from commit 26e7a51d2a74ef045d6e056752fd60bf510f2024)

LDEV-4831 Bypass 2FA if using Login-as

LDEV-4746 Allow even larger output for SQL concat function

LDEV-4746 Fix strip_tags SQL function when input is NULL

Merge branch 'master' into v4.0

# Conflicts:

# lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_build/build.xml

# lams_build/liblist.txt

# lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

# lams_central/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_central/web/authoringConfirm.jsp

# lams_central/web/common/taglibs.jsp

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

# lams_central/web/includes/javascript/outcome.js

# lams_central/web/outcome/outcomeEdit.jsp

# lams_central/web/outcome/outcomeManage.jsp

# lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

# lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java

# lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java

# lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp

# lams_tool_laqa/web/authoring/newQuestionBox.jsp

# lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp

# lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java

# lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java

# lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/web/pages/authoring/basic.jsp

# lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_www/web/WEB-INF/tags/OutcomeAuthor.tag

    • -4
    • +4
    ./lamsfoundation/lams/util/WebUtil.java
  1. … 94 more files in changeset.
LDEV-4649 Use correct scale field when importing learning outcomes

LDEV-4932 Add CSRF to monitor and central

    • -4
    • +3
    ./lamsfoundation/lams/util/WebUtil.java
  1. … 48 more files in changeset.
LDEV-3119 Renormalize incorrect line endings for git to work better

Merge branch 'LDEV-4745' into v4.0

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

  1. … 19 more files in changeset.
LDEV-4743 Squash core patches updating to version 3.1

  1. … 38 more files in changeset.
Merge tag 'v3.0'

Freeze 3.0 version

    • -0
    • +12
    ./lamsfoundation/lams/dbupdates/patch02030200_updateTo232.sql
LDEV-4743 Squash core patches updating to version 3.0

  1. … 64 more files in changeset.
LDEV-4743 Squash patches updating to version 2.4

    • -0
    • +320
    ./lamsfoundation/lams/dbupdates/patch02040006_updateTo24.sql
LDEV-4743 Rename patch to keep naming convention

    • -0
    • +12
    ./lamsfoundation/lams/dbupdates/patch02030200_updateTo232.sql