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 09 Oct 2020
4:25 pm

Marcin Cieslak

LDEV-5091 Initialise Etherpads on Discussion panel expand

Options
    • -6
    • +17
    ./WEB-INF/tags/Etherpad.tag
  2. … 36 more files in changeset.
7:32 am

Marcin Cieslak

LDEV-5083 Refactor sidebar and top menu. Add custom tags.

Conflicts:

lams_central/web/css/components.css

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

Options
    • -0
    • +40
    ./WEB-INF/tags/Dropdown.tag
    • -0
    • +41
    ./WEB-INF/tags/Input.tag
    • -0
    • +29
    ./WEB-INF/tags/PageComponent.tag
    • -0
    • +76
    ./WEB-INF/tags/Panel.tag
    • -0
    • +40
    ./WEB-INF/tags/Switch.tag
    • -0
    • +20
    ./WEB-INF/tlds/lams/lams.tld
    • -197
    • +36
    ./css/components-monitoring.css
    • -11
    • +14
    ./monitor5.jsp
  9. … 1 more file in changeset.
7:32 am

Marcin Cieslak

LDEV-5083 Refactor sidebar and top menu. Add custom tags.

Options
    • -0
    • +40
    ./WEB-INF/tags/Dropdown.tag
    • -0
    • +41
    ./WEB-INF/tags/Input.tag
    • -0
    • +29
    ./WEB-INF/tags/PageComponent.tag
    • -0
    • +76
    ./WEB-INF/tags/Panel.tag
    • -0
    • +40
    ./WEB-INF/tags/Switch.tag
    • -1
    • +20
    ./WEB-INF/tlds/lams/lams.tld
    • -197
    • +36
    ./css/components-monitoring.css
    • -11
    • +14
    ./monitor5.jsp
  9. … 1 more file in changeset.
Thursday 08 Oct 2020
3:36 pm

Marcin Cieslak

LDEV-5083 Add non-standard fonts

Options
    • -3
    • +3
    ./css/components-monitoring.css
  2. … 3 more files in changeset.
3:36 pm

Marcin Cieslak

LDEV-5083 Add non-standard fonts

Options
    • -3
    • +3
    ./css/components-monitoring.css
  2. … 3 more files in changeset.
3:28 pm

Marcin Cieslak

LDEV-5083 Add redesign CSS files otherwise ignored by git

Options
    • -0
    • +107
    ./css/components-monitoring-responsive.css
    • -0
    • +1078
    ./css/components-monitoring.css
  3. … 1 more file in changeset.
3:28 pm

Marcin Cieslak

LDEV-5083 Add redesign CSS files otherwise ignored by git

Options
    • -0
    • +107
    ./css/components-monitoring-responsive.css
    • -0
    • +1078
    ./css/components-monitoring.css
  3. … 1 more file in changeset.
Tuesday 06 Oct 2020
9:33 pm

Marcin Cieslak

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

Options
    • -4
    • +3
    ./WEB-INF/tags/CKEditor.tag
  2. … 31 more files in changeset.
9:25 pm

Marcin Cieslak

LDEV-5085 Run CKEditor initialisation immediately

If CKEditor.tag is loaded dynamically, binding it to page load event

does not work.

Options
    • -4
    • +2
    ./WEB-INF/tags/CKEditor.tag
  2. … 31 more files in changeset.
Monday 05 Oct 2020
12:16 pm

Marcin Cieslak

LDEV-4425 Do not escape user names. Add padding to portrait.

Options
    • -4
    • +4
    ./WEB-INF/tags/StyledRating.tag
  2. … 31 more files in changeset.
6:27 am

Marcin Cieslak

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

Options
    • -21
    • +25
    ./WEB-INF/tags/CKEditor.tag
  2. … 31 more files in changeset.
6:19 am

Marcin Cieslak

LDEV-5085 Make editor init method parametrized

It seems that multiple instances of CKEditor tag were interacting with

each other, probably with request attributes. Now initialisation method

is parametrised so CKEditor starts with own set of attributes.

Options
    • -22
    • +28
    ./WEB-INF/tags/CKEditor.tag
  2. … 31 more files in changeset.
Sunday 04 Oct 2020
8:09 am

Marcin Cieslak

LDEV-5083 Initial refactoring of redesigned monitoring into LAMS 5 JSP

Options
    • -61
    • +0
    ./assets/styles/main.css
    • -0
    • +1564
    ./monitor-sequence-tab.jsp
    • -0
    • +246
    ./monitor5.jsp
    • -1
    • +0
    ./taglibs.jsp
  5. … 14 more files in changeset.
8:09 am

Marcin Cieslak

LDEV-5083 Initial refactoring of redesigned monitoring into LAMS 5 JSP

Options
    • -61
    • +0
    ./assets/styles/main.css
    • -0
    • +1564
    ./monitor-sequence-tab.jsp
    • -0
    • +246
    ./monitor5.jsp
    • -1
    • +0
    ./taglibs.jsp
  5. … 14 more files in changeset.
Tuesday 22 Sep 2020
3:05 pm

Marcin Cieslak

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

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

lams_tool_assessment/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/service/McService.java

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

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

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

Options
    • -4
    • +6
    ./tblmonitor/tblmonitor.jsp
  2. … 7 more files in changeset.
7:40 am

Marcin Cieslak

LDEV-5078 Fix i18n labels in Arrow tag

Options
    • -3
    • +4
    ./WEB-INF/tags/Arrow.tag
  2. … 52 more files in changeset.
Saturday 12 Sep 2020
9:31 am

Marcin Cieslak

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

Options
    • -2
    • +6
    ./includes/javascript/monitorLesson.js
  2. … 1 more file in changeset.
Friday 11 Sep 2020
6:55 pm

Marcin Cieslak

LDEV-5073 Do not autofresh monitoring if a modal dialog is open

Options
    • -2
    • +6
    ./includes/javascript/monitorLesson.js
    • -4
    • +6
    ./tblmonitor/tblmonitor.jsp
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
    • -5
    • +26
    ./tblmonitor/tblmonitor.jsp
  2. … 25 more files in changeset.
Sunday 02 Aug 2020
8:23 pm

Ernie Ghiglione

LDEV-4769 Updating Spanish

Also removing a deprecated label

Options
    • -6
    • +1
    ./parallelProgress.jsp
  2. … 22 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
    ./tblmonitor/tblmonitor.jsp
8:32 am

Marcin Cieslak

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

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

Marcin Cieslak

LDEV-5054 Fix Learning Outcome removal Ajax call

Options
    • -0
    • +1
    ./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
    ./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
    • +3
    ./includes/javascript/monitorLesson.js
  2. … 2 more files in changeset.
4:18 pm

Marcin Cieslak

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

Options
    • -2
    • +3
    ./includes/javascript/monitorLesson.js
  2. … 2 more files 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
    ./gate/gateInfo.jsp
    • -1
    • +1
    ./gate/gateStatus.jsp
    • -1
    • +1
    ./grouping/chosenGrouping.jsp
    • -2
    • +3
    ./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-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-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-INF/tags/Rating.tag
  2. … 34 more files in changeset.