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
Friday 12 Apr 2019
4:59 pm

Marcin Cieslak

LDEV-4731 Fix entity save order when disabling user.

Removed UserOrganisations would be re-saved when User or Organisation

gets saved.

Options
    • -4
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
4:38 pm

Marcin Cieslak

LDEV-4801 Do throw an exception in FileDAO when file is not found.

An attempt to fix leaked connections.

Options
    • -1
    • +5
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java
    • -8
    • +6
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/file/FileDAO.java
    • -0
    • +3
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java
    • -0
    • +3
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleRepository.java
    • -1
    • +4
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
Monday 08 Apr 2019
1:23 am

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into develop

Options
    • -2
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java
    • -40
    • +22
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java
    • -57
    • +27
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleVersionedNode.java
Sunday 07 Apr 2019
4:32 pm

Marcin Cieslak

LDEV-4802 Use redirect instead of forward to Learner interface

Using a cross-module forward for some reason prevents modules from

shutting down in the end.

Options
    • -4
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java
3:21 pm

Marcin Cieslak

LDEV-4802 Make all DAO calls in content repository go through service

Some classes in content repository were using DAO methods directly,

without enveloping them in a transaction. Now they all go through

RepositoryService.

These methods need to start with "dao" prefix so they are not picked up

by CheckCredentialTicketBeforeAdvice.

Options
    • -3
    • +2
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CheckCredentialTicketBeforeAdvice.java
    • -7
    • +7
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml
    • -3
    • +0
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/INodeDAO.java
    • -6
    • +0
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/NodeDAO.java
    • -24
    • +10
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/INodeFactory.java
    • -0
    • +41
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/IRepositoryService.java
    • -40
    • +22
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java
    • -43
    • +74
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleRepository.java
    • -83
    • +53
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleVersionedNode.java
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
Saturday 06 Apr 2019
1:19 pm

Marcin Cieslak

LDEV-4802 Allow TX writing when getting a file item from repository

Attempt to fix

java.lang.Exception: Connection across boundary

when downloading a file. It leaks a connection.

Options
    • -4
    • +3
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml
3:33 am

Andrey Balan

Merge branch 'master' into develop

Options
    • -6
    • +6
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
    • -12
    • +30
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayOptionsActivityController.java
3:29 am

Andrey Balan

Merge branch 'LDEV-4803'

Options
3:19 am

Andrey Balan

LDEV-4803 Remove branching warning when there's no need to warn

* Fix problem with HibernateProxy

* Change warning messages and their presentation

* Further enhancements to choose branching page markup

Options
    • -6
    • +6
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
    • -10
    • +28
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayOptionsActivityController.java
    • -8
    • +14
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/OptionsActivityForm.java
    • -138
    • +125
    /lams_learning/web/optionsActivity.jsp
Friday 05 Apr 2019
5:13 pm

Ernie Ghiglione

LDEV-4769 Updating labels

English and Español

Options
    • -3
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +4
    /lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
5:09 pm

Ernie Ghiglione

LDEV-4769 Updating labels

English and Español

Options
    • -3
    • +9
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -3
    • +9
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +10
    /lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
4:56 pm

Andrey Balan

Merge branch 'master' into develop

Options
    • -4
    • +0
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -3
    • +20
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayOptionsActivityController.java
    • -6
    • +13
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/SequenceActivityController.java
4:27 pm

Andrey Balan

Merge branch 'LDEV-4800'

Options
3:36 pm

Marcin Cieslak

LDEV-4802 Stop websocket threads even more gracefully

An exception can occur also when session gets open, not only when it

gets closed.

Options
    • -10
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/util/hibernate/HibernateSessionManager.java
    • -8
    • +11
    /lams_learning/src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
    • -5
    • +8
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/LearningWebsocketServer.java
    • -5
    • +6
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningWebsocketServer.java
    • -3
    • +6
    /lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningWebsocketServer.java
    • -3
    • +6
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningWebsocketServer.java
    • -9
    • +11
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
    • -5
    • +8
    /lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/controller/LearningWebsocketServer.java
