lams-github / lams_tool_lamc / src / java

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 21
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 28 Aug 2018
2:39 pm

Andrey Balan

LDEV-4407 Other projects stop depending on lams_contentrepository

Options
    • -4
    • +7
    ./lamsfoundation/lams/tool/mc/mcApplicationContext.xml
    • -68
    • +0
    ./lamsfoundation/lams/tool/mc/util/McToolContentHandler.java
  3. … 74 more files in changeset.
Saturday 25 Aug 2018
1:26 pm

Andrey Balan

LDEV-4407 Other projects stop depending on lams_central

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/mc/web/action/ClearSessionAction.java
    • -2
    • +2
    ./lamsfoundation/lams/tool/mc/web/action/McAction.java
  3. … 108 more files in changeset.
Saturday 18 Aug 2018
7:44 pm

Andrey Balan

Merge branch 'master' into LDEV-4407

Conflicts:

lams_build/lib/lams/lams-gradebook.jar

lams_build/lib/lams/lams-learning.jar

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java

lams_central/web/css/pedagogicalPlanner.css

lams_central/web/includes/javascript/openUrls.js

lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java

lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserLessonArchive.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml

lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java

lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java

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

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

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

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/SubmitFilesPedagogicalPlannerAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/mc/mcApplicationContext.xml
    • -65
    • +74
    ./lamsfoundation/lams/tool/mc/service/McService.java
    • -4
    • +7
    ./lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -2
    • +16
    ./lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java
  5. … 100 more files in changeset.
Monday 13 Aug 2018
8:54 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4638 Option to turn on confidence levels for iRA tRA

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/mc/service/McService.java
  2. … 8 more files in changeset.
Friday 10 Aug 2018
11:20 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Finished migration of Multiple Choice

Options
    • -10
    • +54
    ./lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -1
    • +0
    ./lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
  3. … 9 more files in changeset.
Thursday 09 Aug 2018
6:36 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 New paths at learning

Options
    • -3
    • +3
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20180724.sql
    • -4
    • +4
    ./lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
  3. … 4 more files in changeset.
12:09 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Changed way of setting content type

Options
    • -5
    • +4
    ./lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -8
    • +9
    ./lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
Wednesday 08 Aug 2018
6:22 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 migration of multiple choice - learning, in progress

Options
    • -6
    • +9
    ./lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
  2. … 1 more file in changeset.
2:24 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 changes at learning

Options
    • -2
    • +7
    ./lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
  2. … 1 more file in changeset.
2:10 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 lamc update

Options
    • -57
    • +6
    ./lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
  2. … 6 more files in changeset.
11:51 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Remove struts leftovers

Options
    • -3
    • +0
    ./lamsfoundation/lams/tool/mc/McAppConstants.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/mc/service/McApplicationException.java
    • -11
    • +0
    ./lamsfoundation/lams/tool/mc/web/form/McAuthoringForm.java
  4. … 1 more file in changeset.
Thursday 02 Aug 2018
6:04 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Migration of Multiple Choice in progress

Options
    • -1
    • +2
    ./lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -4
    • +1
    ./lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
    • -2
    • +0
    ./lamsfoundation/lams/tool/mc/web/form/McLearningForm.java
  4. … 19 more files in changeset.
Friday 27 Jul 2018
2:55 pm

Marcin Cieslak

Merge Asia's Image Gallery

Options
    • -2
    • +2
    ./lamsfoundation/lams/tool/mc/web/form/McLearningForm.java
    • -21
    • +28
    ./lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java
  3. … 75 more files in changeset.
Wednesday 25 Jul 2018
6:19 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 fixed McController

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/mc/web/controller/McController.java
9:07 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Started migration of Multiple Choices

Options
    • -0
    • +23
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20180724.sql
    • -44
    • +0
    ./lamsfoundation/lams/tool/mc/web/action/ClearSessionAction.java
    • -766
    • +0
    ./lamsfoundation/lams/tool/mc/web/action/McAction.java
    • -775
    • +0
    ./lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -262
    • +0
    ./lamsfoundation/lams/tool/mc/web/action/McLearningStarterAction.java
    • -454
    • +0
    ./lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
    • -178
    • +0
    ./lamsfoundation/lams/tool/mc/web/action/McMonitoringStarterAction.java
    • -181
    • +0
    ./lamsfoundation/lams/tool/mc/web/action/McPedagogicalPlannerAction.java
    • -123
    • +0
    ./lamsfoundation/lams/tool/mc/web/action/McStarterAction.java
    • -128
    • +0
    ./lamsfoundation/lams/tool/mc/web/action/TblMonitoringAction.java
    • -0
    • +65
    ./lamsfoundation/lams/tool/mc/web/controller/ClearSessionController.java
    • -0
    • +826
    ./lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -0
    • +851
    ./lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -0
    • +555
    ./lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
    • -0
    • +183
    ./lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java
  16. … 38 more files in changeset.
