lams-github / lams_monitoring

web

Clone Tools

Stats

Commits this week: 0
Total Committers: 26
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
Friday 20 Mar 2020
1:35 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

Options
    • -0
    • +1
    ./includes/javascript/monitorLesson.js
  2. … 21 more files in changeset.
Wednesday 18 Mar 2020
8:48 pm

Marcin Cieslak

LDEV-4993 Redesign Scratchie monitoring summary tab

Options
    • -14
    • +0
    ./css/_tblmonitor_base.scss
  2. … 8 more files in changeset.
Monday 16 Mar 2020
10:44 pm

Marcin Cieslak

LDEV-4989 Password Gate initial implementation

Options
    • -0
    • +85
    ./gate/passwordGateContent.jsp
    • -0
    • +1
    ./includes/javascript/monitorLesson.js
    • -2
    • +7
    ./monitor.jsp
  4. … 34 more files in changeset.
Wednesday 19 Feb 2020
1:51 pm

Ernie Ghiglione

LDEV-4975 Upgrade jquery to version 3.4.1

Options
    • -1
    • +1
    ./includes/javascript/monitorLesson.js
  2. … 16 more files in changeset.
Tuesday 18 Feb 2020
10:21 pm

Andrey Balan

LDEV-4951 Remove traces of MCQ tool from other modules

Options
    • -13
    • +2
    ./tblmonitor/tblmonitor.jsp
    • -4
    • +4
    ./tblmonitor/teams.jsp
  3. … 191 more files in changeset.
Wednesday 29 Jan 2020
6:24 am

Andrey Balan

LDEV-4953 Add missing <%@ page isErrorPage="true"%>

Options
    • -0
    • +1
    ./error.jsp
6:07 am

Andrey Balan

LDEV-4951 Migrate MCQ tool to Assessment

Options
    • -0
    • +1
    ./error.jsp
  2. … 10 more files in changeset.
Thursday 23 Jan 2020
11:38 pm

Andrey Balan

LDEV-4954 Start now lesson in monitor using POST

Options
    • -1
    • +2
    ./includes/javascript/monitorLesson.js
11:23 pm

Andrey Balan

LDEV-4955 Properly disable lesson on schedule

Options
    • -3
    • +8
    ./includes/javascript/monitorLesson.js
    • -4
    • +0
    ./monitor.jsp
6:40 am

Andrey Balan

LDEV-4953 Set pageEncoding and contentType in web.xml instead of jsps

Options
    • -0
    • +6
    ./WEB-INF/web.xml
    • -1
    • +0
    ./login.jsp
  3. … 171 more files in changeset.
Thursday 09 Jan 2020
3:59 pm

Andrey Balan

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

Options
    • -2
    • +3
    ./WEB-INF/tags/OutcomeAuthor.tag
  2. … 94 more files in changeset.
Wednesday 08 Jan 2020
3:42 am

Andrey Balan

LDEV-4932 Add CSRF to monitor and central

Options
    • -3
    • +2
    ./403.jsp
    • -3
    • +2
    ./404.jsp
    • -1
    • +0
    ./complexProgress.jsp
    • -1
    • +0
    ./emailnotifications/archivedEmailList.jsp
    • -1
    • +0
    ./emailnotifications/courseNotifications.jsp
    • -1
    • +0
    ./emailnotifications/lessonNotifications.jsp
    • -10
    • +3
    ./error.jsp
    • -29
    • +27
    ./gate/gateStatus.jsp
    • -45
    • +47
    ./gate/openGateSingleUser.jsp
    • -13
    • +12
    ./gate/scheduleGateContent.jsp
    • -11
    • +15
    ./includes/javascript/monitorLesson.js
    • -1
    • +0
    ./notsupported.jsp
    • -3
    • +2
    ./parallelProgress.jsp
    • -1
    • +0
    ./previewdeleted.jsp
    • -1
    • +0
    ./systemErrorContent.jsp
  16. … 36 more files in changeset.
Thursday 02 Jan 2020
9:12 pm

Ernie Ghiglione

LDEV-4932 Add CSRF to OutcomeAuthor tag

Options
    • -2
    • +3
    ./WEB-INF/tags/OutcomeAuthor.tag
  2. … 30 more files in changeset.
8:49 am

Ernie Ghiglione

LDEV-4932 Adding CSRF to central and monitoring

Adding CSRF to:

- Grades on completion

- Enable/disable presence and IM

- Send emails

- Update users into lessons

- Send email notifications

- Delete email notifications

Options
    • -1
    • +1
    ./emailnotifications/courseNotifications.jsp
    • -1
    • +1
    ./emailnotifications/lessonNotifications.jsp
    • -2
    • +2
    ./emailnotifications/scheduledEmailList.jsp
    • -28
    • +37
    ./includes/javascript/monitorLesson.js
    • -0
    • +3
    ./monitor.jsp
  6. … 6 more files in changeset.
Wednesday 01 Jan 2020
2:35 am

Andrey Balan

LDEV-4932 Add CSRF to monitor and central

* Add CSRF protection to:

- Change lesson status (incl. remove)

- Remove lesson using main.jsp button

- Rename lesson

* Start using /common/taglibs.jsp in lams_central

