lams-github

Clone Tools

Stats

Commits this week: 0
Total Committers: 50
Last Commit:
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Sunday 27 Aug 2023
6:25 am

Ernie Ghiglione

LDEV-5404 Escaping funny characters that break js

- Leader selection

- Data collection

Options
    • -1
    • +2
    /lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag
    • -30
    • +31
    /lams_tool_daco/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -4
    • +5
    /lams_tool_daco/web/WEB-INF/tags/AuthoringRatingCriteria.tag
    • -3
    • +4
    /lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +2
    /lams_tool_daco/web/WEB-INF/tags/Page.tag
    • -1
    • +2
    /lams_tool_daco/web/WEB-INF/tags/Page5.tag
    • -1
    • +2
    /lams_tool_daco/web/common/taglibs.jsp
    • -2
    • +2
    /lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp
    • -2
    • +2
    /lams_tool_daco/web/pages/authoring/parts/adddate.jsp
    • -2
    • +2
    /lams_tool_daco/web/pages/authoring/parts/adddropdown.jsp
    • -2
    • +2
    /lams_tool_daco/web/pages/authoring/parts/addfile.jsp
    • -2
    • +2
    /lams_tool_daco/web/pages/authoring/parts/addimage.jsp
    • -2
    • +2
    /lams_tool_daco/web/pages/authoring/parts/addlonglat.jsp
    • -2
    • +2
    /lams_tool_daco/web/pages/authoring/parts/addnumber.jsp
    • -2
    • +2
    /lams_tool_daco/web/pages/authoring/parts/addradio.jsp
  16. … 15 more files in changeset.
Saturday 26 Aug 2023
9:35 pm

Marcin Cieslak

LDEV-5337 Inform which learners were skipped during grouping upload

Options
    • -2
    • +3
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -2
    • +4
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +3
    /lams_central/web/groups.jsp
    • -1
    • +7
    /lams_central/web/includes/javascript/groups.js
    • -1
    • +1
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringFullService.java
    • -125
    • +133
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -23
    • +26
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadController.java
6:21 pm

Marcin Cieslak

LDEV-5338 Properly set chosen groups even for other grouping types

Options
    • -6
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -30
    • +35
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -314
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/util/ExcelUserImportFileParser.java
    • -52
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/util/IUserImportFileParser.java
    • -17
    • +17
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -45
    • +45
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringFullService.java
    • -30
    • +31
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -31
    • +34
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadController.java
5:18 pm

Marcin Cieslak

LDEV-5200 Properly refresh monitoring after changing lesson state

Options
    • -849
    • +834
    /lams_monitoring/web/includes/javascript/monitorLesson.js
2:32 pm

Marcin Cieslak

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

# Conflicts:

# lams_tool_sbmt/web/learner/sbmtlearner.jsp

Options
    • -1
    • +0
    /lams_central/web/css/components.scss
    • -2
    • +10
    /lams_monitoring/web/monitor.jsp
    • -4
    • +2
    /lams_tool_larsrc/web/pages/learning/addfile.jsp
    • -4
    • +4
    /lams_tool_larsrc/web/pages/learning/addurl.jsp
    • -3
    • +3
    /lams_tool_larsrc/web/pages/learning/learning.jsp
    • -4
    • +4
    /lams_tool_notebook/web/pages/learning/notebook.jsp
    • -16
    • +29
    /lams_tool_notebook/web/pages/monitoring/summary.jsp
    • -10
    • +9
    /lams_tool_sbmt/web/learner/sbmtlearner.jsp
    • -5
    • +3
    /lams_tool_task/web/pages/learning/learning.jsp
    • -5
    • +5
    /lams_tool_vote/web/learning/AnswersContent.jsp
2:28 pm

Marcin Cieslak

LDEV-5397 Fix Boostrap 5 tooltip in gate check

There is no need for Boostrapt/jQuery UI name clash workaround as we will not be using jQuery UI anymore.

Options
    • -7
    • +8
    /lams_learning/web/includes/javascript/gate-check5.js
2:27 pm

Marcin Cieslak

LDEV-5397 Boostrap 5 bundle already has got Popper included