Saturday 21 Jul 2018
5:18 pm

Andrey Balan

LDEV-4493 Fix MCQ ped planner

Options
    • -2
    • +16
    ./lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java
  2. … 1 more file in changeset.
Thursday 19 Jul 2018
9:17 am

Marcin Cieslak

Merge to lams31 after a vital commit to master

Options
    • -16
    • +6
    ./lamsfoundation/lams/tool/mc/service/McService.java
  2. … 4 more files in changeset.
Wednesday 18 Jul 2018
6:52 pm

Andrey Balan

LDEV-4634 Update response in case answer hasn't been changed

Otherwise we end up loosing new values for confidence level and attempt

time.

Options
    • -16
    • +6
    ./lamsfoundation/lams/tool/mc/service/McService.java
Sunday 24 Jun 2018
2:41 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/web/RatingServlet.java

lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java

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

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java

lams_tool_mindmap/.classpath

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

Options
    • -4
    • +4
    ./lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -2
    • +1
    ./lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  3. … 22 more files in changeset.
Friday 22 Jun 2018
6:42 pm

Marcin Cieslak

LDEV-4607 Remove marks on output change to "none" in monitoring

Options
    • -32
    • +31
    ./lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  2. … 11 more files in changeset.
Tuesday 05 Jun 2018
5:07 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4596 Prefix letters shown on results and in monitoring

Options
    • -0
    • +4
    ./lamsfoundation/lams/tool/mc/pojos/McOptsContent.java
    • -4
    • +4
    ./lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
  3. … 2 more files in changeset.
Friday 18 May 2018
12:43 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java

lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.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

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java

Options
    • -0
    • +1
    ./lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +1
    ./lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -1
    • +22
    ./lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  4. … 20 more files in changeset.
Monday 14 May 2018
2:44 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4577 Can now just show feedback without showing answers.

Options
    • -0
    • +14
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20180511.sql
    • -3
    • +13
    ./lamsfoundation/lams/tool/mc/dto/McGeneralLearnerFlowDTO.java
    • -0
    • +9
    ./lamsfoundation/lams/tool/mc/dto/McGeneralMonitoringDTO.java
    • -3
    • +14
    ./lamsfoundation/lams/tool/mc/pojos/McContent.java
    • -0
    • +1
    ./lamsfoundation/lams/tool/mc/service/McService.java
    • -7
    • +12
    ./lamsfoundation/lams/tool/mc/util/AuthoringUtil.java
    • -0
    • +1
    ./lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -0
    • +1
    ./lamsfoundation/lams/tool/mc/web/action/McLearningStarterAction.java
    • -1
    • +22
    ./lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
    • -1
    • +2
    ./lamsfoundation/lams/tool/mc/web/action/McMonitoringStarterAction.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/mc/web/action/McStarterAction.java
    • -5
    • +5
    ./lamsfoundation/lams/tool/mc/web/form/McAuthoringForm.java
  13. … 7 more files in changeset.
Thursday 03 May 2018
1:26 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4558 Rename dbupdate files as name is a month out.

Options
    • -0
    • +18
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20180425.sql
    • -18
    • +0
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20180525.sql
  3. … 38 more files in changeset.
Monday 30 Apr 2018
6:40 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4558 Expand DB Fields to support pictures pasted in CKEditor

Options
    • -0
    • +18
    ./lamsfoundation/lams/tool/mc/dbupdates/patch20180525.sql
  2. … 28 more files in changeset.
Friday 23 Mar 2018
7:12 pm

Marcin Cieslak

Monthly merge from master to lams31

Multiple conflicts regarding audit service and JSON.

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java

lams_build/conf/domain.xml

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java

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

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

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/MonitoringAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java

Options
    • -21
    • +30
    ./lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +2
    ./lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -1
    • +2
    ./lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
    • -0
    • +128
    ./lamsfoundation/lams/tool/mc/web/action/TblMonitoringAction.java
  5. … 80 more files in changeset.
Thursday 08 Mar 2018
4:02 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4525 Fixed Reflection issues

Options
    • -0
    • +2
    ./lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
  2. … 4 more files in changeset.
Monday 05 Mar 2018
1:39 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4522 Emojis not displaying correctly in monitoring

Also fixed some general escaping issues found while testing.

Options
    • -1
    • +2
    ./lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  2. … 34 more files in changeset.
11:40 am

Marcin Cieslak

LDEV-4523 Tools remove mark rather than clear it on user content delete

Options
    • -31
    • +42
    ./lamsfoundation/lams/tool/mc/service/McService.java
  2. … 4 more files in changeset.
Sunday 04 Mar 2018
2:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Merge work replacing audit logs with LogEvent entries

Resolved conflicts for lams.jar and the Admin language file.

Options
    • -11
    • +15
    ./lamsfoundation/lams/tool/mc/service/McService.java
  2. … 13 more files in changeset.