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
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
1:06 pm

Ernie Ghiglione

LDEV-5008 backporting to master

Options
    • -20
    • +29
    /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    /lams_tool_doku/db/sql/activity_insert.sql
    • -1
    • +1
    /lams_tool_doku/db/sql/create_lams_tool_dokumaran.sql
    • -4
    • +6
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200324.sql
    • -0
    • +17
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200329.sql
Friday 08 May 2020
1:07 pm

Marcin Cieslak

LDEV-5020 Fix a missing character

Options
    • -1
    • +1
    /lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp
Thursday 07 May 2020
6:29 pm

Marcin Cieslak

Merge branch 'LDEV-5020'

Options
6:28 pm

Marcin Cieslak

LDEV-5020 Show question options in burning question in TBL monitor

Options
    • -1
    • +1
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -7
    • +34
    /lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp
2:38 pm

Marcin Cieslak

Merge branch 'LDEV-5019'

Options
2:38 pm

Marcin Cieslak

LDEV-5019 Link Scratchie learner view to student choices in monitoring

Options
    • -0
    • +9
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +17
    /lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp
Wednesday 06 May 2020
7: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
    • -0
    • +1
    /lams_build/3rdParty.userlibraries
    • -1
    • +11
    /lams_build/build.xml
    • -0
    • +1
    /lams_build/conf/j2ee/jboss-deployment-structure.xml
    • -0
    • +2
    /lams_build/liblist.txt
    • -0
    • +2
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -3
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -3
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -0
    • +23
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200220.sql
    • -0
    • +19
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200221.sql
    • -0
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -0
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -62
    • +74
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -440
    • +440
    /lams_monitoring/web/tblmonitor/teams.jsp
    • -0
    • +2
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -18
    • +22
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
  16. … 16 more files in changeset.
Tuesday 05 May 2020
12:06 pm

Marcin Cieslak

LDEV-5015 Set iRA confidence level type on TBL template save

Options
    • -1
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
1:05 am

Marcin Cieslak

LDEV-5015 Fix question duplication on TBL template save

Options
    • -0
    • +12
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Monday 04 May 2020
5:35 pm

Marcin Cieslak

Merge branch 'LDEV-5015' into v4.0

Options
5:35 pm

Marcin Cieslak

LDEV-5015 Replace MCQ with Assessment as iRA in TBL template

Options
    • -3
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -6
    • +8
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -2
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Sunday 03 May 2020
5:39 pm

Ernie Ghiglione

LDEV-5008 Forgot the S in instructions

Options
    • -1
    • +1
    /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
Saturday 02 May 2020
9:06 am

Andrey Balan

LDEV-4995 First draft of the monitor page

Options
    • -1
    • +1
    /lams_central/conf/scss/_lams_variables.scss
    • -2
    • +2
    /lams_central/web/css/_authoring_base.scss
    • -13
    • +26
    /lams_central/web/css/_main_base.scss
    • -0
    • +3
    /lams_central/web/includes/javascript/dialog.js
    • -11
    • +15
    /lams_central/web/includes/javascript/main.js
    • -46
    • +47
    /lams_gradebook/web/gradebookMonitor.jsp
    • -3
    • +6
    /lams_gradebook/web/includes/jsp/jqGridIncludes.jsp
    • -10
    • +159
    /lams_monitoring/web/css/_monitorLesson_base.scss
    • -51
    • +174
    /lams_monitoring/web/includes/javascript/monitorLesson.js
    • -333
    • +352
    /lams_monitoring/web/monitor.jsp
    • -4
    • +4
    /lams_monitoring/web/monitorTour.jsp
    • -1
    • +1
    /lams_monitoring/web/tblmonitor/forum.jsp
    • -1
    • +1
    /lams_monitoring/web/tblmonitor/gates.jsp
    • -1
    • +1
    /lams_monitoring/web/tblmonitor/peerreview.jsp
    • -0
    • +1
    /lams_monitoring/web/tblmonitor/sequence.jsp
    • -2
    • +2
    /lams_monitoring/web/tblmonitor/teams.jsp
    • -1
    • +1
    /lams_monitoring/web/timer.jsp
8:59 am

Andrey Balan

LDEV-4995 update d3 library to 4.13.0 version

Options
    • -8
    • +2
    /lams_central/web/includes/javascript/d3.js
8:58 am

Andrey Balan

LDEV-4995 update tags

Options
    • -2
    • +17
    /lams_admin/web/WEB-INF/tags/Widget.tag
    • -1
    • +1
    /lams_central/web/WEB-INF/tags/Alert.tag
    • -2
    • +2
    /lams_central/web/WEB-INF/tags/DefineLater.tag
    • -1
    • +1
    /lams_central/web/WEB-INF/tags/LeaderDisplay.tag
    • -11
    • +11
    /lams_central/web/WEB-INF/tags/Page.tag
    • -2
    • +2
    /lams_central/web/WEB-INF/tags/Rating.tag
    • -0
    • +105
    /lams_central/web/WEB-INF/tags/Widget.tag
    • -1
    • +5
    /lams_central/web/WEB-INF/tlds/lams/lams.tld
    • -1
    • +1
    /lams_monitoring/web/WEB-INF/tags/Alert.tag
    • -2
    • +2
    /lams_monitoring/web/WEB-INF/tags/DefineLater.tag
    • -1
    • +1
    /lams_monitoring/web/WEB-INF/tags/LeaderDisplay.tag
    • -11
    • +11
    /lams_monitoring/web/WEB-INF/tags/Page.tag
    • -2
    • +2
    /lams_monitoring/web/WEB-INF/tags/Rating.tag
    • -4
    • +4
    /lams_monitoring/web/WEB-INF/tags/SimplePanel.tag
    • -1
    • +1
    /lams_monitoring/web/WEB-INF/tags/TabBodyArea.tag
    • -0
    • +105
    /lams_monitoring/web/WEB-INF/tags/Widget.tag
    • -1
    • +5
    /lams_monitoring/web/WEB-INF/tlds/lams/lams.tld
Friday 01 May 2020
7:32 pm

Ernie Ghiglione

LDEV-5006 cosmetic changes and labels

Options
    • -1
    • +1
    /lams_tool_zoom/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_zoom/web/pages/learning/learning.jsp
6:47 pm

Ernie Ghiglione

LDEV-5002 changes in labels

Options
    • -1
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
6:47 pm

Ernie Ghiglione

LDEV-5002 changes in labels

Conflicts:

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

Options
    • -1
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
6:37 pm

Ernie Ghiglione

LDEV-5002 Cosmetic and label changes

Options
    • -1
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/advance.jsp
6:37 pm

Ernie Ghiglione

LDEV-5002 Cosmetic and label changes

Options
    • -1
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/advance.jsp
Thursday 30 Apr 2020
2:43 pm

Marcin Cieslak

Merge branch 'LDEV-5014' into v4.0

Options
2:43 pm

Marcin Cieslak

LDEV-5014 Add spinner while QB panel loads in authoring

Options
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/basic.jsp
    • -0
    • +1
    /lams_tool_lamc/web/authoring/BasicContent.jsp
    • -0
    • +1
    /lams_tool_laqa/web/authoring/BasicContent.jsp
    • -0
    • +1
    /lams_tool_scratchie/web/pages/authoring/basic.jsp
2:21 pm

Marcin Cieslak

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

Options
2:19 pm

Marcin Cieslak

Merge branch 'LDEV-5013'

Options
2:19 pm

Marcin Cieslak

LDEV-5013 Display comment without escaping in Peer Review monitoring

Options
    • -0
    • +1
    /lams_tool_preview/web/pages/monitoring/criteriapart.jsp