lams_central

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4440 Almost finished authoring migration

    • -0
    • +99
    ./src/java/org/lamsfoundation/lams/web/TextSearchForm.java
  1. … 22 more files in changeset.
LDEV-4440 Finishing authoring migration

  1. … 19 more files in changeset.
LDEV-4605 Move profile related jsps to /web/profile/ folder

    • -0
    • +422
    ./web/profile/editprofile.jsp
    • -0
    • +90
    ./web/profile/lessons.jsp
    • -0
    • +236
    ./web/profile/portrait.jsp
    • -0
    • +115
    ./web/profile/profile.jsp
Merge branch 'LDEV-4593'

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

* Remove "Create a new draft" functionality

* Add policy details page

    • -0
    • +86
    ./web/profile/policyDetails.jsp
    • -4
    • +7
    ./web/profile/profilePolicyConsents.jsp
  1. … 5 more files in changeset.
LDEV-4593 Further develop Policies & consents feature

  1. … 13 more files in changeset.
Merge branch 'lams31' into LDEV-4440

Conflicts:

lams_build/3rdParty.userlibraries

lams_build/lib/lams/lams-central.jar

lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java

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

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

lams_tool_vote/web/WEB-INF/tags/CommentsAuthor.tag

  1. … 14 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

    • -0
    • +104
    ./web/profile/profilePolicyConsents.jsp
  1. … 20 more files in changeset.
LDEV-4607 Show "no score" gradebook output option in authoring

LDEV-4601 Removing debugging

    • -3
    • +1
    ./web/includes/javascript/addLesson.js
LDEV-4601 Tweaking date validation and display of scheduled dates

    • -1
    • +3
    ./web/includes/javascript/addLesson.js
  1. … 1 more file in changeset.
LDEV-4601 Schedule the end date when teacher creates a lesson.

    • -3
    • +46
    ./web/includes/javascript/addLesson.js
  1. … 4 more files in changeset.
CLOUD-88: removing flash tutorial video

removing flash video replace it with youtube streaming instead

  1. … 2 more files in changeset.
LDEV-4600 Sanitise a parameter when changing password

LDEV-4054: Updating labels in various projects

English, Spanish and Greek

  1. … 10 more files in changeset.
LDEV-4602 TBL Monitor launches a new window with a countdown timer

    • binary
    ./web/includes/sounds/276607__mickleness__ringtone-foofaraw.mp3
    • binary
    ./web/includes/sounds/276607__mickleness__ringtone-foofaraw.ogg
    • binary
    ./web/includes/sounds/276607__mickleness__ringtone-foofaraw.wav
  1. … 4 more files in changeset.
LDEV-4599 Add Zoom icon

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

    • -0
    • +37
    ./web/errorpages/errorWithMessage.jsp
  1. … 4 more files in changeset.
LDEV-4593 Introduce Policies & consent feature

    • -0
    • +50
    ./web/policyConsents.jsp
  1. … 18 more files in changeset.
LDEV-4587 Add missing bottom border for complex activity in progress bar

LDEV-4589 Fix warning message

LDEV_NTU-9 Allowfullscreen for iframe CKeditor plugin is not working.

    • -2
    • +2
    ./web/ckeditor/plugins/iframe/dialogs/iframe.js
LDEV_NTU-7 Page jumps to the top when clicking the link in Grouping.

LDEV-4588 Adding a colour picker

    • -0
    • +319
    ./web/css/jquery.minicolors.css
    • binary
    ./web/images/css/jquery.minicolors.png
    • -0
    • +8
    ./web/includes/javascript/jquery.minicolors.min.js
  1. … 8 more files in changeset.
LDEV-4590 Rating stars left can never be more than 5 stars

  1. … 3 more files in changeset.
LDEV-4589 Implement LTI Deep Linking feature

LDEV-4587 Refresh output definitions if new ones appeared

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. … 8 more files in changeset.
LDEV-3115: Missing label for sequence detail