Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4589 Fix warning message

LDEV-4590 Rating stars left can never be more than 5 stars

    • -1
    • +1
    ./lamsfoundation/lams/web/RatingServlet.java
  1. … 3 more files in changeset.
LDEV-4589 Implement LTI Deep Linking feature

    • -1
    • +2
    ./lamsfoundation/lams/web/LoginRequestLtiServlet.java
  1. … 1 more file in changeset.
LDEV-4587 Distinguish ordered branching by introducing a new field

The fields tells whether branching should start from highest ordered

answer (asc, true) or lowest (desc, false) or is it a plain, non-ordered

tool-based branching (null).

  1. … 14 more files in changeset.
Monthly merge from master to lams31

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java

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

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

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

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

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java

    • -1
    • +22
    ./lamsfoundation/lams/web/IndexAction.java
  1. … 19 more files in changeset.
LDEV-4583 Block access to index.do for integration learners

If user comes from integrations and possess only learner rights we

should not allow him/her to access index.do page.

    • -0
    • +21
    ./lamsfoundation/lams/web/IndexAction.java
  1. … 2 more files in changeset.
LDEV-4576 Ignore edit lock parameter when saving a LD

It is set by special functions in AuthoringService

LDEV-4559 Comments can be left anonymously.

  1. … 91 more files in changeset.
LDEV-4564 Audit log entry for Live Edit

Also fixed the learning screen that appears when a Live Edit is

in progress as it was throwing a Null Pointer Exception

  1. … 6 more files in changeset.
LDEV-4571: small formatting

    • -1
    • +1
    ./lamsfoundation/lams/web/LoginAsAction.java
LDEV-4571: small formatting

  1. … 1 more file in changeset.
Monthly merge from master to lams31

Conflicts:

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

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

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

lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java

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

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

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

    • -0
    • +160
    ./lamsfoundation/lams/authoring/template/Assessment.java
    • -1
    • +1
    ./lamsfoundation/lams/web/SessionListener.java
  1. … 15 more files in changeset.
LDEV-4553 All assessment questions in one Application Exercise

LDEV-4553 Template TBL Assessment offers multiple choice

    • -0
    • +156
    ./lamsfoundation/lams/authoring/template/Assessment.java
  1. … 13 more files in changeset.
LDEV-4544 Highlight folder where existing LD resides

  1. … 2 more files in changeset.
LDEV-4538 Gate can not be already open in authoring

  1. … 1 more file in changeset.
LDEV-4537 Add Peer Review tab to TBL monitoring

  1. … 8 more files in changeset.
LDEV-4293 Clear login mapping even if user DTO is not present

    • -1
    • +1
    ./lamsfoundation/lams/web/SessionListener.java
  1. … 2 more files in changeset.
Monthly merge from master to lams31

Multiple conflicts regarding audit service and JSON.

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java

lams_build/conf/domain.xml

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

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

lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

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

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

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

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

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

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java

    • -0
    • +103
    ./lamsfoundation/lams/authoring/template/PeerReviewCriteria.java
    • -0
    • +1515
    ./lamsfoundation/lams/authoring/template/web/LdTemplateAction.java
    • -2
    • +2
    ./lamsfoundation/lams/web/IndexAction.java
  1. … 71 more files in changeset.
LDEV-4535 Changes to TBL Template

Added support for a Peer Review activity, Monitor selected group

count saved properly the application exercises are grouped.

    • -0
    • +101
    ./lamsfoundation/lams/authoring/template/PeerReviewCriteria.java
  1. … 12 more files in changeset.
LDEV-4522 Emojis not displaying correctly in monitoring

Also fixed some general escaping issues found while testing.

    • -2
    • +2
    ./lamsfoundation/lams/web/IndexAction.java
  1. … 33 more files in changeset.
LKC-89 add auxiliary methods required for TBL monitoring

  1. … 3 more files in changeset.
LDEV-4501 All Audit Log entries are now Log Event entries

  1. … 64 more files in changeset.
LDEV-4510 Team based learning template added to authoring

Look and feel done, validation working.

    • -0
    • +72
    ./lamsfoundation/lams/authoring/template/Option.java
    • -0
    • +106
    ./lamsfoundation/lams/authoring/template/TextUtil.java
    • -0
    • +1468
    ./lamsfoundation/lams/authoring/template/web/LdTemplateAction.java
  1. … 24 more files in changeset.
LDEV-4512 Use toolService.getLessonMaxPossibleMark() method

Start using already existing service method.

LDEV-4501 Tool context files no longer reference audit service.

    • -4
    • +4
    ./lamsfoundation/lams/web/LoginAsAction.java
  1. … 58 more files in changeset.
LDEV-4407 Introduce new LearnerService interfaces

LearnerService interfaces are redefined now:

1. ILearnerService is used by core modules. Also tools no longer

use it.

2. ILearnerFullService is used inside of lams_learning only and

nowhere else, as it contains lams_learning's internal logic and

classes.

3. ICoreLearnerService is removed, its method are split between

ILearnerService and ILearnerFullService.

    • -9
    • +10
    ./lamsfoundation/lams/web/OrganisationGroupAction.java
    • -5
    • +4
    ./lamsfoundation/lams/web/ProfileAction.java
  1. … 31 more files in changeset.
LDEV-4497 Check if source LD SVG exists before attempting to copy it

When a LD is imported from ZIP, the SVG is not extracted nor created

immediately, thus it may not exist when a lesson gets created based on

this LD. The SVG will be created on first real user access.

LDEV-4501 First cut of audit log screen implemented.

  1. … 19 more files in changeset.
LDEV-4407 Tools and core to use learning classes from lams_common

Tools and core start using shared learning classes that were

recently moved from lams_learning to lams_common.

Remove any leftover dependencies on lams_learning.

    • -22
    • +21
    ./lamsfoundation/lams/web/DisplayGroupAction.java
  1. … 78 more files in changeset.