lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4341 Always save org grouping to top course

Merge remote-tracking branch 'origin/v4.6' into v4.7

LDEV-5174, SP-412 Count but don't skip incorrect MCQ attempts

LDEV-5174, SP-412 Count but don't skip incorrect MCQ attempts

LDEV-5200, LKC-114 Reset Flux updating student choices on AE tab change

    • -0
    • +3
    /lams_monitoring/web/tblmonitor/aes.jsp
LDEV-5200 Always load student choices by default in AE monitoring view

    • -4
    • +4
    /lams_monitoring/web/tblmonitor/aes.jsp
Merge remote-tracking branch 'origin/v4.6' into v4.7

LDEV-5204, UMAN-16 After load prefix author so steps can not be undone

    • -0
    • +1523
    /lams_build/conf/whiteboard/src/js/whiteboard.js
LDEV-5204, UMAN-16 Make buttons on iPad smaller

    • -1
    • +3
    /lams_build/conf/whiteboard/readme.txt
    • -0
    • +216
    /lams_build/conf/whiteboard/src/css/main.css
LDEV-5356 Add "Finish" button to reflect page in Peer Review

Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

Merge branch 'LDEV-5356' into v4.6

LDEV-5356 Indicate that Peer Review is last activity in sequence

LDEV-4271 Add Next/Previous Page buttons in paged Assessment learner

Merge branch 'LDEV-5355' into v4.6

LDEV-5355 Add event log on Peer Review comment change by monitor

LDEV-5355 Allow editing multi-line comments

LDEV-5345 Updating English, Spanish, German, Greek

LDEV-5355 Allow comment editing in Peer Review tool

LDEV-5200, LKC-111 Fix iRAT student choices table update

LDEV-5083 Activity duration can be NULL

LDEV-5200, LKC-110 Fix burning questions expand button

Merge remote-tracking branch 'origin/v4.6' into v4.7

SP-4 Check if user has any roles on SQL and not Java level

SP-4 Check if user has any roles on SQL and not Java level

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java

Merge remote-tracking branch 'origin/v4.6' into v4.7

Merge remote-tracking branch 'origin/LDEV-5354' into v4.6

Merge branch 'LDEV-5354' into v4.6

LDEV-5354 adding further details to title label

LDEV-5354 Show growl-like message on course URL copy to clipboard