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
Wednesday 01 Mar 2023
9:29 pm

Marcin Cieslak

# WARNING: head commit changed in the meantime

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

Options
    • -3
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -2
    • +8
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -1
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -3
    • +34
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -1
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -9
    • +17
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
    • -80
    • +18
    /lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp
9:24 pm

Marcin Cieslak

LDEV-4832 Allow LD location based editing of QB questions

A user is allowed to edit a question if it is used in a learning design

which is in user's private folder, public folder or a course folder

where the user is a monitor.

Options
    • -1
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -0
    • +18
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -0
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
8:14 pm

Marcin Cieslak

LDEV-5365 Use sticky headers for at least 10 teams

Options
    • -1
    • +1
    /lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp
6:56 pm

Marcin Cieslak

LDEV-4832 Allow editing of QB questions and collections by sysadmin

Options
    • -1
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -0
    • +7
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -1
    • +6
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
6:50 pm

Marcin Cieslak

LDEV-4832 Allow editing of questions in shared QB collections

Options
    • -2
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -2
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/qb/QbUtils.java
    • -1
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -3
    • +16
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -1
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -9
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
5:38 pm

Marcin Cieslak

LDEV-5365 Use different method for table header stickiness

The new metho allows horizontal scrolling.

Options
    • -71
    • +19
    /lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp
Tuesday 28 Feb 2023
6:05 pm

Marcin Cieslak

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

Options
6:04 pm

Marcin Cieslak

LDEV-5368 Add "img-responsive" class to generated image tags

Options
    • -1
    • +4
    /lams_central/web/ckeditor/README.md
    • -1
    • +3
    /lams_central/web/ckeditor/plugins/uploadimage/plugin.js
5:55 pm

Marcin Cieslak

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

Conflicts:

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

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

lams_tool_assessment/web/pages/monitoring/summary.jsp

Options
    • -3
    • +15
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -2
    • +17
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -50
    • +90
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -12
    • +35
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -14
    • +38
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -22
    • +25
    /lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp
    • -11
    • +44
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
5:31 pm

Marcin Cieslak

Merge branch 'LDEV-5368' into v4.6

Options
5:30 pm

Marcin Cieslak

LDEV-5368 Add upload image plugin to CKEditor

Options
    • -0
    • +18
    /lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java
    • -0
    • +3
    /lams_central/web/ckeditor/README.md
    • -0
    • +154
    /lams_central/web/ckeditor/plugins/uploadimage/plugin.js
    • -0
    • +34
    /lams_central/web/ckeditor/plugins/uploadwidget/dev/cors.html
    • -0
    • +55
    /lams_central/web/ckeditor/plugins/uploadwidget/dev/filereaderplugin.js
    • -0
    • +97
    /lams_central/web/ckeditor/plugins/uploadwidget/dev/upload.html
    • -0
    • +12
    /lams_central/web/ckeditor/plugins/uploadwidget/lang/az.js
    • -0
    • +12
    /lams_central/web/ckeditor/plugins/uploadwidget/lang/bg.js
    • -0
    • +12
    /lams_central/web/ckeditor/plugins/uploadwidget/lang/ca.js
    • -0
    • +12
    /lams_central/web/ckeditor/plugins/uploadwidget/lang/cs.js
    • -0
    • +12
    /lams_central/web/ckeditor/plugins/uploadwidget/lang/da.js
    • -0
    • +12
    /lams_central/web/ckeditor/plugins/uploadwidget/lang/de-ch.js
    • -0
    • +12
    /lams_central/web/ckeditor/plugins/uploadwidget/lang/de.js
    • -0
    • +12
    /lams_central/web/ckeditor/plugins/uploadwidget/lang/el.js
    • -0
    • +12
    /lams_central/web/ckeditor/plugins/uploadwidget/lang/en-au.js
  16. … 39 more files in changeset.
Monday 27 Feb 2023
11:50 pm

Marcin Cieslak

