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 04 Nov 2017
8:10 pm

Marcin Cieslak

LDEV-4453 Add gradebook on lesson complete front end

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -62
    • +107
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -2
    • +5
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java
    • -9
    • +48
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
    • -0
    • +7
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -6
    • +6
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LessonCompleteActivityAction.java
    • -0
    • +82
    /lams_learning/web/lessonComplete.jsp
6:25 am

Andrey Balan

Merge branch 'LDEV-4455'

Options
6:24 am

Andrey Balan

LDEV-4455 Move burning question to the learning.jsp

We need a change in the flow for Burning questions in learner, so the

burning question text for each question is entered as the students

answer select the answers.

So each question would have a "burning question?" label that would

expand/collapse on request for students to enter the text as they answer

each question.

Options
    • -3
    • +3
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -10
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -133
    • +45
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
    • -11
    • +2
    /lams_tool_scratchie/web/WEB-INF/struts-config.xml
    • -2
    • +1
    /lams_tool_scratchie/web/includes/css/scratchie-learning.scss
    • -31
    • +74
    /lams_tool_scratchie/web/pages/learning/learning.jsp
    • -4
    • +0
    /lams_tool_scratchie/web/pages/learning/notebook.jsp
    • -9
    • +33
    /lams_tool_scratchie/web/pages/learning/questionlist.jsp
    • -6
    • +6
    /lams_tool_scratchie/web/pages/learning/results.jsp
    • -6
    • +4
    /lams_tool_scratchie/web/pages/learning/submissionDeadline.jsp
Friday 03 Nov 2017
9:41 pm

Marcin Cieslak

LDEV-4411 Make collections and properties lazy

If it is possible, all collections and properties should be lazy. It has

big impact on DB load.

If a collection can not be made lazy because it gets iterated over in a

non-transactional method (Actions), is should probably be moved to a

transactional Service method.

Options
    • -1
    • +0
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/events/Event.hbm.xml
    • -7
    • +8
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml
    • -1
    • +0
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolContent.hbm.xml
    • -2
    • +0
    /lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml
    • -1
    • +0
    /lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml
    • -22
    • +0
    /lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.hbm.xml
    • -31
    • +0
    /lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.java
9:03 pm

Marcin Cieslak

LDEV-4411 Remove obsolete collection from Tool class

Options
    • -14
    • +0
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml
    • -27
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java
    • -17
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java
8:06 pm

Marcin Cieslak

LDEV-4411 Add maps 2nd level cache

Options
    • -0
    • +8
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml
    • -0
    • +8
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgressArchive.hbm.xml
5:32 am

Andrey Balan

Merge branch 'LDEV-4451'

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -0
    • +3
    /lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +16
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -0
    • +22
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -11
    • +8
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -77
    • +65
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
5:30 am

Andrey Balan

LDEV-4451 Ability to save confidence levels in MCQ

And also return them to Scratchie on request.

Options
    • -1
    • +8
    /lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McContent.hbm.xml
    • -0
    • +9
    /lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McQueContent.hbm.xml
    • -0
    • +8
    /lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McUsrAttempt.hbm.xml
    • -0
    • +3
    /lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
    • -9
    • +0
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java
    • -0
    • +2
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
    • -0
    • +16
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -5
    • +0
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java
    • -0
    • +30
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
    • -0
    • +22
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -0
    • +23
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20171031.sql
    • -0
    • +10
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/AnswerDTO.java
    • -7
    • +23
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java
    • -3
    • +19
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McQueContent.java
    • -1
    • +12
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McUsrAttempt.java
  16. … 17 more files in changeset.
5:29 am

Andrey Balan

LDEV-4451 Improve question comparison tactics

As long as MCQ doesn't have question titles, exclude title when

calculating question hash.

Another peculiarity of MCQ is that it stores questions and answers with

trailing '/r/n' instead of usual '/n' (as in Assessment and Scratchie),

so remove all '/r' and '/n' before comparing questions and answers.

Options
    • -10
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/confidencelevel/ConfidenceLevelDTO.java
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171016.sql
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -22
    • +11
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -13
    • +7
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
5:24 am

Andrey Balan

LDEV-4451 Make slider neater (narrower and with lesser text size)