Options
    • -13
    • +12
    /lams_admin/web/WEB-INF/tags/PageLearner.tag
    • -20
    • +26
    /lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentController.java
    • -13
    • +12
    /lams_central/web/WEB-INF/tags/PageLearner.tag
    • -13
    • +12
    /lams_gradebook/web/WEB-INF/tags/PageLearner.tag
    • -13
    • +12
    /lams_learning/web/WEB-INF/tags/PageLearner.tag
    • -13
    • +12
    /lams_monitoring/web/WEB-INF/tags/PageLearner.tag
    • -13
    • +12
    /lams_tool_assessment/web/WEB-INF/tags/PageLearner.tag
    • -13
    • +12
    /lams_tool_chat/web/WEB-INF/tags/PageLearner.tag
    • -13
    • +12
    /lams_tool_daco/web/WEB-INF/tags/PageLearner.tag
    • -13
    • +12
    /lams_tool_doku/web/WEB-INF/tags/PageLearner.tag
    • -13
    • +12
    /lams_tool_forum/web/WEB-INF/tags/PageLearner.tag
    • -13
    • +12
    /lams_tool_gmap/web/WEB-INF/tags/PageLearner.tag
    • -13
    • +12
    /lams_tool_images/web/WEB-INF/tags/PageLearner.tag
    • -13
    • +12
    /lams_tool_imscc/web/WEB-INF/tags/PageLearner.tag
    • -13
    • +12
    /lams_tool_lamc/web/WEB-INF/tags/PageLearner.tag
  16. … 19 more files in changeset.
Friday 25 Aug 2023
8:02 am

Andrey Balan

LDEV-5397 add icons to finish and refresh buttons

Options
    • -1
    • +1
    /lams_admin/web/WEB-INF/tags/SubmissionDeadline.tag
    • -1
    • +1
    /lams_admin/web/WEB-INF/tags/WaitForLeader.tag
    • -1
    • +1
    /lams_central/web/WEB-INF/tags/SubmissionDeadline.tag
    • -1
    • +1
    /lams_central/web/WEB-INF/tags/WaitForLeader.tag
    • -1
    • +1
    /lams_gradebook/web/WEB-INF/tags/SubmissionDeadline.tag
    • -1
    • +1
    /lams_gradebook/web/WEB-INF/tags/WaitForLeader.tag
    • -1
    • +1
    /lams_learning/web/WEB-INF/tags/SubmissionDeadline.tag
    • -1
    • +1
    /lams_learning/web/WEB-INF/tags/WaitForLeader.tag
    • -1
    • +1
    /lams_monitoring/web/WEB-INF/tags/SubmissionDeadline.tag
    • -1
    • +1
    /lams_monitoring/web/WEB-INF/tags/WaitForLeader.tag
    • -1
    • +1
    /lams_tool_assessment/web/WEB-INF/tags/SubmissionDeadline.tag
    • -1
    • +1
    /lams_tool_assessment/web/WEB-INF/tags/WaitForLeader.tag
    • -1
    • +1
    /lams_tool_chat/web/WEB-INF/tags/SubmissionDeadline.tag
    • -1
    • +1
    /lams_tool_chat/web/WEB-INF/tags/WaitForLeader.tag
    • -1
    • +1
    /lams_tool_daco/web/WEB-INF/tags/SubmissionDeadline.tag
  16. … 51 more files in changeset.
7:53 am

Andrey Balan

LDEV-5397 start using tags

Options
    • -51
    • +11
    /lams_tool_lamc/web/learning/Notebook.jsp
    • -42
    • +3
    /lams_tool_lamc/web/learning/WaitForLeader.jsp
7:50 am

Andrey Balan

LDEV-5397 switch to using DefineLater.tag

Options
    • -17
    • +4
    /lams_tool_assessment/web/pages/learning/definelater.jsp
    • -19
    • +4
    /lams_tool_doku/web/pages/learning/definelater.jsp
    • -2
    • +2
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/LearningController.java
    • -16
    • +3
    /lams_tool_lamc/web/learning/defineLater.jsp
    • -2
    • +1
    /lams_tool_laqa/web/learning/defineLater.jsp
    • -6
    • +5
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/LearningController.java
    • -14
    • +3
    /lams_tool_notebook/web/pages/learning/defineLater.jsp