LDEV-5359 Add answered question count next to section name

Options
    • -1
    • +19
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -4
    • +13
    /lams_tool_assessment/web/pages/learning/parts/paging.jsp
6:43 pm

Marcin Cieslak

LDEV-5360 Add additional marking info to spreadsheet export

Options
    • -1
    • +15
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
6:43 pm

Marcin Cieslak

LDEV-5360 Use core User instead of AssessmentUser for markedBy column

Options
    • -0
    • +18
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20230227.sql
6:13 pm

Marcin Cieslak

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

Options
    • -2
    • +14
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -0
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -12
    • +35
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -4
    • +9
    /lams_tool_assessment/web/pages/learning/learning.jsp
5:53 pm

Marcin Cieslak

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

Conflicts:

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java

Options
    • -1
    • +2
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -0
    • +90
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -5
    • +40
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
    • -2
    • +5
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -158
    • +9
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java
    • -0
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -2
    • +9
    /lams_tool_assessment/web/pages/admin/config.jsp
    • -0
    • +3
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -25
    • +82
    /lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp
    • -12
    • +21
    /lams_tool_scratchie/web/pages/monitoring/studentChoices5.jsp
    • -182
    • +181
    /lams_tool_scratchie/web/pages/monitoring/studentChoicesTable.jsp
Friday 24 Feb 2023
11:34 pm

Marcin Cieslak

LDEV-5363 Remove duplicate method

Options
    • -86
    • +0
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java
11:18 pm

Marcin Cieslak

SP-4 Remove duplicates before introducing unique index

Options
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20230219.sql
Thursday 23 Feb 2023
2:52 pm

Marcin Cieslak

Merge branch 'LDEV-5365' into v4.6

Options
2:52 pm

Marcin Cieslak

LDEV-5365 Add sticky column header to Scratchie student choices table

Options
    • -23
    • +80
    /lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp
Monday 20 Feb 2023
6:29 pm

Marcin Cieslak

Merge branch 'LDEV-5361' into v4.6

Options
6:24 pm

Marcin Cieslak

LDEV-5361 Add "require all answers" setting to Scratchie

Options
    • -0
    • +3
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -0
    • +14
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20230220.sql
    • -4
    • +11
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -1
    • +11
    /lams_tool_scratchie/web/pages/authoring/advance.jsp
    • -6
    • +27
    /lams_tool_scratchie/web/pages/learning/learning.jsp
5:14 pm

Marcin Cieslak

SP-4 Process courses instead of subcourses in multiple threads

Options
    • -193
    • +188
    /lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
Sunday 19 Feb 2023
9:49 pm

Marcin Cieslak

SP-4 Prevent duplicates in ext user mapping table

Options
    • -0
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20230219.sql
9:47 pm

Marcin Cieslak

SP-4 Use multiple threads for mappings processing

Options
    • -227
    • +382
    /lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
Friday 17 Feb 2023
11:55 pm

Marcin Cieslak

Merge branch 'LDEV-5366' into v4.6

Options
11:54 pm

Marcin Cieslak

LDEV-5366 Make auto expand configurable in Tool settings in sysadmin

Disabled by default

Options
    • -0
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +14
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20230217.sql
    • -0
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AdminController.java
    • -0
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -0
    • +10
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AdminForm.java
    • -2
    • +9
    /lams_tool_assessment/web/pages/admin/config.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/learning.jsp
11:40 pm

Marcin Cieslak

LDEV-5366 Auto expand justification panel on first click

Options
    • -0
    • +8
    /lams_tool_assessment/web/pages/learning/learning.jsp
11:11 pm

Marcin Cieslak

LDEV-5366 Move justification panel to question panel for visibility

Options
    • -17
    • +20
    /lams_tool_assessment/web/pages/learning/parts/allquestions.jsp
3:28 pm

Marcin Cieslak

LDEV-5363 Allow monitors to export course gradebook reports

Options
    • -4
    • +2
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java