Options
    • -0
    • +70
    ./WEB-INF/tlds/security/csrfguard.tld
    • -0
    • +15
    ./WEB-INF/web.xml
    • -12
    • +9
    ./includes/javascript/monitorLesson.js
    • -19
    • +22
    ./monitor.jsp
    • -0
    • +1
    ./taglibs.jsp
  6. … 19 more files in changeset.
Wednesday 18 Dec 2019
6:41 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4911 Added ids to support automated testing

Options
    • -2
    • +2
    ./gate/gateInfo.jsp
  2. … 1 more file in changeset.
Monday 16 Dec 2019
2:45 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'master' into LDEV-4886

Options
    • -13
    • +20
    ./includes/javascript/monitorLesson.js
  2. … 1 more file in changeset.
Monday 02 Dec 2019
2:09 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4911 Adding ides to test monitor starting new lesson

Options
    • -1
    • +1
    ./gate/gateStatus.jsp
    • -1
    • +1
    ./grouping/chosenGrouping.jsp
    • -2
    • +3
    ./includes/javascript/monitorLesson.js
  4. … 2 more files in changeset.
Thursday 28 Nov 2019
7:28 pm

Marcin Cieslak

LDEV-4898 Fix race condition when generating a LD SVG

Options
    • -13
    • +20
    ./includes/javascript/monitorLesson.js
  2. … 1 more file in changeset.
Thursday 14 Nov 2019
9:28 pm

Marcin Cieslak

LDEV-4900 Distribute modified Page tag to all tools

Options
    • -1
    • +11
    ./WEB-INF/tags/Page.tag
  2. … 30 more files in changeset.
Sunday 13 Oct 2019
2:42 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4877 Bootstrap tourist replaced tour for Bootstrap 3.4.1

Options
    • -2
    • +2
    ./monitor.jsp
    • -32
    • +42
    ./monitorTour.jsp
    • -1
    • +1
    ./tblmonitor/sequence.jsp
  4. … 6 more files in changeset.
Monday 22 Jul 2019
10:47 pm

Marcin Cieslak

LDEV-4834 Use panel-less LO widget in QB question authoring

Options
    • -1
    • +14
    ./WEB-INF/tags/CKEditor.tag
    • -10
    • +33
    ./WEB-INF/tags/OutcomeAuthor.tag
  3. … 69 more files in changeset.
Thursday 04 Jul 2019
11:48 pm

Marcin Cieslak

LDEV-4834 Initial implementation of Learning Outcomes in Question Bank

Options
    • -10
    • +19
    ./WEB-INF/tags/OutcomeAuthor.tag
  2. … 50 more files in changeset.
Friday 14 Jun 2019
1:11 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'develop' into LDEV-4759

# Conflicts:

# lams_central/web/authoring/template/tool/mcquestion.jsp

# lams_central/web/authoringConfirm.jsp

# lams_central/web/css/_learner_base.scss

# lams_central/web/profile/editprofile.jsp

# lams_learning/web/optionsActivity.jsp

# lams_monitoring/web/monitor.jsp

# lams_monitoring/web/tblmonitor/sequence.jsp

# lams_monitoring/web/tblmonitor/teams.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/common/monitoringheader.jsp

# lams_tool_preview/web/pages/monitoring/criteria.jsp

# lams_tool_preview/web/pages/monitoring/reflections.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp

# lams_tool_task/web/common/monitorheader.jsp

Options
    • -5
    • +31
    ./WEB-INF/tags/OutcomeAuthor.tag
    • -9
    • +2
    ./css/_tblmonitor_base.scss
    • -50
    • +49
    ./monitor.jsp
    • -2
    • +2
    ./tblmonitor/sequence.jsp
    • -1
    • +11
    ./tblmonitor/teams.jsp
  6. … 90 more files in changeset.
Wednesday 15 May 2019
7:10 pm

Marcin Cieslak

LDEV-4819 Allow disabling Learning Outcome quick add in sysadmin

Options
    • -3
    • +10
    ./WEB-INF/tags/OutcomeAuthor.tag
  2. … 35 more files in changeset.
Friday 10 May 2019
7:33 pm

Andrey Balan

LDEV-4816 use jquery toggle instead of bootstrap collapse

By some reason bootstrap collapse doesn't work properly. Involved

links got assigned double amount of click handlers which makes

them appear and then instantaneously disappear again.

Options
    • -1
    • +11
    ./tblmonitor/teams.jsp
Friday 26 Apr 2019
3:13 am

Andrey Balan

LDEV-4811 Solve the problem of working with several open monitor dialogs

Options
    • -48
    • +49
    ./monitor.jsp
  2. … 2 more files in changeset.
Wednesday 27 Mar 2019
7:18 pm

Marcin Cieslak

LDEV-4786 Adjust outcome CSS in authoring. Confirm outcome removal.

Options
    • -4
    • +7
    ./WEB-INF/tags/OutcomeAuthor.tag
  2. … 87 more files in changeset.
Tuesday 26 Mar 2019
4:09 am

Andrey Balan

LDEV-4796 Fix refresh button issue after clicking "Expand all" one

Options
    • -2
    • +2
    ./tblmonitor/sequence.jsp
  2. … 1 more file in changeset.
3:31 am

Andrey Balan

LDEV-4793 Fixing TBLmonitor's issues with iPad

Options
    • -9
    • +2
    ./css/_tblmonitor_base.scss
  2. … 1 more file in changeset.