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
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
    • +2
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -1664
    • +1673
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -2
    • +11
    /lams_central/web/authoring/authoring.jsp
    • -1
    • +4
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -3
    • +7
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -3
    • +14
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
    • -1
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -3
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java
    • -20
    • +18
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -0
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -1
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/util/AuthoringJsonTags.java
    • -0
    • +3
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -1
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerFullService.java
    • -62
    • +74
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  16. … 7 more files in changeset.
1:31 pm

Marcin Cieslak

LDEV-4992 Add icon to a leader in Scratchie monitoring summary

Options
    • -1
    • +10
    /lams_tool_scratchie/web/pages/monitoring/summary.jsp
Thursday 19 Mar 2020
9:11 pm

Marcin Cieslak

Merge branch 'LDEV-4992'

Options
9:10 pm

Marcin Cieslak

LDEV-4992 Show all learners in Scratchie monitoring summary

Options
    • -1
    • +1
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -0
    • +9
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -6
    • +7
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -12
    • +30
    /lams_tool_scratchie/web/pages/monitoring/summary.jsp
8:11 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/LDEV-4989'

Options
5:48 pm

Ernie Ghiglione

LDEV-4989 fixing layout and labels

Options
    • -3
    • +2
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_learning/web/gate/gateNext.jsp
    • -14
    • +10
    /lams_learning/web/gate/passwordGateContent.jsp
2:51 pm

Marcin Cieslak

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

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java

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

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java

lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

Options
    • -5
    • +3
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -1
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -0
    • +55
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -6
    • +12
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -53
    • +9
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -0
    • +252
    /lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp
    • -17
    • +8
    /lams_tool_scratchie/web/pages/monitoring/summary.jsp
12:26 pm

Ernie Ghiglione

LDEV-4798 Adding missing changes for preview and view

Options
    • -1
    • +1
    /moodle/mod/lamslesson/preview.php
    • -3
    • +3
    /moodle/mod/lamslesson/view.php
Wednesday 18 Mar 2020
10:09 pm

Ernie Ghiglione

LDEV-4993 Slight layout changes

Options
    • -1
    • +3
    /lams_tool_scratchie/web/pages/monitoring/summary.jsp
9:44 pm

Marcin Cieslak

LDEV-4989 Inform user of incorrect gate password

Options
    • -0
    • +1
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -0
    • +4
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java
    • -0
    • +9
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/GateForm.java
    • -0
    • +9
    /lams_learning/web/gate/passwordGateContent.jsp
8:56 pm

Marcin Cieslak

Merge branch 'LDEV-4993'

Options
8:55 pm

Marcin Cieslak

LDEV-4993 Move files to reflect logical assignment better

Options
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -0
    • +244
    /lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp
    • -1
    • +1
    /lams_tool_scratchie/web/pages/monitoring/summary.jsp
    • -244
    • +0
    /lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp
8:48 pm

Marcin Cieslak

LDEV-4993 Redesign Scratchie monitoring summary tab

Options
    • -14
    • +0
    /lams_monitoring/web/css/_tblmonitor_base.scss
    • -1
    • +0
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -0
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -0
    • +65
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -7
    • +10
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -65
    • +8
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -16
    • +5
    /lams_tool_scratchie/web/pages/monitoring/summary.jsp
    • -52
    • +69
    /lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp
3:36 pm

Marcin Cieslak

LDEV-4993 Remove unnecessary characters from TBL authoring page

Options
    • -1
    • +1
    /lams_central/web/authoring/template/tool/assessoption.jsp
Tuesday 17 Mar 2020
2:18 pm

Marcin Cieslak

LDEV-4991 Fix learning outcome query when entering via sysadmin

Options
    • -6
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java
Monday 16 Mar 2020
10:44 pm

Marcin Cieslak

LDEV-4989 Password Gate initial implementation

Options
    • -0
    • +2
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -1661
    • +1670
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -2
    • +11
    /lams_central/web/authoring/authoring.jsp
    • -1
    • +4
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -3
    • +7
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -3
    • +14
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
    • -0
    • +1
    /lams_common/conf/language/lams/ApplicationResources.properties
    • -0
    • +21
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200315.sql
    • -1
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -6
    • +16
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ContributionTypes.java
    • -0
    • +110
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/PasswordGateActivity.java
    • -3
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java
    • -20
    • +18
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
  16. … 22 more files in changeset.
Sunday 15 Mar 2020
2:38 am

Marcin Cieslak

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

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java

Options
2:36 am

Marcin Cieslak

Merge branch 'LDEV-4991'

Options
2:35 am

Marcin Cieslak

LDEV-4991 Fix URL when setting outcome result in Gradebook

Options
    • -1
    • +1
    /lams_gradebook/web/gradebookMonitor.jsp
2:31 am

Marcin Cieslak

LDEV-4991 Fix SQL conditions when searching for an outcome

Options
    • -7
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java
Thursday 12 Mar 2020
1:55 pm

Marcin Cieslak

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

Conflicts:

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java

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

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java

lams_tool_scratchie/web/pages/learning/scratchies.jsp

Options
    • -0
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -2
    • +12
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -0
    • +5
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -32
    • +28
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -6
    • +19
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -13
    • +10
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -0
    • +4
    /lams_tool_scratchie/web/includes/css/scratchie-learning.scss
    • -0
    • +11
    /lams_tool_scratchie/web/pages/learning/learning.jsp
    • -2
    • +9
    /lams_tool_scratchie/web/pages/learning/results.jsp
    • -2
    • +8
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
    • -1
    • +1
    /lams_tool_zoom/conf/language/lams/ApplicationResources.properties
1:34 pm

Marcin Cieslak

Merge branch 'LDEV-4990'

Options
1:33 pm

Marcin Cieslak

LDEV-4990 Style results page the same way as learning page in Scratchie

Options
    • -1
    • +3
    /lams_tool_scratchie/web/pages/learning/results.jsp
1:14 pm

Marcin Cieslak

LDEV-4987 Round percentage cell in tRAT monitoring

Options
    • -2
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
10:12 am

Ernie Ghiglione

LDEV-4987 Minor adjustments in layout

Options
    • -7
    • +8
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
Wednesday 11 Mar 2020
1:47 pm

Marcin Cieslak

Merge branch 'LDEV-4987'

Options
6:29 am

Marcin Cieslak

LDEV-4987 Display Scratchie item score on monitoring page

Options
    • -1
    • +11
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -0
    • +4
    /lams_tool_scratchie/web/includes/css/scratchie-learning.scss
    • -0
    • +11
    /lams_tool_scratchie/web/pages/learning/learning.jsp
    • -4
    • +6
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
5:56 am

Marcin Cieslak

LDEV-4987 Show score by each Scratchie in results. Show negative percent

Options
    • -1
    • +1
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -1
    • +12
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -0
    • +5
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -38
    • +29
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -9
    • +8
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -1
    • +6
    /lams_tool_scratchie/web/pages/learning/results.jsp
    • -0
    • +4
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
Monday 09 Mar 2020
1:21 pm

Marcin Cieslak

Merge branch 'LDEV-4987' into v4.0

Options
1:21 pm

Marcin Cieslak

LDEV-4987 Fix file download notification

The bug was introduced in LDEV-4932

Options
    • -1
    • +1
    /lams_central/web/includes/javascript/download.js