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
Wednesday 22 Apr 2020
8:04 pm

Marcin Cieslak

LDEV-5002 Move advanced Etherpad option in authoring

Options
    • -11
    • +11
    /lams_tool_assessment/web/pages/authoring/advance.jsp
8:04 pm

Marcin Cieslak

LDEV-5002 Move advanced Etherpad option in authoring

Options
    • -11
    • +11
    /lams_tool_assessment/web/pages/authoring/advance.jsp
2:59 pm

Marcin Cieslak

Merge branch 'LDEV-5002' into LDEV-4997

Options
2:59 pm

Marcin Cieslak

LDEV-5002 Show Etherpads in Assessment monitoring user summary page

Conflicts:

lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

Options
    • -1
    • +11
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -0
    • +28
    /lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp
2:59 pm

Marcin Cieslak

LDEV-5002 Show Etherpads in Assessment monitoring user summary page

Options
    • -1
    • +11
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -1
    • +29
    /lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp
2:07 pm

Marcin Cieslak

LDEV-5002 Make "show Etherpads" option disabled, not hidden

Options
    • -3
    • +5
    /lams_tool_assessment/web/pages/authoring/advance.jsp
2:07 pm

Marcin Cieslak

LDEV-5002 Make "show Etherpads" option disabled, not hidden

Options
    • -3
    • +5
    /lams_tool_assessment/web/pages/authoring/advance.jsp
12:02 pm

Marcin Cieslak

SP-4 Allow some roles to be missing from a merged enrolment file

Options
    • -2
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
12:07 am

Marcin Cieslak

Merge branch 'LDEV-5006'

Options
Tuesday 21 Apr 2020
10:34 pm

Marcin Cieslak

SP-4 Allow mixing different roles in a single file

Options
    • -156
    • +175
    /lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
7:00 pm

Marcin Cieslak

LDEV-5006 Make Zoom optional, configurable in advanced authoring tab

Options
    • -0
    • +1
    /lams_tool_zoom/conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dbupdates/patch20200410.sql
    • -5
    • +16
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/Zoom.java
    • -5
    • +9
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java
    • -1
    • +3
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/util/ZoomUtil.java
    • -4
    • +6
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/AuthoringController.java
    • -1
    • +3
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/LearningController.java
    • -0
    • +10
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/forms/AuthoringForm.java
    • -0
    • +7
    /lams_tool_zoom/web/pages/authoring/advanced.jsp
    • -2
    • +4
    /lams_tool_zoom/web/pages/learning/learning.jsp
6:42 pm

Marcin Cieslak

LDEV-5006 Strip URL from password so users need to provide it manually

Options
    • -0
    • +6
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java
6:07 pm

Marcin Cieslak

LDEV-4999 Fix monitor role detection when updating learner mark

Options
    • -192
    • +192
    /3rdParty_sources/commons-io/org/apache/commons/io/Charsets.java
    • -24
    • +24
    /3rdParty_sources/commons-io/org/apache/commons/io/serialization/package.html
    • -243
    • +243
    /3rdParty_sources/commons-validator/org/apache/commons/validator/routines/checkdigit/ModulusTenCheckDigit.java
    • -76
    • +76
    /3rdParty_sources/hibernate-core/org/hibernate/MappingNotFoundException.java
    • -39
    • +39
    /3rdParty_sources/hibernate-core/org/hibernate/QueryParameterException.java
    • -23
    • +23
    /3rdParty_sources/hibernate-core/org/hibernate/TypeMismatchException.java
    • -41
    • +41
    /3rdParty_sources/hibernate-core/org/hibernate/annotations/CollectionId.java
    • -26
    • +26
    /3rdParty_sources/hibernate-core/org/hibernate/annotations/Fetch.java
    • -28
    • +28
    /3rdParty_sources/hibernate-core/org/hibernate/annotations/FetchMode.java
    • -57
    • +57
    /3rdParty_sources/hibernate-core/org/hibernate/annotations/FetchProfile.java
    • -45
    • +45
    /3rdParty_sources/hibernate-core/org/hibernate/annotations/FilterJoinTable.java
    • -26
    • +26
    /3rdParty_sources/hibernate-core/org/hibernate/annotations/FilterJoinTables.java
    • -37
    • +37
    /3rdParty_sources/hibernate-core/org/hibernate/annotations/ForeignKey.java
    • -30
    • +30
    /3rdParty_sources/hibernate-core/org/hibernate/annotations/Generated.java
    • -39
    • +39
    /3rdParty_sources/hibernate-core/org/hibernate/annotations/GenerationTime.java
  16. … 449 more files in changeset.
Monday 20 Apr 2020
9:58 pm

Marcin Cieslak

Merge branch 'LDEV-5002' into LDEV-4997

Options
9:57 pm

Marcin Cieslak

LDEV-5002 Add advanced authoring option to control Etherpads display

Options
    • -0
    • +15
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20200420.sql
    • -1
    • +12
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -0
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -3
    • +10
    /lams_tool_assessment/web/pages/authoring/advance.jsp
9:57 pm

Marcin Cieslak

LDEV-5002 Add advanced authoring option to control Etherpads display

Conflicts:

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java

Options
    • -0
    • +15
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20200420.sql
    • -0
    • +11
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -0
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -3
    • +10
    /lams_tool_assessment/web/pages/authoring/advance.jsp
9:28 pm