6:32 am

Andrey Balan

LDEV-4800 Enhance markup

Options
    • -4
    • +6
    /lams_learning/web/optionsActivity.jsp
6:32 am

Andrey Balan

LDEV-4800 Enhance markup

Options
    • -4
    • +6
    /lams_learning/web/optionsActivity.jsp
5:43 am

Andrey Balan

LDEV-4800 Proceed to the first incompleted activity in a branch, and not to simply the first one

Also display list of child activities for the completed branch, so user

can revisit completed activities.

Options
    • -4
    • +0
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -4
    • +21
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayOptionsActivityController.java
    • -7
    • +14
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/SequenceActivityController.java
    • -59
    • +60
    /lams_learning/web/optionsActivity.jsp
Thursday 04 Apr 2019
10:49 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into develop

Options
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java
10:48 pm

Marcin Cieslak

Merge branch 'LDEV-4802'

Options
10:46 pm

Marcin Cieslak

LDEV-4440 Do not put Quartz jobs via DB script

The jobs will be initialised via commonContext.xml

Options
    • -24
    • +0
    /lams_common/db/sql/create_quartz_table.sql
10:45 pm

Marcin Cieslak

LDEV-4802 Prevent Hibernate session close from throwing an exception

Options
    • -14
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/util/hibernate/HibernateSessionManager.java
10:42 pm

Marcin Cieslak

LDEV-4801 Close connection manually after configuration refresh

Options
    • -1
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/ConfigurationDAO.java
    • -1
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationRefreshCacheJob.java
Wednesday 03 Apr 2019
8:04 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into develop

Options
    • -10
    • +14
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
6:38 pm

Marcin Cieslak

LDEV-4691 Change table alias

"grouping" is a reserved word since MySQL 8.0.2

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java
6:38 am

Andrey Balan

LDEV-4765 Further work on this feature

* shrinking and expanding question options on selecting them

* improved placeholder for CKEditor

* arranged questions' Settings tab items

Options
    • -0
    • +1
    /lams_central/web/ckeditor/plugins/confighelper/plugin.js
    • -2
    • +18
    /lams_central/web/includes/javascript/ckconfig_custom.js
    • -1
    • +13
    /lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag
    • -11
    • +41
    /lams_tool_assessment/web/includes/css/addQuestion.scss
    • -5
    • +0
    /lams_tool_assessment/web/includes/css/assessment.scss
    • -6
    • +5
    /lams_tool_assessment/web/includes/javascript/authoring-options.js
    • -14
    • +23
    /lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
    • -5
    • +8
    /lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp
    • -12
    • +20
    /lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp
    • -45
    • +50
    /lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
    • -12
    • +20
    /lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp
    • -12
    • +20
    /lams_tool_assessment/web/pages/authoring/parts/addordering.jsp
    • -20
    • +31
    /lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp
    • -12
    • +20
    /lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp
    • -3
    • +3
    /lams_tool_assessment/web/pages/authoring/parts/numericaloption.jsp
  16. … 4 more files in changeset.
Monday 01 Apr 2019
11:55 pm

Marcin Cieslak

LKC-179 Descent into branching when displaying activities in gradebook

Options
    • -1
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
11:53 pm

Marcin Cieslak

LKC-179 Change activity soring in gradebook to reflect sequence in LD

Options
    • -0
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java
    • -10
    • +14
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
    • -1
    • +7
    /lams_gradebook/web/gradebookMonitor.jsp
Saturday 30 Mar 2019
2:10 am

Andrey Balan

Merge branch 'master' into develop

Options
2:10 am

Andrey Balan

LDEV-4793 Show horizontal scrollbar on iPads

Options
    • -0
    • +6
    /lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp
Friday 29 Mar 2019
5:15 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into develop

Options