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
Wednesday 06 May 2020
7:21 pm

Marcin Cieslak

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

Conflicts:

lams_build/3rdParty.userlibraries

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

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

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

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

lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java

lams_monitoring/web/tblmonitor/teams.jsp

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql

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

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

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

lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/learning/CombinedAnswersContent.jsp

lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp

lams_tool_lamc/web/learning/ViewAnswers.jsp

lams_tool_lamc/web/monitoring/SummaryContent.jsp

lams_tool_lamc/web/monitoring/parts/statsPart.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

Options
    • -440
    • +440
    ./tblmonitor/teams.jsp
  2. … 30 more files in changeset.
Saturday 02 May 2020
9:06 am

Andrey Balan

LDEV-4995 First draft of the monitor page

Options
    • -10
    • +159
    ./css/_monitorLesson_base.scss
    • -51
    • +174
    ./includes/javascript/monitorLesson.js
    • -333
    • +352
    ./monitor.jsp
    • -4
    • +4
    ./monitorTour.jsp
    • -1
    • +1
    ./tblmonitor/forum.jsp
    • -1
    • +1
    ./tblmonitor/gates.jsp
    • -1
    • +1
    ./tblmonitor/peerreview.jsp
    • -0
    • +1
    ./tblmonitor/sequence.jsp
    • -2
    • +2
    ./tblmonitor/teams.jsp
    • -1
    • +1
    ./timer.jsp
  11. … 7 more files in changeset.
8:58 am

Andrey Balan

LDEV-4995 update tags

Options
    • -1
    • +1
    ./WEB-INF/tags/Alert.tag
    • -2
    • +2
    ./WEB-INF/tags/DefineLater.tag
    • -1
    • +1
    ./WEB-INF/tags/LeaderDisplay.tag
    • -11
    • +11
    ./WEB-INF/tags/Page.tag
    • -2
    • +2
    ./WEB-INF/tags/Rating.tag
    • -4
    • +4
    ./WEB-INF/tags/SimplePanel.tag
    • -1
    • +1
    ./WEB-INF/tags/TabBodyArea.tag
    • -0
    • +105
    ./WEB-INF/tags/Widget.tag
    • -1
    • +5
    ./WEB-INF/tlds/lams/lams.tld
  10. … 8 more files in changeset.
Wednesday 22 Apr 2020
9:48 pm

Marcin Cieslak

LDEV-4997 Do not import jQuery in Etherpad tag

It overwrites other imports made by pages which use the tag.

Options
    • -1
    • +1
    ./WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
9:48 pm

Marcin Cieslak

LDEV-4997 Do not import jQuery in Etherpad tag

It overwrites other imports made by pages which use the tag.

Options
    • -1
    • +1
    ./WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
Tuesday 21 Apr 2020
6:07 pm

Marcin Cieslak

LDEV-4999 Fix monitor role detection when updating learner mark

Options
    • -37
    • +37
    ./WEB-INF/tags/ImgButtonWrapper.tag
    • -74
    • +74
    ./tblmonitor/gates.jsp
    • -440
    • +440
    ./tblmonitor/teams.jsp
  4. … 461 more files in changeset.
Monday 20 Apr 2020
8:46 pm

Marcin Cieslak

LDEV-5002 Distribute Etherpad tag to all projects

Options
    • -0
    • +98
    ./WEB-INF/tags/Etherpad.tag
    • -37
    • +37
    ./WEB-INF/tags/ImgButtonWrapper.tag
    • -0
    • +4
    ./WEB-INF/tlds/lams/lams.tld
  4. … 86 more files in changeset.
8:46 pm

Marcin Cieslak

LDEV-5002 Distribute Etherpad tag to all projects

Options
    • -0
    • +98
    ./WEB-INF/tags/Etherpad.tag
    • -37
    • +37
    ./WEB-INF/tags/ImgButtonWrapper.tag
    • -0
    • +4
    ./WEB-INF/tlds/lams/lams.tld
  4. … 86 more files in changeset.
Sunday 19 Apr 2020
3:14 pm

Ernie Ghiglione

LDEV-4989 Password Gate initial implementation

Reverting random string in page

Options
    • -1
    • +0
    ./monitor.jsp
Thursday 09 Apr 2020
10:50 pm

Ernie Ghiglione

LDEV-4995 redesign course management page

Simplify course management page

Fixed issues with readmore-js and jquery3+

Add textarea to edit/create course

Options
    • -1
    • +1
    ./monitor.jsp
  2. … 3 more files in changeset.
Saturday 21 Mar 2020
9:47 am

Andrey Balan

LDEV-4995 Upgrade to bootstrap 4

* Update LAMS code to use bootstrap 4

* Update and redesign index page

Options
    • -1
    • +1
    ./emailnotifications/archivedEmailList.jsp
    • -3
    • +3
    ./emailnotifications/courseNotifications.jsp
    • -4
    • +4
    ./emailnotifications/lessonNotifications.jsp
    • -3
    • +3
    ./gate/openGateSingleUser.jsp
    • -4
    • +4
    ./grouping/viewGroups.jsp
    • -13
    • +13
    ./monitor.jsp
    • -3
    • +3
    ./tblmonitor/forum.jsp
    • -2
    • +2
    ./tblmonitor/gates.jsp
    • -3
    • +3
    ./tblmonitor/peerreview.jsp
    • -4
    • +4
    ./tblmonitor/sequence.jsp
    • -2
    • +2
    ./tblmonitor/tblmonitor.jsp
    • -6
    • +6
    ./tblmonitor/teams.jsp
  13. … 187 more files in changeset.
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.