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
Thursday 05 Mar 2020
5:03 am

Ernie Ghiglione

LDEV-4984 Adding label for i18n

Options
    • -3
    • +4
    /lams_tool_preview/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_tool_preview/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +4
    /lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +4
    /lams_tool_preview/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +3
    /lams_tool_preview/conf/language/lams/ApplicationResources_no_NO.properties
12:50 am

Marcin Cieslak

Merge branch 'LDEV-4984'

Options
12:50 am

Marcin Cieslak

LDEV-4984 Add SAPA factor to Spreadsheet export

Options
    • -0
    • +1
    /lams_tool_preview/conf/language/lams/ApplicationResources.properties
    • -54
    • +107
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/SpreadsheetBuilder.java
Wednesday 04 Mar 2020
1:37 am

Marcin Cieslak

Merge branch 'LDEV-4983'

Options
1:24 am

Marcin Cieslak

LDEV-4983 Round Peer Review factors to 2 decimal places instead of 1

Also make Email screen consistent with calculation in Spreadsheet export

Options
    • -73
    • +86
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/EmailAnalysisBuilder.java
Friday 28 Feb 2020
12:41 am

Marcin Cieslak

SP-4 Process different structure of staff enrolment file

Options
    • -163
    • +170
    /lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
Tuesday 25 Feb 2020
3:48 pm

Ernie Ghiglione

LDEV-4932 adding CSRF to assessment TBL page

Options
    • -1
    • +3
    /lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp
3:43 pm

Ernie Ghiglione

LDEV-4932 adding CSRF to assessment TBL page

Options
    • -1
    • +3
    /lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp
Monday 24 Feb 2020
8:10 pm

Marcin Cieslak

Merge branch 'LDEV-4976' into v4.0

Options
Sunday 23 Feb 2020
4:09 pm

Ernie Ghiglione

LDEV-4980 MCQ confidence level labels are switched

Options
    • -1
    • +1
    /lams_tool_lamc/web/learning/CombinedAnswersContent.jsp
    • -1
    • +1
    /lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp
    • -1
    • +1
    /lams_tool_lamc/web/learning/ViewAnswers.jsp
    • -1
    • +1
    /lams_tool_lamc/web/monitoring/SummaryContent.jsp
10:37 am

Ernie Ghiglione

LDEV-4980 MCQ confidence level labels are switched

Options
    • -1
    • +1
    /lams_tool_lamc/web/learning/CombinedAnswersContent.jsp
    • -1
    • +1
    /lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp
    • -1
    • +1
    /lams_tool_lamc/web/learning/ViewAnswers.jsp
    • -1
    • +1
    /lams_tool_lamc/web/monitoring/SummaryContent.jsp
Saturday 22 Feb 2020
9:01 pm

Marcin Cieslak

LDEV-4976 Add DB cascades to reflect Hibernate inheritance

Options
    • -0
    • +16
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20200222.sql
    • -0
    • +16
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20200222.sql
    • -0
    • +16
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20200222.sql
    • -0
    • +16
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20200222.sql
8:53 pm

Marcin Cieslak

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

Options
1:00 am

Andrey Balan

Merge branch 'LDEV-4951' into v4.1

Options
1:00 am

Andrey Balan

LDEV-4951 Squash Assessment autopatch scripts for 4.1 release

This is done in order to skip creating MCQ tool tables and then deleting

them in Assessment autopatch script.

Options
    • -1
    • +1
    /lams_tool_assessment/build.properties
    • -159
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20200120.sql
    • -0
    • +159
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20200220_updateTo41.sql
12:41 am

Andrey Balan

Merge branch 'LDEV-4979' into LDEV-4951

# Conflicts:

# 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_lamc/build.properties

# lams_tool_lamc/db/sql/create_lams_tool_mc.sql

# lams_tool_lamc/db/sql/tool_insert.sql

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/MonitoringController.java

# lams_tool_lamc/web/403.jsp

# lams_tool_lamc/web/404.jsp

# lams_tool_lamc/web/WEB-INF/web.xml

# lams_tool_lamc/web/common/taglibs.jsp

# lams_tool_lamc/web/error.jsp

# lams_tool_lamc/web/login.jsp

Options
    • -1
    • +6
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -4
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -3
    • +4
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -136
    • +114
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -5
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -5
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -1
    • +1
    /lams_tool_lamc/build.properties
12:32 am

Andrey Balan

LDEV-4979 Update SQL scripts for LAMS 4.0 release

1. Update SQL scripts (create_lams_tool_*.sql), to avoid running 3.1 to