Options
    • -1
    • +10
    /lams_central/web/css/bootstrap-slider.css
    • -9
    • +0
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -9
    • +0
    /lams_tool_assessment/web/pages/learning/results.jsp
Thursday 02 Nov 2017
11:08 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-3164: removing MaxPermSize

Removing MaxPermSize as it's deprecated in Java 8. Increasing the memory allocation

Options
    • -2
    • +1
    /TestHarness4LAMS2/build.xml
10:41 pm

Marcin Cieslak

LDEV-4411 Add collections 2nd level cache

Options
    • -24
    • +8
    /lams_build/conf/slim/standalone.xml
    • -0
    • +4
    /lams_build/conf/standalone.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/events/Event.hbm.xml
    • -0
    • +4
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml
    • -0
    • +16
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -0
    • +6
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml
    • -0
    • +4
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml
    • -2
    • +14
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningLibrary.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningLibraryGroup.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Transition.hbm.xml
    • -0
    • +8
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.hbm.xml
    • -0
    • +4
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolContent.hbm.xml
  16. … 83 more files in changeset.
4:28 pm

Marcin Cieslak

LDEV-4411 Remove collections caching in the few classes it is present

If we decide to use collections caching after all, we will do it

everywhere, not just in Content Repository.

Options
    • -4
    • +0
    /lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNode.hbm.xml
    • -4
    • +0
    /lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersion.hbm.xml
9:11 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4451: modifying labels

Options
    • -2
    • +2
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
8:18 am

Andrey Balan

Merge branch 'LDEV-4451'

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +17
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -0
    • +6
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +4
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
8:14 am

Andrey Balan

LDEV-4451 Implement ToolSessionManager.getConfidenceLevels() in all tools

This method allows Scratchie to query available confidence levels from

the tools that can provide it. Actually, only Assessment and MCQ will

implement it for real, all other tools will implements it as "return

null;".

Options
    • -0
    • +6
    /lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java
    • -0
    • +6
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java
    • -0
    • +6
    /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java
    • -0
    • +6
    /lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java
    • -0
    • +6
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -0
    • +6
    /lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java
    • -0
    • +6
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
    • -0
    • +6
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java
    • -0
    • +6
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
    • -0
    • +6
    /lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java
    • -0
    • +6
    /lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java
    • -0
    • +6
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +6
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java
    • -0
    • +6
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -0
    • +6
    /lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java
  16. … 14 more files in changeset.
8:01 am

Andrey Balan

LDEV-4451 Display confidence levels in Scratchie

Add ability to Scratchie to display what options the individual students

have had in the individual assessment.

Add advanced option to Scratchie - 'Show confidences' and then list

activites from the sequence to choose from (skip branching or use only

the current branch if inside of it).

Options
    • -0
    • +1050
    /lams_central/web/css/circle.css
    • -0
    • +34
    /lams_central/web/includes/javascript/jqGrid.confidenceLevelFormattter.js
    • -0
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/tool/ToolSessionManager.java
    • -0
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java
    • -0
    • +22
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java
    • -0
    • +33
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
    • -1
    • +111
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java
    • -0
    • +9
    /lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml
    • -0
    • +4
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -0
    • +14
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20171026.sql
    • -0
    • +24
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -0
    • +14
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java
    • -1
    • +0
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -0
    • +20
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
  16. … 8 more files in changeset.
7:57 am

Andrey Balan

LDEV-4451 Store ConfidenceLevels inside Assessment

ConfidenceLevels should be stored at the tools level as otherwise it's

hard to keep questions hashes updated in lams_central.

Add support for providing them to Scratchie.

Options
    • -0
    • +8
    /lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.hbm.xml
    • -3
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -0
    • +10
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
    • -2
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -0
    • +17
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -2
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -0
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171016.sql
    • -9
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
    • -91
    • +83
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -21
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -17
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -15
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -33
    • +0
    /lams_tool_assessment/web/includes/javascript/monitoring.js
    • -1
    • +1
    /lams_tool_assessment/web/pages/monitoring/monitoring.jsp
    • -6
    • +2
    /lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
    • -8
    • +4
    /lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp
    • -5
    • +1
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
7:51 am

Andrey Balan

LDEV-4451 Move ConfidenceLevels to the tools finally