Marcin Cieslak

LDEV-5002 Add Etherpads after each question in Assessment

Options
    • -1
    • +2
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -18
    • +22
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -2
    • +7
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -16
    • +28
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -0
    • +8
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -0
    • +29
    /lams_tool_assessment/web/pages/learning/parts/allquestions.jsp
9:28 pm

Marcin Cieslak

LDEV-5002 Add Etherpads after each question in Assessment

Conflicts:

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

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

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

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

lams_tool_assessment/web/pages/learning/learning.jsp

Options
    • -1
    • +2
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -0
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -44
    • +47
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -5
    • +6
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -9
    • +25
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -0
    • +9
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -0
    • +29
    /lams_tool_assessment/web/pages/learning/parts/allquestions.jsp
8:46 pm

Marcin Cieslak

LDEV-5002 Distribute Etherpad tag to all projects

Options
    • -0
    • +98
    /lams_admin/web/WEB-INF/tags/Etherpad.tag
    • -37
    • +37
    /lams_admin/web/WEB-INF/tags/ImgButtonWrapper.tag
    • -0
    • +4
    /lams_admin/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +98
    /lams_central/web/WEB-INF/tags/Etherpad.tag
    • -0
    • +4
    /lams_central/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +98
    /lams_gradebook/web/WEB-INF/tags/Etherpad.tag
    • -37
    • +37
    /lams_gradebook/web/WEB-INF/tags/ImgButtonWrapper.tag
    • -0
    • +4
    /lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +98
    /lams_learning/web/WEB-INF/tags/Etherpad.tag
    • -37
    • +37
    /lams_learning/web/WEB-INF/tags/ImgButtonWrapper.tag
    • -0
    • +4
    /lams_learning/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +98
    /lams_monitoring/web/WEB-INF/tags/Etherpad.tag
    • -37
    • +37
    /lams_monitoring/web/WEB-INF/tags/ImgButtonWrapper.tag
    • -0
    • +4
    /lams_monitoring/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +98
    /lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag
  16. … 74 more files in changeset.
8:46 pm

Marcin Cieslak

LDEV-5002 Distribute Etherpad tag to all projects

Options
    • -0
    • +98
    /lams_admin/web/WEB-INF/tags/Etherpad.tag
    • -37
    • +37
    /lams_admin/web/WEB-INF/tags/ImgButtonWrapper.tag
    • -0
    • +4
    /lams_admin/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +98
    /lams_central/web/WEB-INF/tags/Etherpad.tag
    • -0
    • +4
    /lams_central/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +98
    /lams_gradebook/web/WEB-INF/tags/Etherpad.tag
    • -37
    • +37
    /lams_gradebook/web/WEB-INF/tags/ImgButtonWrapper.tag
    • -0
    • +4
    /lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +98
    /lams_learning/web/WEB-INF/tags/Etherpad.tag
    • -37
    • +37
    /lams_learning/web/WEB-INF/tags/ImgButtonWrapper.tag
    • -0
    • +4
    /lams_learning/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +98
    /lams_monitoring/web/WEB-INF/tags/Etherpad.tag
    • -37
    • +37
    /lams_monitoring/web/WEB-INF/tags/ImgButtonWrapper.tag
    • -0
    • +4
    /lams_monitoring/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +98
    /lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag
  16. … 74 more files in changeset.
6:56 pm

Marcin Cieslak

Merge branch 'LDEV-4999' into v4.0

Options
6:56 pm

Marcin Cieslak

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

Conflicts:

lams_admin/conf/language/lams/ApplicationResources_el_GR.properties

lams_admin/conf/language/lams/ApplicationResources_es_ES.properties

Options
    • -0
    • +5
    /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
    • -0
    • +2
    /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
6:55 pm

Marcin Cieslak

LDEV-4999 Allow marks update in Dokuy monitoring summary page

Options
    • -0
    • +1
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -0
    • +4
    /lams_central/web/includes/javascript/jquery.tablesorter-editable.js
    • -0
    • +2
    /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +46
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
    • -13
    • +68
    /lams_tool_doku/web/pages/monitoring/summary.jsp
5:00 pm

Ernie Ghiglione

LDEV-4995 fixed userorgrole page

Options
    • -0
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleController.java
    • -55
    • +65
    /lams_admin/web/userorgrole.jsp
Sunday 19 Apr 2020
7:04 pm

Marcin Cieslak

SP-4 Fix an entity processing bug

Options
    • -2
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
3:14 pm

Ernie Ghiglione

LDEV-4989 Password Gate initial implementation

Reverting random string in page

Options
    • -1
    • +0
    /lams_monitoring/web/monitor.jsp
12:39 pm

Marcin Cieslak

SP-4 In every mode inform that processing finished successfuly

Options
    • -0
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
Saturday 18 Apr 2020
2:23 pm

Marcin Cieslak

LDEV-4999 Display users in tablesorter in Doku monitoring summary

Options
    • -0
    • +6
    /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +69
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
    • -0
    • +90
    /lams_tool_doku/web/pages/monitoring/summary.jsp
Friday 17 Apr 2020
10:10 pm

Marcin Cieslak

SP-4 Add group manager processing

Options
    • -34
    • +145
    /lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
1:47 pm

Marcin Cieslak

LDEV-4997 Fetch API key for every call as it can change in config

Options
    • -13
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/etherpad/service/EtherpadService.java