4.0 autopatch scripts on every build.

2. Update module version to 20200219 in build.properties.

3. Squash patches that upgrade from 3.1 to 4.0 into a single one.

Options
    • -25
    • +220
    /lams_common/db/sql/create_lams_11_tables.sql
    • -1
    • +15
    /lams_common/db/sql/insert_lams_config_data.sql
    • -4
    • +16
    /lams_common/db/sql/insert_types_data.sql
    • -17
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190119.sql
    • -15
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190126.sql
    • -17
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190201.sql
    • -16
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190226.sql
    • -23
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190313.sql
    • -16
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190415.sql
    • -15
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190429.sql
    • -15
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190520.sql
    • -17
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190721.sql
    • -813
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql
    • -20
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190723.sql
    • -46
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql
  16. … 44 more files in changeset.
Thursday 20 Feb 2020
5:13 pm

Marcin Cieslak

LDEV-4962 Use random UUIDs v4 for user portraits

Options
    • -0
    • +23
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200219.sql
    • -0
    • +19
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200220.sql
12:23 pm

Ernie Ghiglione

LDEV-4878 Sanitise XSS for notes title in learner

Options
    • -9
    • +13
    /lams_learning/web/notebook/viewall.jsp
8:13 am

Andrey Balan

LDEV-4975 Remove now redundant jquery.sizzle.js

Options
    • -7
    • +0
    /lams_central/web/includes/javascript/jquery.sizzle.js
2:16 am

Andrey Balan

Merge branch 'master' into v4.0

Options
2:15 am

Andrey Balan

LDEV-4975 Remove now redundant jquery.mobile.js

Options
    • -2
    • +0
    /lams_central/web/includes/javascript/jquery.mobile.js
Wednesday 19 Feb 2020
9:41 pm

Marcin Cieslak

Merge branch 'LDEV-4977' into v4.0

Options
9:41 pm

Marcin Cieslak

LDEV-4977 Fix Daco change view feature

Options
    • -9
    • +9
    /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java
    • -7
    • +1
    /lams_tool_daco/web/includes/javascript/dacoLearning.js
8:38 pm

Marcin Cieslak

Merge branch 'LDEV-4978' into v4.0

Options
8:38 pm

Marcin Cieslak

LDEV-4978 Remove reference to an non-existing entity property

The reference was introduced by an incorrect recent merge with master,

regarding LDEV-4932.

Options
    • -3
    • +1
    /lams_central/web/outcome/outcomeManage.jsp
4:51 pm

Ernie Ghiglione

LDEV-4975 Upgrade jquery to version 3.4.1

Options
    • -2
    • +2
    /lams_admin/web/userorg.jsp
4:30 pm

Ernie Ghiglione

Merge branch 'LDEV-4975' into v4.0

Options
1:57 pm

Marcin Cieslak

LDEV-4976 Introduce an extra column and an unique index

The column holds the same information as parent table. I allows to add a

two-column index to prevent duplicates.

Options
    • -0
    • +21
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20200218.sql
    • -1
    • +11
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java
1:51 pm

Ernie Ghiglione

LDEV-4975 Upgrade jquery to version 3.4.1

Options
    • -1
    • +1
    /lams_admin/web/policies/policies.jsp
    • -1
    • +0
    /lams_central/web/css/bootstrap.min.css
    • -5
    • +5
    /lams_central/web/includes/javascript/addLesson.js
    • -2
    • +2
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -1
    • +1
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -3
    • +3
    /lams_central/web/includes/javascript/authoring/authoringMenu.js
    • -1
    • +1
    /lams_central/web/includes/javascript/dialog.js
    • -6
    • +2
    /lams_central/web/includes/javascript/jquery.js
    • -4
    • +4
    /lams_central/web/includes/javascript/main.js
    • -5
    • +5
    /lams_central/web/includes/javascript/orgGroup.js
    • -2
    • +2
    /lams_central/web/includes/javascript/progressBar.js
    • -1
    • +1
    /lams_central/web/includes/javascript/thickbox.js
    • -1
    • +1
    /lams_monitoring/web/includes/javascript/monitorLesson.js
    • -1
    • +1
    /lams_tool_leader/web/pages/learning/leaderselection.jsp
    • -4
    • +4
    /lams_tool_mindmap/web/includes/javascript/mapjs/main.js
    • -1
    • +1
    /lams_tool_scratchie/web/pages/learning/learning.jsp
    • -2
    • +2
    /lams_tool_vote/web/monitoring/SummaryContent.jsp