ConfidenceLevels should be stored at the tools levels as otherwise it's

hard to keep questions hashes updated in lams_central.

Options
    • -80
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/ConfidenceLevelServlet.java
    • -64
    • +0
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/confidencelevel/ConfidenceLevel.hbm.xml
    • -36
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -85
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/confidencelevel/ConfidenceLevel.java
    • -0
    • +64
    /lams_common/src/java/org/lamsfoundation/lams/confidencelevel/ConfidenceLevelDTO.java
    • -51
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/confidencelevel/dao/IConfidenceLevelDAO.java
    • -109
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/confidencelevel/dao/hibernate/ConfidenceLevelDAO.java
    • -30
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/confidencelevel/dto/ConfidenceLevelDTO.java
    • -29
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/confidencelevel/dto/QuestionConfidenceLevelDTO.java
    • -145
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/confidencelevel/service/ConfidenceLevelService.java
    • -73
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/confidencelevel/service/IConfidenceLevelService.java
    • -24
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20171016.sql
    • -3
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java
Wednesday 01 Nov 2017
3:41 pm

Marcin Cieslak

LDEV-3164 Make URL regex reluctant so it matches first parenthesis

Options
    • -1
    • +1
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java
3:41 pm

Marcin Cieslak

LDEV-3164 Make URL regex reluctant so it matches first parenthesis

Options
    • -1
    • +1
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java
3:41 pm

Marcin Cieslak

LDEV-3164 Make URL regex reluctant so it matches first parenthesis

Options
    • -1
    • +1
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java
7:44 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4450: Learner icons in progress tab have portraits

Options
    • -17
    • +23
    /lams_central/web/css/_learner_base.scss
    • -7
    • +34
    /lams_central/web/includes/javascript/portrait.js
    • -1
    • +1
    /lams_gradebook/web/gradebookCourseMonitor.jsp
    • -2
    • +2
    /lams_gradebook/web/gradebookMonitor.jsp
    • -17
    • +36
    /lams_monitoring/web/includes/javascript/monitorLesson.js
Tuesday 31 Oct 2017
2:02 pm

Marcin Cieslak

LDEV-4366 Fix case of Kumalive class in Ant build file

It worked fine on case-insensitive systems, but on Linux it could not

find the Kumalive websocket class.

Options
    • -1
    • +1
    /lams_learning/build.xml
2:02 pm

Marcin Cieslak

LDEV-4366 Fix case of Kumalive class in Ant build file

It worked fine on case-insensitive systems, but on Linux it could not

find the Kumalive websocket class.

Options
    • -1
    • +1
    /lams_learning/build.xml
2:02 pm

Marcin Cieslak

LDEV-4366 Fix case of Kumalive class in Ant build file

It worked fine on case-insensitive systems, but on Linux it could not

find the Kumalive websocket class.

Options
    • -1
    • +1
    /lams_learning/build.xml
12:59 am

Marcin Cieslak

LDEV-4453 Add "gradebook on lesson complete" field to Lesson

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -8
    • +13
    /lams_central/web/addLesson.jsp
    • -0
    • +3
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml
    • -0
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20171030.sql
    • -5
    • +22
    /lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java
    • -7
    • +9
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -63
    • +74
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -11
    • +12
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
Monday 30 Oct 2017
3:50 pm

Marcin Cieslak

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

Conflicts:

lams_build/lib/lams/lams.jar

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +35
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -8
    • +97
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +24
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -1
    • +25
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
Sunday 29 Oct 2017
1:19 am

Marcin Cieslak

LDEV-4411 Mark entities as cacheable

usage="read-only" seems to do nothing at the moment, but it may be a

guidance for future optimisations.

Options
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/Comment.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/CommentLike.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/CommentSession.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/config/ConfigurationItem.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/events/Event.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/events/Subscription.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserActivity.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserActivityArchive.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserLesson.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserLessonArchive.hbm.xml
    • -30
    • +9
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtCourseClassMap.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerLessonMap.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml
  16. … 223 more files in changeset.
1:18 am

Marcin Cieslak

LDEV-4411 Enable and configure Hibernate 2nd level cache

This configuration is only for standalone mode. It is explained in JIRA

comments.

Options
    • -25
    • +5
    /lams_build/conf/standalone.xml
    • -11
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml