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 15 May 2020
7:09 pm

Marcin Cieslak

LDEV-4996 Add Etherpad autogrow feature to Doku tool

Options
    • -0
    • +13
    /lams_tool_doku/web/pages/learning/learning.jsp
    • -11
    • +13
    /lams_tool_doku/web/pages/monitoring/summary.jsp
7:07 pm

Marcin Cieslak

LDEV-4996 Remove obsolete menu item

Options
    • -1
    • +1
    /lams_build/conf/etherpad/etherpad-lite/settings.json
    • -1
    • +0
    /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
6:53 pm

Marcin Cieslak

LDEV-4996 Adjust Etherpad autogrow feature

Options
    • -2
    • +2
    /lams_admin/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_central/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_gradebook/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_learning/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_monitoring/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_tool_chat/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_tool_daco/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_tool_doku/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_tool_forum/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_tool_images/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_tool_laqa/web/WEB-INF/tags/Etherpad.tag
  16. … 17 more files in changeset.
6:44 pm

Marcin Cieslak

LDEV-4996 Update Etherpad customisations to version 1.8.4

Options
    • -2
    • +31
    /lams_build/conf/etherpad/etherpad-lite/settings.json
    • -5513
    • +0
    /lams_build/conf/etherpad/etherpad-lite/src/static/js/ace2_inner.js
    • -7
    • +20
    /lams_build/conf/etherpad/etherpad-lite/src/static/js/pad.js
    • -21
    • +7
    /lams_build/conf/etherpad/etherpad-lite/src/static/js/pad_userlist.js
    • -1
    • +3
    /lams_build/conf/etherpad/readme.txt
3:07 pm

Ernie Ghiglione

LDEV-5026 display improvement

Options
    • -2
    • +2
    /lams_tool_zoom/web/pages/learning/learning.jsp
9:16 am

Ernie Ghiglione

LDEV-5021 layout changes

Options
    • -4
    • +5
    /lams_tool_notebook/web/pages/monitoring/print.jsp
Thursday 14 May 2020
7:38 pm

Marcin Cieslak

Merge branch 'LDEV-5026'

Options
7:38 pm

Marcin Cieslak

LDEV-5026 Always require a password for Zoom meetings

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

Marcin Cieslak

LDEV-5024 Import question from QB to TBL template wizard

Options
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +39
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -3
    • +58
    /lams_central/web/authoring/template/tbl/tbl.jsp
5:24 pm

Marcin Cieslak

LDEV-5024 Add "question from bank" button to TBL template wizard

Options
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -2
    • +18
    /lams_central/web/authoring/template/tbl/tbl.jsp
3:39 pm

Marcin Cieslak

Merge branch 'LDEV-5021' into v4.0

Options
3:38 pm

Marcin Cieslak

LDEV-5021 Add print button on the report

Options
    • -20
    • +50
    /lams_tool_notebook/web/pages/monitoring/print.jsp
3:28 pm

Marcin Cieslak

LDEV-5021 Prepare Notebook content in printable version

Options
    • -0
    • +1
    /lams_tool_notebook/conf/language/lams/ApplicationResources.properties
    • -6
    • +6
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/INotebookUserDAO.java
    • -2
    • +10
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookUserDAO.java
    • -0
    • +102
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookPrintDTO.java
    • -3
    • +3
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java
    • -15
    • +14
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java
    • -2
    • +45
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/MonitoringController.java
    • -0
    • +34
    /lams_tool_notebook/web/pages/monitoring/print.jsp
    • -6
    • +11
    /lams_tool_notebook/web/pages/monitoring/summary.jsp
9:33 am

Ernie Ghiglione

LDEV-5020 Adding spacing between question and answers

Options
    • -1
    • +1
    /lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp
12:24 am

Ernie Ghiglione

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

Of course, in my humble opinion :-)

Options
    • -1
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -7
    • +9
    /lams_monitoring/web/includes/javascript/monitorLesson.js
Wednesday 13 May 2020
11:00 pm

Marcin Cieslak

LDEV-5023 Fix a missing variable in JS

Options
    • -1
    • +2
    /lams_monitoring/web/includes/javascript/monitorLesson.js
8:53 pm

Marcin Cieslak

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

Conflicts:

lams_tool_scratchie/web/pages/learning/results.jsp

Options
    • -0
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -4
    • +4
    /lams_tool_scratchie/web/pages/learning/results.jsp
6:57 pm

Marcin Cieslak

LDEV-5022 Make burning questions paragraphs work with jqGrid editing

Options
    • -0
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -6
    • +6
    /lams_tool_scratchie/web/pages/learning/results.jsp
Tuesday 12 May 2020
9:52 pm

Marcin Cieslak

Merge branch 'LDEV-5023' into v4.0

Options
9:51 pm

Marcin Cieslak

LDEV-5023 Allow single click gate open in monitoring

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

Marcin Cieslak

LDEV-5020 Fix a bug preventing letters from showing in question options

Options
    • -1
    • +1
    /lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp
3:59 pm

Marcin Cieslak

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

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_build/3rdParty.userlibraries

lams_build/build.xml

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

lams_central/web/includes/javascript/openUrls.js

lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

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

lams_common/src/java/org/lamsfoundation/lams/outcome/Outcome.java

lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeMapping.java

lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeScale.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

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

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/AuthoringController.java

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

lams_tool_assessment/web/pages/learning/learning.jsp

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

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20170101_updateTo30.sql

lams_tool_lamc/web/tblmonitoring/mcq.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.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/web/pages/learning/scratchies.jsp

lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

lams_www/web/news.html

Options
    • -0
    • +1
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java
    • -0
    • +2
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -4
    • +7
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -0
    • +1
    /lams_tool_scratchie/web/pages/monitoring/summary.jsp
    • -7
    • +6
    /lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp
3:06 pm

Marcin Cieslak

Merge branch 'LDEV-5022'

Options
3:05 pm

Marcin Cieslak

LDEV-5022 Keep HTML paragraphs when displaying burning questions

Options
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -4
    • +8
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -0
    • +1
    /lams_tool_scratchie/web/pages/monitoring/summary.jsp
1:21 pm

Marcin Cieslak

LDEV-5020 Add letters and highlight to options in burning questions

Options
    • -8
    • +7
    /lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp
Monday 11 May 2020
6:14 pm

Marcin Cieslak

LDEV-4997 Renormalize line endings with git

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. … 406 more files in changeset.
6:05 pm

Marcin Cieslak

LDEV-4997 Adjust Etherpad integration code for LAMS 3.1

Options
    • -0
    • +67
    /lams_central/src/java/org/lamsfoundation/lams/web/EtherpadController.java
    • -9
    • +40
    /lams_common/src/java/org/lamsfoundation/lams/etherpad/service/EtherpadService.java
    • -5
    • +25
    /lams_common/src/java/org/lamsfoundation/lams/etherpad/service/IEtherpadService.java
    • -4
    • +4
    /lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp
    • -15
    • +7
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -1
    • +1
    /lams_tool_doku/web/pages/learning/learning.jsp
    • -1
    • +1
    /lams_tool_doku/web/pages/monitoring/summary.jsp
    • -0
    • +1
    /lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag
    • -0
    • +4
    /lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld
1:57 pm

Ernie Ghiglione

LDEV-5008 update label

Options
    • -1
    • +1
    /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
1:56 pm

Ernie Ghiglione

LDEV-5008 updating label

Options
    • -1
    • +1
    /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
1:35 pm

Marcin Cieslak

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

Conflicts:

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

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

lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp

lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

Options
    • -0
    • +1
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -0
    • +11
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +16
    /lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp
    • -7
    • +34
    /lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp