lams-github

lams_monitoring

Clone Tools

Stats

Commits this week: 0
Total Committers: 30
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
Thursday 20 Aug 2020
8:46 am

Marcin Cieslak

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

Options
    • -16
    • +14
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -5
    • +26
    ./web/tblmonitor/tblmonitor.jsp
  3. … 24 more files in changeset.
Friday 07 Aug 2020
6:52 am

Ernie Ghiglione

LDEV-4769 Updating Spanish, Greek, French, Norwegian

Options
    • -7
    • +7
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 45 more files in changeset.
Tuesday 04 Aug 2020
3:40 am

Ernie Ghiglione

LDEV-4769 Updating Spanish, Norwegian

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 3 more files in changeset.
Sunday 02 Aug 2020
8:23 pm

Ernie Ghiglione

LDEV-4769 Updating Spanish

Also removing a deprecated label

Options
    • -1
    • +0
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -39
    • +43
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -6
    • +1
    ./web/parallelProgress.jsp
  8. … 16 more files in changeset.
Tuesday 28 Jul 2020
1:30 pm

Ernie Ghiglione

LDEV-4769 Updating English, Spanish, French, Greek and Norwegian for all active projects

From this commit onwards, we no longer will use the LAMS Community i18n to manage and handle translations.

Instead, we have now migrated to Lokalise (https://lokalise.com/) for managing all i18n projects and translations.

Many thanks Lokalise for your support!!

Options
    • -492
    • +476
    ./conf/language/lams/ApplicationResources.properties
    • -482
    • +476
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -482
    • +476
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -482
    • +471
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -304
    • +263
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -482
    • +476
    ./conf/language/lams/ApplicationResources_no_NO.properties
  7. … 166 more files in changeset.
9:04 am

Marcin Cieslak

LDEV-5057 Use UTF-8 as default encoding for message sources

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
  2. … 33 more files in changeset.
Monday 20 Jul 2020
9:51 am

Marcin Cieslak

LDEV-5031 Do not auto refresh AEs Student Choices tab

Options
    • -1
    • +1
    ./web/tblmonitor/tblmonitor.jsp
8:32 am

Marcin Cieslak

LDEV-5031 Do not auto refresh AEs and Burning Questions tabs

Options
    • -2
    • +9
    ./web/tblmonitor/tblmonitor.jsp
Friday 17 Jul 2020
11:45 am

Marcin Cieslak

LDEV-5054 Fix Learning Outcome removal Ajax call

Options
    • -0
    • +1
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  2. … 31 more files in changeset.
Thursday 25 Jun 2020
11:45 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'v4.0' into LDEV-4886

Options
    • -2
    • +3
    ./web/includes/javascript/monitorLesson.js
  2. … 2 more files in changeset.
Friday 12 Jun 2020
4:23 pm

Marcin Cieslak

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

Conflicts:

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

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -2
    • +3
    ./web/includes/javascript/monitorLesson.js
  3. … 1 more file in changeset.
4:18 pm

Marcin Cieslak

LDEV-5038 Add group to user name in lesson monitor sequence tab

Options
    • -12
    • +9
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -2
    • +3
    ./web/includes/javascript/monitorLesson.js
  3. … 1 more file in changeset.
Friday 05 Jun 2020
1:29 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4886 Automated tests for v4.0

Options
    • -1
    • +1
    ./web/gate/gateInfo.jsp
    • -1
    • +1
    ./web/gate/gateStatus.jsp
    • -1
    • +1
    ./web/grouping/chosenGrouping.jsp
    • -2
    • +3
    ./web/includes/javascript/monitorLesson.js
  5. … 16 more files in changeset.
Monday 01 Jun 2020
9:19 am

Marcin Cieslak

LDEV-5025 Allow leaving comments even after user rated

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Rating.tag
  2. … 31 more files in changeset.
Friday 29 May 2020
12:39 pm

Marcin Cieslak

LDEV-4925 Fix new lines on learner results page in Peer Review

Options
    • -1
    • +1
    ./web/WEB-INF/tags/StyledRating.tag
  2. … 31 more files in changeset.
Wednesday 27 May 2020
9:12 am

Marcin Cieslak

LDEV-5052 Add refresh button. Scroll to ratings table on refresh.

Options
    • -1
    • +2
    ./web/WEB-INF/tags/Rating.tag
  2. … 34 more files in changeset.
Tuesday 26 May 2020
6:51 pm

Marcin Cieslak

LDEV-5052 Refresh page and scroll to comments on rating

Options
    • -4
    • +13
    ./web/WEB-INF/tags/Rating.tag
  2. … 33 more files in changeset.
Friday 22 May 2020
8:50 am

Marcin Cieslak

LDEV-5031 Refresh last TBL tab content. Periodic refresh.

Options
    • -4
    • +18
    ./web/tblmonitor/tblmonitor.jsp
Thursday 21 May 2020
8:44 am

Marcin Cieslak

LDEV-5030 Sanitise user names for initial Etherpad content

Options
    • -1
    • +4
    ./web/WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
Monday 18 May 2020
6:45 am

Marcin Cieslak

LDEV-4996 Update Etherpad resize plugin customisation to 0.0.8

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
Friday 15 May 2020
12:53 pm

Marcin Cieslak

LDEV-4996 Adjust Etherpad autogrow feature

Options
    • -2
    • +2
    ./web/WEB-INF/tags/Etherpad.tag
  2. … 31 more files in changeset.
Wednesday 13 May 2020
6:24 pm

Ernie Ghiglione

LDEV-5023 Changing buttons to dropdown menu as it looks better.

Of course, in my humble opinion :-)

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -7
    • +9
    ./web/includes/javascript/monitorLesson.js
5:00 pm

Marcin Cieslak

LDEV-5023 Fix a missing variable in JS

Options
    • -1
    • +2
    ./web/includes/javascript/monitorLesson.js
Tuesday 12 May 2020
3:51 pm

Marcin Cieslak

LDEV-5023 Allow single click gate open in monitoring

Options
    • -0
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -14
    • +12
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -7
    • +37
    ./web/includes/javascript/monitorLesson.js
    • -42
    • +11
    ./web/monitor.jsp
    • -2
    • +24
    ./web/tblmonitor/gates.jsp
Monday 11 May 2020
12:14 pm

Marcin Cieslak

LDEV-4997 Renormalize line endings with git

Options
    • -74
    • +74
    ./web/tblmonitor/gates.jsp
    • -440
    • +440
    ./web/tblmonitor/teams.jsp
  3. … 419 more files in changeset.
Wednesday 06 May 2020
1: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
    ./web/tblmonitor/teams.jsp
  2. … 30 more files in changeset.
Saturday 02 May 2020
3:06 am

Andrey Balan

LDEV-4995 First draft of the monitor page

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

Andrey Balan

LDEV-4995 update tags

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

Andrey Balan

LDEV-4995 fix exception thrown on trying to get activity's Id

Options
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
Wednesday 22 Apr 2020
3: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/WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.