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
Saturday 22 Feb 2020
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
Tuesday 18 Feb 2020
10:45 pm

Andrey Balan

Merge branch 'master' into v4.0

# Conflicts:

# lams_central/conf/security/Owasp.CsrfGuard.properties

# 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

Options
    • -127
    • +99
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -2
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -4
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
10:30 pm

Andrey Balan

LDEV-4974 Always display user's login and name

Options
    • -157
    • +117
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -3
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -4
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
10:21 pm

Andrey Balan

LDEV-4951 Remove traces of MCQ tool from other modules

Options
    • -4
    • +2
    /lams_build/build.xml
    • -6
    • +0
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -32
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -6
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -3
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
    • -1
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -3
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -12
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java
    • -1
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java
    • -2
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -3
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -9
    • +7
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -16
    • +8
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java
    • -13
    • +2
    /lams_monitoring/web/tblmonitor/tblmonitor.jsp
  16. … 178 more files in changeset.
Monday 17 Feb 2020
8:29 pm

Marcin Cieslak

LKC-225 Make container auto sync time and interval configurable

Options
    • -0
    • +3
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
Saturday 15 Feb 2020
8:26 am

Andrey Balan

LDEV-4972 Do not rely on activityId of the removed activities

Options
    • -4
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
7:24 am

Andrey Balan

LDEV-4971 Handle non-numeric version names

Options
    • -3
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/util/VersionUtil.java
3:20 am

Andrey Balan

LDEV-4970 Skip renaming questionReference's defaultGrade to maxMark

Options
    • -14
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java
Wednesday 12 Feb 2020
9:21 pm

Andrey Balan

LDEV-4932 Add CSRF to password change

Options
    • -0
    • +1
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -39
    • +44
    /lams_central/web/passwordChangeContent.jsp
9:21 pm

Andrey Balan

LDEV-4932 Add CSRF to password change

(cherry picked from commit df52e287d4a5f815849470ffb1fd82a3867a6bdb)

Options
    • -0
    • +1
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -39
    • +44
    /lams_central/web/passwordChangeContent.jsp
8:38 pm

Andrey Balan

Merge branch 'v4.0' into v4.1

Options
8:37 pm

Andrey Balan

LDEV-4969 Fix form validation

Options
    • -1
    • +0
    /lams_central/web/passwordChangeContent.jsp
8:26 pm

Marcin Cieslak

Merge branch 'LDEV-4968' into v4.0

Options
8:26 pm

Marcin Cieslak

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

Options
8:26 pm

Marcin Cieslak

LDEV-4968 Add CSRF Guard token to remove question request in Q&A tool

Options
    • -1
    • +2
    /lams_tool_laqa/web/authoring/BasicContent.jsp