Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5436 Project-wide user sorting by last then first name

    • -6
    • +7
    ./controller/GradebookLearningController.java
  1. … 150 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java

    • -5
    • +40
    ./controller/GradebookMonitoringController.java
  1. … 12 more files in changeset.
LDEV-5363 Allow monitors to export course gradebook reports

    • -4
    • +2
    ./controller/GradebookMonitoringController.java
LDEV-5363 Add TBL course gradebook export

    • -3
    • +40
    ./controller/GradebookMonitoringController.java
  1. … 8 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupPreviewLessonsController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PortraitBatchUploadController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

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

lams_common/src/java/org/lamsfoundation/lams/security/ISecurityService.java

lams_common/src/java/org/lamsfoundation/lams/security/SecurityService.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

    • -11
    • +9
    ./controller/GradebookMonitoringController.java
  1. … 35 more files in changeset.
LDEV-5341 Refactor Security Service

    • -14
    • +12
    ./controller/GradebookController.java
    • -2
    • +1
    ./controller/GradebookLearningController.java
    • -12
    • +9
    ./controller/GradebookMonitoringController.java
  1. … 33 more files in changeset.
LDEV-5083 Remove old monitoring bits where possible

In activity monitoring we need to leave old design until it gets

rewritten.

    • -2
    • +2
    ./controller/GradebookMonitoringController.java
  1. … 59 more files in changeset.
LDEV-4776 Allow course manager export all subcourse lessons gradebook

LDEV-5083 Rewrite Release Marks panel

Also improvements to jqGrid layout

    • -2
    • +3
    ./controller/GradebookMonitoringController.java
  1. … 5 more files in changeset.
LDEV-5083 Fix gradebook export button blocking

    • -1
    • +1
    ./controller/GradebookMonitoringController.java
  1. … 3 more files in changeset.
LDEV-5083 Add gradebook tables with Bootstrap 5 & Font Awesome 6 theme

    • -2
    • +2
    ./controller/GradebookMonitoringController.java
  1. … 8 more files in changeset.
LDEV-5257 Secure fileDownloadToken cookie

    • -12
    • +3
    ./controller/GradebookMonitoringController.java
  1. … 9 more files in changeset.
LDEV-5190 Change display format of scheduled marks release

    • -3
    • +6
    ./controller/GradebookMonitoringController.java
Merge branch 'LDEV-5140' into v4.0

    • -0
    • +1
    ./controller/GradebookMonitoringController.java
LDEV-5140 Add error information also in logs

    • -0
    • +1
    ./controller/GradebookMonitoringController.java
LDEV-5153 Remove obsolete GradebookServlet.

It was introduced for LDEV-2711.

Unnecessary optional layout modification has also been removed.

    • -2
    • +0
    ./controller/GradebookMonitoringController.java
  1. … 4 more files in changeset.
LDEV-5140 Add learner filtering for sending emails

    • -32
    • +9
    ./controller/GradebookMonitoringController.java
  1. … 4 more files in changeset.
LDEV-5140 Add i18n labels and better responsiveness.

    • -10
    • +28
    ./controller/GradebookMonitoringController.java
  1. … 6 more files in changeset.
LDEV-5140 Send emails on scheduled marks release. Refresh improvement.

    • -7
    • +29
    ./controller/GradebookMonitoringController.java
  1. … 4 more files in changeset.
LDEV-5140 Improve release marks schedule front-end flow

    • -3
    • +4
    ./controller/GradebookMonitoringController.java
  1. … 1 more file in changeset.
LDEV-5140 Scheduled release marks basic functionality

    • -56
    • +24
    ./controller/GradebookMonitoringController.java
  1. … 6 more files in changeset.
LDEV-5140 Process included/excluded learners to send emails to

    • -10
    • +47
    ./controller/GradebookMonitoringController.java
  1. … 2 more files in changeset.
LDEV-5140 Introduce Release Marks panel for sending emails to learners

    • -3
    • +89
    ./controller/GradebookMonitoringController.java
  1. … 4 more files in changeset.
LDEV-4999 Fix monitor role detection when updating learner mark

    • -625
    • +625
    ./controller/GradebookController.java
  1. … 463 more files in changeset.
Merge branch 'master' into v4.0

# Conflicts:

# lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_build/build.xml

# lams_build/liblist.txt

# lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

# lams_central/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_central/web/authoringConfirm.jsp

# lams_central/web/common/taglibs.jsp

# lams_central/web/includes/javascript/authoring/authoringGeneral.js

# lams_central/web/includes/javascript/outcome.js

# lams_central/web/outcome/outcomeEdit.jsp

# lams_central/web/outcome/outcomeManage.jsp

# lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

# lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java

# lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java

# lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp

# lams_tool_laqa/web/authoring/newQuestionBox.jsp

# lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp

# lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java

# lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java

# lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/web/pages/authoring/basic.jsp

# lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_www/web/WEB-INF/tags/OutcomeAuthor.tag

  1. … 94 more files in changeset.
LDEV-4932 Secure gradebook calls with CSRF Guard

* Secure the following gradebook calls in particular:

- Release marks

- Any change in marks

- Export

* Add taglibs.jsp to gradebook project

    • -75
    • +55
    ./controller/GradebookMonitoringController.java
  1. … 13 more files in changeset.
LDEV-4914 Do not allow NULLs in Lesson settings

    • -1
    • +1
    ./controller/GradebookMonitoringController.java
  1. … 3 more files in changeset.
LDEV-4897 Update Gradebook, Kumalive, and archived emails to use new Excel exporting methods

    • -8
    • +8
    ./controller/GradebookMonitoringController.java
  1. … 10 more files in changeset.
LDEV-4897 Update Scratchie and MCQ to use new Excel exporting methods

    • -3
    • +0
    ./controller/GradebookMonitoringController.java
  1. … 15 more files in changeset.
LDEV-4897 Introduce ExcelRow and ExcelSheet classes

* Update Daco and Assessment to use new classes

* Move existing ExcelCell and ExcelUtils to .util.excel package

    • -2
    • +2
    ./controller/GradebookMonitoringController.java
  1. … 32 more files in changeset.