7:48 am

Andrey Balan

LDEV-5397 add icons to finish and refresh buttons

Options
    • -1
    • +1
    /lams_admin/web/WEB-INF/tags/DefineLater.tag
    • -8
    • +6
    /lams_admin/web/WEB-INF/tags/Notebook.tag
    • -1
    • +1
    /lams_central/web/WEB-INF/tags/DefineLater.tag
    • -8
    • +6
    /lams_central/web/WEB-INF/tags/Notebook.tag
    • -1
    • +1
    /lams_gradebook/web/WEB-INF/tags/DefineLater.tag
    • -8
    • +6
    /lams_gradebook/web/WEB-INF/tags/Notebook.tag
    • -1
    • +1
    /lams_learning/web/WEB-INF/tags/DefineLater.tag
    • -8
    • +6
    /lams_learning/web/WEB-INF/tags/Notebook.tag
    • -0
    • +26
    /lams_learning/web/css/components-learner.scss
    • -1
    • +1
    /lams_monitoring/web/WEB-INF/tags/DefineLater.tag
    • -8
    • +6
    /lams_monitoring/web/WEB-INF/tags/Notebook.tag
    • -1
    • +1
    /lams_tool_assessment/web/WEB-INF/tags/DefineLater.tag
    • -8
    • +6
    /lams_tool_assessment/web/WEB-INF/tags/Notebook.tag
    • -1
    • +1
    /lams_tool_chat/web/WEB-INF/tags/DefineLater.tag
    • -8
    • +6
    /lams_tool_chat/web/WEB-INF/tags/Notebook.tag
  16. … 53 more files in changeset.
6:46 am

Andrey Balan

LDEV-5397 make SubmissionDeadline.tag call checkNextGateActivity()

Options
    • -2
    • +4
    /lams_admin/web/WEB-INF/tags/SubmissionDeadline.tag
    • -2
    • +4
    /lams_central/web/WEB-INF/tags/SubmissionDeadline.tag
    • -2
    • +4
    /lams_gradebook/web/WEB-INF/tags/SubmissionDeadline.tag
    • -2
    • +4
    /lams_learning/web/WEB-INF/tags/SubmissionDeadline.tag
    • -2
    • +4
    /lams_monitoring/web/WEB-INF/tags/SubmissionDeadline.tag
    • -2
    • +4
    /lams_tool_assessment/web/WEB-INF/tags/SubmissionDeadline.tag
    • -2
    • +4
    /lams_tool_chat/web/WEB-INF/tags/SubmissionDeadline.tag
    • -2
    • +4
    /lams_tool_daco/web/WEB-INF/tags/SubmissionDeadline.tag
    • -2
    • +4
    /lams_tool_doku/web/WEB-INF/tags/SubmissionDeadline.tag
    • -2
    • +4
    /lams_tool_forum/web/WEB-INF/tags/SubmissionDeadline.tag
    • -2
    • +4
    /lams_tool_gmap/web/WEB-INF/tags/SubmissionDeadline.tag
    • -2
    • +4
    /lams_tool_images/web/WEB-INF/tags/SubmissionDeadline.tag
    • -2
    • +4
    /lams_tool_imscc/web/WEB-INF/tags/SubmissionDeadline.tag
    • -2
    • +4
    /lams_tool_lamc/web/WEB-INF/tags/SubmissionDeadline.tag
    • -2
    • +4
    /lams_tool_laqa/web/WEB-INF/tags/SubmissionDeadline.tag
  16. … 18 more files in changeset.
2:50 am

Marcin Cieslak

LDEV-5200 Retain subgrid paging/sorting info on refresh in Gradebook

Options
    • -644
    • +690
    /lams_gradebook/web/gradebookMonitorContent.jsp
Thursday 24 Aug 2023
7:51 pm

Marcin Cieslak

LDEV-5345 Adjust language labels

Options
    • -3
    • +3
    /lams_central/conf/language/lams/ApplicationResources_it_IT.properties
    • -2
    • +2
    /lams_monitoring/conf/language/lams/ApplicationResources_it_IT.properties
9:23 am

Andrey Balan

LDEV-5397 remove obsolete jsps

