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
Tuesday 17 May 2022
4:34 pm

Marcin Cieslak

LDEV-4020 Use prop() instead of attr() in authoring JS code

Newer jQuery version operate with prop(). Using attr() allowed for

example multiple branches to be marked as the default one.

Options
    • -19
    • +17
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
1:25 pm

Marcin Cieslak

LDEV-5928 Change labels to reflect file submission as 2 step process

Options
    • -10
    • +10
    /lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
    • -10
    • +11
    /lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties
Friday 13 May 2022
11:05 pm

Marcin Cieslak

LDEV-5081 Make "regular monitoring" button show old monitoring UI

Options
    • -1
    • +1
    /lams_monitoring/web/tblmonitor/tblmonitor.jsp
11:05 pm

Marcin Cieslak

LDEV-5081 Reintroduce old monitoring code to compare with new one

Options
    • -553
    • +304
    /lams_monitoring/web/includes/javascript/monitorLesson.js
8:33 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.6' into LDEV-5081

Options
1:31 pm

Marcin Cieslak

LDEV-4949 Fix stripped of non-break whitespace

Options
    • -13
    • +29
    /lams_common/src/java/org/lamsfoundation/lams/questions/QuestionWordParser.java
Thursday 12 May 2022
1:59 am

Marcin Cieslak

LDEV-5309 Fix removing units from numerical question

delete-orphan setting in QbQuestion units causes problems when importing

QbQuestion from XML. JPA does not recognise the collection parent and

fails on save. Another approach to removing units had to be found.

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
    • -3
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestionUnit.java
    • -4
    • +19
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
Wednesday 11 May 2022
12:03 am

Marcin Cieslak

Merge remote-tracking branch 'origin/LDEV-5083' into LDEV-5081

Options
12:03 am

Marcin Cieslak

LDEV-5081 Restyle Free jqGrid according to changes made for monitoring

Options
    • -7
    • +14
    /lams_central/web/css/free.ui.jqgrid.custom.css
12:02 am

Marcin Cieslak

LDEV-5083 Reintroduce Popper needed for date time picker

Options
    • -0
    • +6
    /lams_central/web/includes/javascript/popper.min.js
Tuesday 10 May 2022
11:46 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/LDEV-5083' into LDEV-5081

Options
11:45 pm

Marcin Cieslak

LDEV-5081 Merge changes made for monitor in LDEV-5083

Options
    • -23
    • +29
    /lams_build/3rdParty.userlibraries
    • -7
    • +66
    /lams_build/build.xml
    • -3
    • +19
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -178
    • +129
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -7
    • +14
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
    • -9
    • +10
    /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
    • -0
    • +29
    /lams_central/web/css/free.ui.jqgrid.custom.css
    • -177
    • +276
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -163
    • +288
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -30
    • +51
    /lams_central/web/includes/javascript/authoring/authoringHandler.js
    • -1847
    • +1410
    /lams_common/db/sql/create_lams_11_tables.sql
    • -5
    • +3
    /lams_common/db/sql/insert_lams_config_data.sql
    • -4
    • +4
    /lams_common/db/sql/insert_types_data.sql
    • -0
    • +22
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200129.sql
    • -15
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
  16. … 22 more files in changeset.
11:44 pm

Marcin Cieslak

LDEV-5083 Reintroduce changes for Live Edit

Options
    • -0
    • +1
    /lams_central/web/authoring/authoring.jsp
4:55 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.6' into LDEV-5083

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/web/authoring/svgGenerator.jsp

Options
    • -1
    • +2
    /3rdParty_sources/versions.txt
    • -0
    • +1
    /lams_build/3rdParty.userlibraries
    • -1
    • +0
    /lams_build/build.xml
    • -3
    • +2
    /lams_build/liblist.txt
    • -0
    • +1
    /lams_central/web/WEB-INF/web.xml
    • -1
    • +4
    /lams_central/web/authoring/svgGenerator.jsp
    • -10
    • +8
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -2
    • +9
    /lams_monitoring/web/includes/javascript/monitorLesson.js
    • -5
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Monday 09 May 2022
12:22 pm

Ernie Ghiglione

LDEV-4769 Updating English, Chinese Simplified

