Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5295 Filter out non-learners from Gradebook

LDEV-5257 Secure fileDownloadToken cookie

  1. … 9 more files in changeset.
LDEV-5256 Sanitise jqGrid sorting options before using them in queries

  1. … 3 more files in changeset.
LDEV-5256 Prevent SQL injection for results order

  1. … 3 more files in changeset.
LDEV-4609 Prevent SQL injection for results order in Gradebook

LDEV-5140 Add release marks code to cusomised Gradebook

  1. … 1 more file in changeset.
LDEV-4411 Make relation from Evaluation to ToolActivity unidirectional

Hibernate can not lazy load properties connected with OneToOne

relationship. It means that with every fetch of ToolActivity its

ActivityEvaluation was also fetched, whether is was needed or not. It

made up even 10% of all queries sent to DB during a lesson.

By having the relationship unidirectional and fetching

ActivityEvaluation via DAO we ensure that it is fetched only when it is

needed. The code is not as nice, though.

  1. … 12 more files in changeset.
LDEV-5227 Improve processing time of lesson gradebook export

LDEV-5190 Change display format of scheduled marks release

Merge branch 'LDEV-5140' into v4.0

LDEV-5140 Correctly fetch info if emails will be sent

LDEV-5140 Add error information also in logs

LDEV-5153 Remove obsolete GradebookServlet.

It was introduced for LDEV-2711.

Unnecessary optional layout modification has also been removed.

  1. … 4 more files in changeset.
LDEV-5140 Add learner filtering for sending emails

  1. … 4 more files in changeset.
LDEV-5140 Use a rich HTML email template

  1. … 3 more files in changeset.
LDEV-5140 Add i18n labels and better responsiveness.

  1. … 4 more files in changeset.
LDEV-5140 Send emails on scheduled marks release. Refresh improvement.

  1. … 2 more files in changeset.
LDEV-5140 Improve release marks schedule front-end flow

  1. … 1 more file in changeset.
LDEV-5140 Scheduled release marks basic functionality

    • -0
    • +43
    ./org/lamsfoundation/lams/gradebook/util/ReleaseMarksJob.java
  1. … 2 more files in changeset.
LDEV-5140 Process included/excluded learners to send emails to

  1. … 2 more files in changeset.
LDEV-5140 Introduce Release Marks panel for sending emails to learners

  1. … 4 more files in changeset.
LDEV-5140 Introduce Release Marks panel for sending emails to learners

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

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java

lams_central/web/qb/collection.jsp

lams_central/web/questions/questionFile.jsp

lams_common/db/sql/create_lams_11_tables.sql

lams_common/db/sql/insert_lams_config_data.sql

lams_common/db/sql/insert_types_data.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200129.sql

lams_common/src/java/org/lamsfoundation/lams/questions/QuestionWordParser.java

lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/db/sql/create_lams_tool_assessment.sql

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McContent.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_lamc/web/WEB-INF/tags/Arrow.tag

lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag

lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag

lams_tool_lamc/web/WEB-INF/tags/Rating.tag

lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

lams_tool_scratchie/web/pages/authoring/basic.jsp

lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp

  1. … 29 more files in changeset.
LDEV-5113 Introduce manual grading tool output

  1. … 4 more files in changeset.
Merge remote-tracking branch 'origin/v4.0' into v5.0

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java

lams_central/web/questions/questionFile.jsp

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

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

lams_tool_assessment/web/pages/monitoring/summary.jsp

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_fr_FR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_no_NO.properties

lams_tool_lamc/db/sql/activity_insert.sql

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag

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

lams_tool_lamc/web/WEB-INF/tags/Rating.tag

lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/authoring/editQuestionBox.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

  1. … 25 more files in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_gradebook/conf/language/lams/ApplicationResources.properties

  1. … 3 more files in changeset.
LDEV-5064 Fix weighted mark calculation in selected lesson gradebook

LDEV-4813 Revert to an actually correct query for getting lessons

LDEV-5063 Add info about activity weight in lesson gradebook export

  1. … 1 more file in changeset.
LDEV-4813 Fix an invalid query for getting lessons for gradebook