lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4440 Initial version of authoring on Spring MVC

    • -0
    • +17
    /lams_tool_task/web/WEB-INF/spring-servlet.xml
    • -22
    • +22
    /lams_tool_task/web/WEB-INF/web.xml
  1. … 10 more files in changeset.
LDEV-4440 Initial version of authoring on Spring MVC

    • -0
    • +17
    /lams_tool_survey/web/WEB-INF/spring-servlet.xml
    • -31
    • +24
    /lams_tool_survey/web/WEB-INF/web.xml
  1. … 11 more files in changeset.
Merge branch 'LDEV-4607'

LDEV-4607 Detach gradebook output from activity if "no score" is chosen

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

LDEV-4593 Further develop Policies & consents feature

    • -1
    • +6
    /lams_admin/web/WEB-INF/struts-config.xml
    • -1
    • +1
    /lams_admin/web/policies/editPolicy.jsp
    • -110
    • +24
    /lams_admin/web/policies/policies.jsp
    • -0
    • +100
    /lams_admin/web/policies/policyTable.jsp
    • -53
    • +85
    /lams_admin/web/policies/userConsents.jsp
    • -39
    • +39
    /lams_central/web/policyConsents.jsp
LDEV-4603 Delete preview lessons with ratings now works

LDEV-4402 Upgrade to MySQL 8.0.11

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

    • binary
    /lams_build/lib/lams/lams-central.jar
    • binary
    /lams_build/lib/lams/lams-gradebook.jar
    • binary
    /lams_build/lib/lams/lams-learning.jar
    • binary
    /lams_build/lib/lams/lams-monitoring.jar
    • -0
    • +4
    /lams_tool_vote/web/monitoring/Edit.jsp
LDEV-4402 Update MySQL connector source code for version 8.0.11

  1. … 740 more files in changeset.
LDEV-4402 Upgrade to MySQL 8.0.11

This server version requires a newer connector and server time zone

settings.

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

    • binary
    /lams_build/lib/lams/lams-gradebook.jar
  1. … 9 more files in changeset.
LDEV-4593 Further develop Policies & consents feature

    • -0
    • +6
    /lams_admin/web/WEB-INF/struts-config.xml
    • -2
    • +2
    /lams_admin/web/WEB-INF/tiles-defs.xml
    • -138
    • +0
    /lams_admin/web/policies/edit.jsp
    • -0
    • +143
    /lams_admin/web/policies/editPolicy.jsp
    • -115
    • +0
    /lams_admin/web/policies/list.jsp
    • -0
    • +164
    /lams_admin/web/policies/policies.jsp
    • -0
    • +82
    /lams_admin/web/policies/userConsents.jsp
  1. … 13 more files in changeset.
Merge branch 'LDEV-4607'

LDEV-4607 Confirm delete marks on output change in monitoring

LDEV-4607 Show "no score" gradebook output option in authoring

    • -0
    • +2
    /lams_central/web/authoring/authoring.jsp
LDEV-4607 Remove marks on output change to "none" in monitoring

    • binary
    /lams_build/lib/lams/lams-gradebook.jar
Merge branch 'LDEV-4606'

LDEV-4606 Remove lesson mark if there are no activity marks left

Revert "LDEV_NTU-10 Add a column "LAMS group" in exported summary"

This reverts commit 502290bd52d375ca2661924f6c80ff5590e5aaaf.

LDEV-4601 Removing debugging

LDEV-4601 Tweaking date validation and display of scheduled dates

LDEV-4604 Improvements to burning questions page (learner)

1) Add buttons for expand/collapse all in burning questions. Only

display these buttons if there's burning questions.

2) Display a counter for burning questions next to the question name

3) Save cells on blur event

LDEV-4598 Questions must have a link to burning questions

LDEV-4601 Tweaking css and button display for disabling lessons

    • -1
    • +13
    /lams_monitoring/web/css/_monitorLesson_base.scss
LDEV-4599 Add authoring advanced settings: duration and start in monitor

    • -0
    • +6
    /lams_tool_zoom/db/sql/create_lams_tool_zoom.sql
LDEV-4599 Adjust learner layout

    • -1
    • +1
    /lams_tool_zoom/web/pages/learning/learning.jsp
LDEV-4599 Add Zoom activity preview

LDEV-4599 Use another call to verify if API works

LDEV-4599 Use API with oldest live meeting if there are no free ones