Options
    • -11
    • +0
    /lams_tool_assessment/web/pages/learning/finish.jsp
    • -12
    • +0
    /lams_tool_daco/web/pages/learning/finish.jsp
    • -10
    • +0
    /lams_tool_doku/web/pages/learning/finish.jsp
    • -11
    • +0
    /lams_tool_images/web/pages/learning/finish.jsp
    • -11
    • +0
    /lams_tool_imscc/web/pages/learning/finish.jsp
    • -16
    • +0
    /lams_tool_larsrc/web/pages/learning/finish.jsp
    • -15
    • +0
    /lams_tool_preview/web/pages/learning/finish.jsp
    • -10
    • +0
    /lams_tool_scratchie/web/pages/learning/finish.jsp
    • -14
    • +0
    /lams_tool_spreadsheet/web/pages/learning/finish.jsp
    • -16
    • +0
    /lams_tool_survey/web/pages/learning/finish.jsp
    • -16
    • +0
    /lams_tool_task/web/pages/learning/finish.jsp
7:54 am

Andrey Balan

LDEV-5410 fix exception on trying to submit notebook after SubmissionDeadline date is set

Options
    • -12
    • +12
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
7:43 am

Andrey Balan

LDEV-5409 fix SubmissionDeadline page so it start displaying notebook links and entries

Options
    • -2
    • +2
    /lams_tool_doku/web/pages/learning/submissionDeadline.jsp
    • -2
    • +2
    /lams_tool_scratchie/web/pages/learning/submissionDeadline.jsp
7:41 am

Andrey Balan

LDEV-5397 introduce submissionDeadline.tag

* switched to using this tag in all tools

* fixed a few existing issues with submissionDeadline feature in Vote and MCQ tools

Options
    • -0
    • +117
    /lams_admin/web/WEB-INF/tags/SubmissionDeadline.tag
    • -0
    • +4
    /lams_admin/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +117
    /lams_central/web/WEB-INF/tags/SubmissionDeadline.tag
    • -0
    • +4
    /lams_central/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +117
    /lams_gradebook/web/WEB-INF/tags/SubmissionDeadline.tag
    • -0
    • +4
    /lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +117
    /lams_learning/web/WEB-INF/tags/SubmissionDeadline.tag
    • -0
    • +4
    /lams_learning/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +117
    /lams_monitoring/web/WEB-INF/tags/SubmissionDeadline.tag
    • -0
    • +4
    /lams_monitoring/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +117
    /lams_tool_assessment/web/WEB-INF/tags/SubmissionDeadline.tag
    • -0
    • +4
    /lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld
    • -37
    • +8
    /lams_tool_assessment/web/pages/learning/submissionDeadline.jsp
    • -0
    • +117
    /lams_tool_chat/web/WEB-INF/tags/SubmissionDeadline.tag
    • -0
    • +4
    /lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld
  16. … 67 more files in changeset.
Tuesday 22 Aug 2023
11:53 pm

Ernie Ghiglione

LDEV-5404 Fixing tag in Scratchie

Options
    • -0
    • +1
    /lams_tool_scratchie/web/WEB-INF/tags/AuthoringButton.tag
10:51 pm

Ernie Ghiglione

LDEV-5345 Updating latest translations

Options
    • -1
    • +4
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_de_DE.properties
    • -0
    • +2
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +5
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +4
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_fr_FR.properties
    • -0
    • +4
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_it_IT.properties
    • -0
    • +2
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_ja_JP.properties
    • -0
    • +2
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_no_NO.properties
    • -0
    • +2
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_zh_CN.properties
8:21 am

Andrey Balan

LDEV-5397 add proper support of time limit for screenreaders

* support of image scratching for screenreaders

Options
    • -21
    • +47
    /lams_tool_scratchie/web/pages/learning/learning.jsp
    • -7
    • +7
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
7:13 am

Ernie Ghiglione

LDEV-5401 Missing labels

Options
    • -3
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -3
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources_it_IT.properties
Saturday 19 Aug 2023
7:05 pm

Marcin Cieslak

LDEV-3623 Fix exception on displaying gate as current activity

Options
    • -0
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
5:20 pm

Ernie Ghiglione

