Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/v4.7' into v4.8

# Conflicts:

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

# lams_tool_assessment/web/pages/learning/parts/allquestions.jsp

# lams_tool_assessment/web/pages/learning/results/allquestions.jsp

# lams_tool_assessment/web/pages/learning/results/allquestions5.jsp

  1. … 3 more files in changeset.
LDEV-4014 Make "Delete" button in red when force completing backwards

LDEV-5401 Keep showing individual extensions after timer expires

LDEV-5397 add placeholder to reduce blicking of the lesson name after transition page

  1. … 33 more files in changeset.
LDEV-5397 Enhanced mobile experience

  1. … 35 more files in changeset.
LDEV-5397 Enhanced mobile experience

  1. … 31 more files in changeset.
LDEV-5397 copy-tags

  1. … 62 more files in changeset.
LDEV-5436 Project-wide user sorting by last then first name

    • -2
    • +2
    ./includes/javascript/monitorLesson.js
  1. … 145 more files in changeset.
LDEV-5397 copy-tags

  1. … 31 more files in changeset.
LDEV-5425 copy-tags

    • -71
    • +10
    ./WEB-INF/tags/SubmissionDeadline.tag
  1. … 154 more files in changeset.
LDEV-5401 Display individual extensions in time limit widget

  1. … 4 more files in changeset.
Merge remote-tracking branch 'origin/v4.7' into LDEV-5397

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

# lams_admin/web/timezoneManagement.jsp

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_doku/conf/language/lams/ApplicationResources.properties

# lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_larsrc/conf/language/lams/ApplicationResources_de_DE.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_preview/conf/language/lams/ApplicationResources_de_DE.properties

# lams_tool_scratchie/web/pages/learning/learning.jsp

# lams_tool_survey/conf/language/lams/ApplicationResources_de_DE.properties

# lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties

# lams_tool_whiteboard/conf/language/lams/ApplicationResources_en_AU.properties

  1. … 9 more files in changeset.
LDEV-5397 copy-tags

    • -11
    • +10
    ./WEB-INF/tags/LeaderDisplay.tag
    • -133
    • +163
    ./WEB-INF/tags/PageLearner.tag
  1. … 154 more files in changeset.
LDEV-5426 Switch from custom time zones to built-in Java ones

    • -0
    • +111
    ./allQuestionsList.jsp
    • -0
    • +72
    ./assessmentAnswers.jsp
  1. … 39 more files in changeset.
LDEV-5083 Fix scrolling of wide LDs in monitoring

LDEV-5397 copy-tags

  1. … 62 more files in changeset.
LDEV-5397 import bootstrap5.scss into components.scss

* Subsequently import components.scss into components-learner.scss

* It will allow using bootstrap5 CSS rules in components CSS classes

    • -1
    • +1
    ./emailnotifications/archivedEmailList5.jsp
    • -1
    • +1
    ./emailnotifications/lessonNotifications5.jsp
    • -1
    • +1
    ./emailnotifications/scheduledEmailList5.jsp
  1. … 44 more files in changeset.
LDEV-5397 Reintroduce websocket library to Page tag

  1. … 36 more files in changeset.
Merge v4.7 into LDEV-5397

    • -2693
    • +2706
    ./includes/javascript/monitorLesson.js
  1. … 76 more files in changeset.
LDEV-5397 copy-tags

    • -15
    • +12
    ./WEB-INF/tags/NotebookReedit.tag
  1. … 123 more files in changeset.
LDEV-5404 Fix a typo in expired time limit

LDEV-5260 Do not eagerly close canvas refresh Flux

Do timer Flux clean up instead

    • -6
    • +26
    ./includes/javascript/monitorLesson.js
LDEV-5260 Fix multiple timers Flux

    • -0
    • +3
    ./includes/javascript/monitorLesson.js
  1. … 2 more files in changeset.
LDEV-5397 copy-tags

  1. … 87 more files in changeset.
LDEV-5200 Send AEs possibly long data as POST and not GET

    • -40
    • +42
    ./includes/javascript/monitorLesson.js
LDEV-5397 free.ui.jqgrid.min.css is now included in free.ui.jqgrid.custom.css

Therefore pages need to reference only one .css file (free.ui.jqgrid.custom.css) instead of two as it used to be.

    • -2
    • +1
    ./emailnotifications/archivedEmailList5.jsp
    • -2
    • +1
    ./emailnotifications/lessonNotifications5.jsp
  1. … 4 more files in changeset.
LDEV-5407 Show "return to index" link only for non-integrated courses

  1. … 1 more file in changeset.
LDEV-5397 copy-tags

  1. … 275 more files in changeset.
LDEV-5397 some interim UI changes to monitor and jqGrid

  1. … 3 more files in changeset.
LDEV-4602 Add Close button on timer screen