lamsfoundation

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5084 Allow custom membership URL in LTI calls

    • -5
    • +12
    ./lams/integration/service/IntegrationService.java
    • -16
    • +17
    ./lams/integration/util/LtiUtils.java
  1. … 2 more files in changeset.
LKC-236 Return questions replaced in tool for further processing

    • -1
    • +2
    ./lams/tool/service/IQbToolService.java
  1. … 3 more files in changeset.
LKC-215 Send review reminder email every given period

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

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_admin/conf/language/lams/ApplicationResources_el_GR.properties

lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

lams_admin/conf/language/lams/ApplicationResources_es_ES.properties

lams_admin/conf/language/lams/ApplicationResources_no_NO.properties

    • -2
    • +3
    ./lams/integration/service/IntegrationService.java
  1. … 5 more files in changeset.
LDEV-5072 Allow customisation of LTI user ID parameter name

    • -0
    • +14
    ./lams/dbupdates/patch20200909.sql
    • -10
    • +11
    ./lams/integration/ExtServer.java
    • -44
    • +43
    ./lams/integration/service/IntegrationService.java
  1. … 8 more files in changeset.
LKC-213 Remove unnecessary clause as an exception is never thrown

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

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

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

lams_central/web/questions/questionFile.jsp

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

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

lams_tool_assessment/web/pages/monitoring/summary.jsp

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_fr_FR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_no_NO.properties

lams_tool_lamc/db/sql/activity_insert.sql

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_lamc/web/WEB-INF/tags/Etherpad.tag

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

lams_tool_lamc/web/WEB-INF/tags/Rating.tag

lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/authoring/editQuestionBox.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

  1. … 23 more files in changeset.
LDEV-4746 Assign migrated QB questions to their owners' collections

    • -14
    • +38
    ./lams/dbupdates/patch20190722.sql
LDEV-4917 Clean up tmp uploaded files when they are no longer needed

  1. … 3 more files in changeset.
LDEV-4917 Initial implementation of file uploads using Uppy

Image upload in Image Gallery authoring.

  1. … 16 more files in changeset.
LDEV-5058 Move activity category from DB to authoring front end

    • -0
    • +17
    ./lams/dbupdates/patch20200730.sql
    • -38
    • +0
    ./lams/learningdesign/Activity.java
  1. … 7 more files in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java

  1. … 5 more files in changeset.
LDEV-5057 Use UTF-8 as default encoding for message sources

  1. … 32 more files in changeset.
LDEV-4847 Fix importing QB question with existing UUID

  1. … 4 more files in changeset.
LDEV-5050 Move "is required" attribute from QB question to tools

    • -0
    • +21
    ./lams/dbupdates/patch20200710.sql
    • -0
    • +11
    ./lams/qb/model/QbToolQuestion.java
  1. … 26 more files in changeset.
LKC-222 Simplify authorization flow for Workflow Automation

Learners need to already exist in the organisation. Staff gets synced

and added.

  1. … 1 more file in changeset.
LKC-222 Add course and lesson roles to user on WA access

    • -43
    • +41
    ./lams/integration/service/IntegrationService.java
  1. … 1 more file in changeset.
LDEV-5047 Make numeric option more accurate as it performs rounding

    • -0
    • +15
    ./lams/dbupdates/patch20200626.sql
  1. … 1 more file in changeset.
LDEV-5041 Add lesson service utility method

    • -3
    • +6
    ./lams/lesson/service/ILessonService.java
    • -19
    • +26
    ./lams/lesson/service/LessonService.java
  1. … 3 more files in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

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

  1. … 2 more files in changeset.
LDEV-5038 Add group to user name in lesson monitor sequence tab

  1. … 2 more files in changeset.
LDEV-5025 Allow Assessment other groups' answer rating and commenting

    • -16
    • +19
    ./lams/rating/dao/IRatingDAO.java
    • -57
    • +80
    ./lams/rating/dao/hibernate/RatingDAO.java
    • -5
    • +9
    ./lams/rating/service/IRatingService.java
    • -5
    • +13
    ./lams/rating/service/RatingService.java
  1. … 7 more files in changeset.
LDEV-5024 Import QB questions to AE in TBL template

  1. … 6 more files in changeset.
LDEV-4746 Fix question and option ordering issues.

    • -0
    • +11
    ./lams/dbupdates/patch20200519.sql
LDEV-4997 Renormalize line endings with git

    • -127
    • +127
    ./lams/outcome/Outcome.java
    • -76
    • +76
    ./lams/outcome/OutcomeMapping.java
    • -92
    • +92
    ./lams/outcome/OutcomeResult.java
    • -152
    • +152
    ./lams/outcome/OutcomeScale.java
    • -65
    • +65
    ./lams/outcome/OutcomeScaleItem.java
    • -291
    • +291
    ./lams/outcome/service/OutcomeService.java
    • -32
    • +32
    ./lams/timezone/util/TimezoneIDComparator.java
  1. … 411 more files in changeset.
LDEV-4997 Adjust Etherpad integration code for LAMS 3.1

  1. … 7 more files in changeset.
Merge remote-tracking branch 'origin/v4.0' into v5.0

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190119.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190723.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql

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

lams_monitoring/web/tblmonitor/teams.jsp

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql

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

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java

lams_tool_lamc/web/WEB-INF/tags/ImgButtonWrapper.tag

lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/learning/CombinedAnswersContent.jsp

lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp

lams_tool_lamc/web/learning/ViewAnswers.jsp

lams_tool_lamc/web/monitoring/SummaryContent.jsp

lams_tool_lamc/web/monitoring/parts/statsPart.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

    • -0
    • +23
    ./lams/dbupdates/patch20200220.sql
    • -0
    • +19
    ./lams/dbupdates/patch20200221.sql
  1. … 26 more files in changeset.
LDEV-4997 Use UUID_V4 function to create a unique identifier for LAMS server

Merge branch 'LDEV-4997' into v4.0

Conflicts:

lams_build/3rdParty.userlibraries

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java

  1. … 3 more files in changeset.
LDEV-4999 Fix monitor role detection when updating learner mark

    • -16
    • +16
    ./lams/dbupdates/patch20190119.sql
    • -19
    • +19
    ./lams/dbupdates/patch20190723.sql
    • -45
    • +45
    ./lams/dbupdates/patch20190724.sql
    • -103
    • +103
    ./lams/outcome/Outcome.java
    • -92
    • +92
    ./lams/outcome/OutcomeResult.java
    • -127
    • +127
    ./lams/outcome/OutcomeScale.java
    • -65
    • +65
    ./lams/outcome/OutcomeScaleItem.java
    • -331
    • +331
    ./lams/outcome/service/OutcomeService.java
    • -70
    • +70
    ./lams/qb/dto/QbStatsActivityDTO.java
    • -98
    • +98
    ./lams/qb/model/QbCollection.java
    • -32
    • +32
    ./lams/timezone/util/TimezoneIDComparator.java
    • -68
    • +68
    ./lams/util/CommonConstants.java
  1. … 450 more files in changeset.