LDEV-5404 Escaping funny characters that break js

- Chat

Options
    • -1
    • +2
    /lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag
    • -30
    • +31
    /lams_tool_chat/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -4
    • +5
    /lams_tool_chat/web/WEB-INF/tags/AuthoringRatingCriteria.tag
    • -3
    • +4
    /lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +2
    /lams_tool_chat/web/WEB-INF/tags/Page.tag
    • -1
    • +2
    /lams_tool_chat/web/WEB-INF/tags/Page5.tag
    • -1
    • +2
    /lams_tool_chat/web/common/taglibs.jsp
    • -3
    • +3
    /lams_tool_chat/web/pages/monitoring/summary.jsp
5:11 pm

Ernie Ghiglione

LDEV-5404 Escaping funny characters that break js

- Share resources

Options
    • -1
    • +2
    /lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag
    • -30
    • +31
    /lams_tool_larsrc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -4
    • +5
    /lams_tool_larsrc/web/WEB-INF/tags/AuthoringRatingCriteria.tag
    • -3
    • +4
    /lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +2
    /lams_tool_larsrc/web/WEB-INF/tags/Page.tag
    • -1
    • +2
    /lams_tool_larsrc/web/WEB-INF/tags/Page5.tag
    • -1
    • +2
    /lams_tool_larsrc/web/common/taglibs.jsp
    • -2
    • +2
    /lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp
    • -3
    • +1
    /lams_tool_larsrc/web/pages/authoring/parts/addheader.jsp
    • -4
    • +4
    /lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp
    • -3
    • +3
    /lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp
    • -4
    • +2
    /lams_tool_larsrc/web/pages/learning/addfile.jsp
    • -4
    • +4
    /lams_tool_larsrc/web/pages/learning/addurl.jsp
    • -3
    • +3
    /lams_tool_larsrc/web/pages/learning/learning.jsp
    • -14
    • +14
    /lams_tool_larsrc/web/pages/monitoring/summary.jsp
6:52 am

Andrey Balan

LDEV-5397 change the way we add hidden labels

Options
    • -4
    • +4
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
Friday 18 Aug 2023
11:18 pm

Ernie Ghiglione

LDEV-5404 Escaping funny characters that break js

- Whiteboard

Options
    • -1
    • +2
    /lams_tool_whiteboard/web/WEB-INF/tags/AuthoringButton.tag
    • -30
    • +31
    /lams_tool_whiteboard/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -4
    • +5
    /lams_tool_whiteboard/web/WEB-INF/tags/AuthoringRatingCriteria.tag
    • -3
    • +4
    /lams_tool_whiteboard/web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +2
    /lams_tool_whiteboard/web/WEB-INF/tags/Page.tag
    • -1
    • +2
    /lams_tool_whiteboard/web/WEB-INF/tags/Page5.tag
    • -1
    • +2
    /lams_tool_whiteboard/web/common/taglibs.jsp
    • -4
    • +4
    /lams_tool_whiteboard/web/pages/learning/galleryWalk.jsp
    • -2
    • +2
    /lams_tool_whiteboard/web/pages/learning/learning.jsp
    • -17
    • +17
    /lams_tool_whiteboard/web/pages/monitoring/summary.jsp
10:46 pm

Ernie Ghiglione

LDEV-5408 Arranging button and labels

Options
    • -2
    • +2
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -4
    • +4
    /lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp
    • -4
    • +4
    /lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
    • -2
    • +2
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -5
    • +5
    /lams_tool_scratchie/web/pages/monitoring/studentChoices5.jsp
6:47 pm

Marcin Cieslak

Merge branch 'LDEV-5408' into v4.7

# Conflicts:

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

Options
    • -1
    • +2
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
6:45 pm

Marcin Cieslak

LDEV-5408 Add Extra Information buttons on RAT and AE tabs in monitoring

Options
    • -0
    • +2
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -0
    • +1
    /lams_monitoring/web/monitor.jsp
    • -1
    • +2
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -75
    • +85
    /lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp
    • -1
    • +11
    /lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
    • -1
    • +2
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -0
    • +9
    /lams_tool_scratchie/web/pages/monitoring/studentChoices5.jsp