Options
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -10
    • +14
    /lams_central/conf/language/lams/ApplicationResources_zh_CN.properties
    • -0
    • +24
    /lams_tool_doku/conf/language/lams/ApplicationResources_zh_CN.properties
    • -1
    • +1
    /lams_tool_forum/conf/language/lams/ApplicationResources_zh_CN.properties
    • -1
    • +1
    /lams_tool_notebook/conf/language/lams/ApplicationResources_zh_CN.properties
    • -3
    • +3
    /lams_tool_scribe/conf/language/lams/ApplicationResources_zh_CN.properties
    • -1
    • +1
    /lams_tool_survey/conf/language/lams/ApplicationResources_zh_CN.properties
    • -1
    • +1
    /lams_tool_wiki/conf/language/lams/ApplicationResources_zh_CN.properties
Friday 06 May 2022
8:35 pm

Marcin Cieslak

Merge branch 'LDEV-5314' into v4.6

Options
8:35 pm

Marcin Cieslak

LDEV-5314 Skip exclamation mark if some learners are grouped

Ticket LDEV-3225 introduced a rule that all learners need to be grouped

for a grouping activity to be considered complete. We need to relax this

approach as it produces unnecessary confusion. Now if there are at least

2 groups with learners in them the grouping is considered complete.

Options
    • -28
    • +11
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/ContributeDTOFactory.java
    • -2
    • +9
    /lams_monitoring/web/includes/javascript/monitorLesson.js
8:05 pm

Marcin Cieslak

Merge branch 'LDEV-5298' into LDEV-5314

Options
    • -0
    • +1
    /lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
8:05 pm

Marcin Cieslak

LDEV-5298 Make label for Upload Complete more clear

Options
    • -1
    • +1
    /lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties
7:49 pm

Marcin Cieslak

Merge branch 'LDEV-5311' into v4.6

Options
7:48 pm

Marcin Cieslak

Merge branch 'LDEV-5307' into v4.6

Options
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -0
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
    • -7
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
    • -0
    • +1
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
7:48 pm

Marcin Cieslak

Merge branch 'LDEV-5306' into v4.6

Options
Thursday 05 May 2022
1:31 pm

Marcin Cieslak

LDEV-5311 Add server URL to change password email

Options
    • -1
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -6
    • +12
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
1:30 pm

Marcin Cieslak

LDEV-5311 When sending emails always run user import in separate thread

Options
    • -1
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelSaveController.java
11:20 am

Ernie Ghiglione

LDEV-4769 Updating Chinese Traditional

Options
    • -14
    • +14
    /lams_tool_imscc/conf/language/lams/ApplicationResources_zh_CN.properties
    • -7
    • +7
    /lams_tool_preview/conf/language/lams/ApplicationResources_zh_CN.properties
    • -16
    • +27
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_zh_CN.properties
10:56 am

Ernie Ghiglione

LDEV-4769 Updating Chinese Traditional

Options
    • -2
    • +2
    /lams_tool_chat/conf/language/lams/ApplicationResources_zh_CN.properties
    • -1
    • +1
    /lams_tool_daco/conf/language/lams/ApplicationResources_zh_CN.properties
    • -3
    • +3
    /lams_tool_laqa/conf/language/lams/ApplicationResources_zh_CN.properties
Wednesday 04 May 2022
10:46 pm

Marcin Cieslak

LDEV-5311 Send emails with password change link on user import

Options
    • -0
    • +8
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -6
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/IImportService.java
    • -10
    • +98
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
    • -4
    • +6
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelSaveController.java
    • -0
    • +9
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ImportExcelForm.java
    • -0
    • +6
    /lams_admin/web/import/importexcel.jsp
    • -27
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java
    • -1
    • +26
    /lams_common/src/java/org/lamsfoundation/lams/integration/security/RandomPasswordGenerator.java
    • -10
    • +8
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -0
    • +643
    /lams_www/web/userImportPasswordChangeEmailTemplate.html
8:48 pm

Marcin Cieslak

LDEV-5311 Generate passwords for imported users with no passwd provided

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/IImportService.java
    • -23
    • +36
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
    • -8
    • +10
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportUserResultController.java
    • -0
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/integration/security/RandomPasswordGenerator.java
Tuesday 03 May 2022
7:34 pm

Marcin Cieslak

LDEV-5277 Add LTI Advantage own user ID

In some cases, for consistency we need the same user ID as Moodle uses

and which was sent to LAMS for old integrations. But LTI Advantage

integration uses another user ID. We need to keep both to keep existing

LAMS data and to talk to platform.

Options
    • -0
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20220503.sql
    • -0
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/integration/ExtUserUseridMap.java
    • -29
    • +30
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
Monday 02 May 2022
9:56 pm

Marcin Cieslak

LDEV-5083 Allow displaying both old and new monitoring UIs

Options
    • -0
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java
    • -3
    • +28
    /lams_central/web/includes/javascript/openUrls.js