Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4605 Introduce CommonConstants.java

For starters it will contain user portrait dimensions and the list of

country codes.

    • -0
    • +24
    ./lamsfoundation/lams/util/CommonConstants.java
  1. … 1 more file in changeset.
LDEV-4440 Show archived activity attempts in gradebook

  1. … 8 more files in changeset.
Merge branch 'LDEV-4593'

    • -0
    • +28
    ./lamsfoundation/lams/commonContext.xml
  1. … 5 more files in changeset.
LDEV-4607 Detach gradebook output from activity if "no score" is chosen

LDEV-4609 Add archive date to gradebook marks on lesson restart

    • -0
    • +18
    ./lamsfoundation/lams/dbupdates/patch20180628.sql
  1. … 4 more files in changeset.
LDEV-4593 Further develop Policies & consents feature

    • -0
    • +37
    ./lamsfoundation/lams/policies/dto/UserPolicyConsentDTO.java
  1. … 9 more files in changeset.
LDEV-4603 Delete preview lessons with ratings now works

    • -0
    • +1
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +15
    ./lamsfoundation/lams/dbupdates/patch20180625.sql
  1. … 2 more files in changeset.
Monthly merge from master to lams31

Conflicts:

lams_build/lib/lams/lams.jar

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

lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.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/web/action/McMonitoringAction.java

lams_tool_mindmap/.classpath

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

  1. … 21 more files in changeset.
LDEV-4593 Further develop Policies & consents feature

    • -6
    • +12
    ./lamsfoundation/lams/policies/Policy.java
    • -0
    • +95
    ./lamsfoundation/lams/policies/PolicyDTO.java
    • -4
    • +20
    ./lamsfoundation/lams/policies/dao/IPolicyDAO.java
  1. … 21 more files in changeset.
LDEV-4607 Remove marks on output change to "none" in monitoring

  1. … 11 more files in changeset.
LDEV-4599 Enable contribution from tool activities

  1. … 6 more files in changeset.
LDEV-4597 Set sent date in emails

    • -8
    • +11
    ./lamsfoundation/lams/util/Emailer.java
LDEV-4592 Rewrite paths in tool content XML

LDEV-4592 Bump server version

LDs exported with this version do not undergo resources path rewriting

in XML.

    • -0
    • +14
    ./lamsfoundation/lams/dbupdates/patch20180602.sql
LDEV-4592 Remove obsolete configuration keys

LDEV-4594 Turn on/off the integration learner index page block

  1. … 7 more files in changeset.
LDEV-4593 Introduce Policies & consent feature

    • -0
    • +28
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +70
    ./lamsfoundation/lams/dbupdates/patch20180528.sql
    • -0
    • +164
    ./lamsfoundation/lams/policies/Policy.java
    • -0
    • +60
    ./lamsfoundation/lams/policies/PolicyConsent.java
    • -0
    • +42
    ./lamsfoundation/lams/policies/dao/IPolicyDAO.java
    • -0
    • +40
    ./lamsfoundation/lams/policies/dao/hibernate/PolicyDAO.java
  1. … 14 more files in changeset.
LDEV-4590 Rating stars left can never be more than 5 stars

  1. … 2 more files in changeset.
* LDEV-4589 Add methods and constants for LTI Deep Linking

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).

    • -0
    • +15
    ./lamsfoundation/lams/dbupdates/patch20180522.sql
  1. … 10 more files in changeset.
LDEV-4587 Silence i18n warning as they are not that important

    • -4
    • +4
    ./lamsfoundation/lams/tool/OutputFactory.java
LDEV-4587 Select branch based on option order chosen by learner

A condition has a question sequence ID and an option sequence ID encoded

in its name. This way we know what output to produce. Then all outputs

are sorted and a branch which was not processed yet gets chosen.

  1. … 5 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. … 21 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.

  1. … 1 more file in changeset.
LDEV-4580, LDEV-4497 Fix content dir path when exporting/importing LD

LDEV-4581 QTI export now parses images with names with whitespace

LDEV-4559 Comments can be left anonymously.

    • -0
    • +15
    ./lamsfoundation/lams/dbupdates/patch20180508.sql
  1. … 89 more files in changeset.
LDEV-4558 Rename dbupdate files as name is a month out.

    • -0
    • +35
    ./lamsfoundation/lams/dbupdates/patch20180425.sql
  1. … 38 more files in changeset.
LDEV-4564 Rename dbupdate file as name is a month out.

    • -0
    • +14
    ./lamsfoundation/lams/dbupdates/patch20180501.sql
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

    • -0
    • +14
    ./lamsfoundation/lams/dbupdates/patch20180601.sql
  1. … 5 more files in changeset.