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 12 Apr 2023
2:08 am

Marcin Cieslak

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

Options
    • -25
    • +23
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -6
    • +6
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
2:01 am

Marcin Cieslak

Merge branch 'LDEV-5385' into v4.6

Options
Tuesday 11 Apr 2023
1:22 pm

Marcin Cieslak

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

Options
    • -1
    • +1
    /lams_admin/web/userorgrole.jsp
1:10 pm

Marcin Cieslak

LDEV-5383 Fix "select role for all users" button

Options
    • -1
    • +1
    /lams_admin/web/userorgrole.jsp
4:22 am

Marcin Cieslak

LDEV-5385 Allow real numbers in Scratchie marks

Options
    • -3
    • +3
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieSessionDAO.java
    • -3
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java
    • -0
    • +14
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20230410.sql
    • -3
    • +3
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
    • -18
    • +18
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/LeaderResultsDTO.java
    • -4
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/ScratchieItemDTO.java
    • -3
    • +3
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -5
    • +3
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.java
    • -6
    • +3
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -4
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieOutputFactory.java
    • -28
    • +26
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -6
    • +6
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -3
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -4
    • +4
    /lams_tool_scratchie/web/pages/monitoring/summary.jsp
3:00 am

Marcin Cieslak

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

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java

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

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -0
    • +18
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java
    • -2
    • +19
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java
    • -1
    • +5
    /lams_admin/web/userorgrole.jsp
    • -0
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -2
    • +39
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -0
    • +11
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadController.java
2:54 am

Marcin Cieslak

Merge branch 'LDEV-5383' into v4.6

Options
2:54 am

Marcin Cieslak

LDEV-5383 Allow adding user to all lessons in a course

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -1
    • +19
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java
    • -2
    • +19
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java
    • -1
    • +9
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/UserOrgRoleForm.java
    • -1
    • +10
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/UserRolesForm.java
    • -1
    • +5
    /lams_admin/web/userorgrole.jsp
    • -1
    • +7
    /lams_admin/web/userrole.jsp
    • -0
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -1
    • +37
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
Monday 10 Apr 2023
1:49 pm

Marcin Cieslak

LDEV-4501 Prevent exceptions on missing user references from LogEvents

This time in entity there is no reference to User objects. It reflects

DB structure without foreign key: there is just integer ID.

Options
    • -19
    • +18
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LogEventController.java
    • -29
    • +21
    /lams_common/src/java/org/lamsfoundation/lams/logevent/LogEvent.java
    • -6
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/logevent/service/LogEventService.java
Friday 07 Apr 2023
7:55 pm

Marcin Cieslak

LDEV-5350 Do not remove groups used for branching on spreadsheet upload

Options
    • -1
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -0
    • +11
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
Thursday 06 Apr 2023
9:16 pm

Ernie Ghiglione

LDEV-5384 Make selected cells' larger

Options
    • -1
    • +2
    /lams_tool_preview/web/pages/learning/rubrics.jsp
    • -0
    • +1
    /lams_tool_preview/web/pages/learning/rubricsPivot.jsp
9:04 pm

Marcin Cieslak

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

Options
    • -1
    • +2
    /lams_tool_doku/conf/language/lams/ApplicationResources.properties
9:03 pm

Marcin Cieslak

LDEV-4501 Prevent exceptions on missing user references from LogEvents

Options
    • -0
    • +2
    /lams_admin/.classpath
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -8
    • +27
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LogEventController.java
8:39 pm

Marcin Cieslak

Merge branch 'LDEV-5384' into v4.6

Options
8:36 pm

Marcin Cieslak

LDEV-5384 Make selected cells' text bold

Options
    • -0
    • +4
    /lams_tool_preview/web/pages/learning/rubrics.jsp
    • -0
    • +4
    /lams_tool_preview/web/pages/learning/rubricsPivot.jsp
8:34 pm

Marcin Cieslak

LDEV-5384 Move Expand All button to right

Options
    • -1
    • +4
    /lams_tool_preview/web/pages/learning/rubrics.jsp
    • -1
    • +4
    /lams_tool_preview/web/pages/learning/rubricsPivot.jsp
8:28 pm

Marcin Cieslak

LDEV-5384 Add warning on leaving rubrics if not everyone was rated

Options
    • -1
    • +1
    /lams_tool_preview/conf/language/lams/ApplicationResources.properties
    • -0
    • +7
    /lams_tool_preview/web/pages/learning/rubrics.jsp
    • -0
    • +7
    /lams_tool_preview/web/pages/learning/rubricsPivot.jsp
7:46 pm

Marcin Cieslak

Merge branch 'LDEV-5378' into v4.6

Options
Wednesday 05 Apr 2023
1:30 am

Marcin Cieslak

SP-4 Improvements on login case sensitivity

Options
    • -21
    • +25
    /lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
Tuesday 04 Apr 2023
7:11 pm

Marcin Cieslak

SP-4 Further improve load balance among threads

Options
    • -26
    • +26
    /lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
6:05 pm

Marcin Cieslak

# WARNING: head commit changed in the meantime

Merge branch 'LDEV-5381' into v4.7

Options
    • -15
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java
    • -0
    • +2
    /lams_central/conf/language/lams/ApplicationResources.properties
5:52 pm

Marcin Cieslak

Merge branch 'LDEV-5382' into v4.6

Options
5:51 pm

Marcin Cieslak

LDEV-5382 Add "shuffle questions" in advanced RAT section of TBL wizard

Options
    • -0
    • +2
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -2
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -3
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringFullService.java
    • -3
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -0
    • +8
    /lams_central/web/authoring/template/tbl/tbl.jsp
1:50 pm

Marcin Cieslak

LDEV-5277 Allow duplicate prefixes for LTI consumers

Options
    • -15
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java
3:28 am

Marcin Cieslak

SP-4 Make sure that TreeSet does not consider non-equals courses equal

Options
    • -2
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
Monday 03 Apr 2023
7:05 pm

Marcin Cieslak

LAI-1 Use Bootstrap to syle question choice page

Options
    • -36
    • +48
    /lams_central/web/questions/questionChoice.jsp
6:49 pm

Ernie Ghiglione

LDEV-5380 changing labels

Options
    • -1
    • +1
    /lams_build/conf/etherpad/etherpad-lite/node_modules/ep_mathjax/templates/editbarButtons.ejs
    • -1
    • +1
    /lams_build/conf/etherpad/etherpad-lite/node_modules/ep_mathjax/templates/modals.ejs
6:38 pm

Marcin Cieslak

LAI-1 Make OpenAI-generated MCQ questions editable

Options
    • -0
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java
    • -41
    • +37
    /lams_central/web/questions/questionChoice.jsp
4:14 pm

Marcin Cieslak

Merge branch 'v4.6' into LDEV-5375

Options
4:06 pm

Marcin Cieslak

LDEV-5380 Improve Etherpad MathJax plugin

Following recommendations at

https://lamsdocs.atlassian.net/wiki/spaces/lamsmelcoe/pages/413138945/Mathjax+LaTeX+plugin

Options
    • -0
    • +127
    /lams_build/conf/etherpad/etherpad-lite/node_modules/ep_mathjax/static/js/hooks.js
    • -0
    • +39
    /lams_build/conf/etherpad/etherpad-lite/node_modules/ep_mathjax/static/js/main.js
    • -0
    • +7
    /lams_build/conf/etherpad/etherpad-lite/node_modules/ep_mathjax/templates/editbarButtons.ejs
    • -0
    • +106
    /lams_build/conf/etherpad/etherpad-lite/node_modules/ep_mathjax/templates/modals.ejs