lams-github / lams_tool_larsrc

src

Clone Tools

Stats

Commits this week: 0
Total Committers: 23
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
8:39 pm

Andrey Balan

LDEV-4407 Other projects stop depending on lams_contentrepository

Options
    • -3
    • +6
    ./java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml
    • -3
    • +3
    ./java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -78
    • +0
    ./java/org/lamsfoundation/lams/tool/rsrc/util/ResourceToolContentHandler.java
    • -2
    • +0
    ./java/org/lamsfoundation/lams/tool/rsrc/web/servlet/CompleteItemServlet.java
  5. … 72 more files in changeset.
Saturday 25 Aug 2018
7:26 pm

Andrey Balan

LDEV-4407 Other projects stop depending on lams_central

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/rsrc/web/action/ClearSessionAction.java
  3. … 108 more files in changeset.
Sunday 19 Aug 2018
1:44 am

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
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java
    • -7
    • +45
    ./java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -1
    • +7
    ./java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
  5. … 100 more files in changeset.
Wednesday 08 Aug 2018
10:06 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Daco nostruts library

Options
    • -0
    • +1
    ./java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java
  2. … 18 more files in changeset.
Friday 27 Jul 2018
7:40 pm

korwi <korwi@korwi-Inspiron-3542>

LDEV-4440 Shared resources monitoring fixes

Options
    • -6
    • +4
    ./java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java
  2. … 3 more files in changeset.
6:40 pm

korwi <korwi@korwi-Inspiron-3542>

LDEV-4440 Shared resource authoring & Q&A

Options
    • -9
    • +7
    ./java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java
  2. … 23 more files in changeset.
2:29 pm

korwi <korwi@korwi-Inspiron-3542>

LDEV-4440 Shared resources minor fixes

Options
    • -3
    • +9
    ./java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java
    • -23
    • +6
    ./java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java
  3. … 3 more files in changeset.
Thursday 26 Jul 2018
9:27 pm

korwi <korwi@korwi-Inspiron-3542>

LDEV-4440 Shared resources nostrut final

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java
  2. … 20 more files in changeset.
Wednesday 25 Jul 2018
8:07 pm

Michal Kowalski <mickowal@hotmail.com>

LDEV-4440 Share resources nostrut + Q&A

Options
    • -79
    • +82
    ./java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java
    • -28
    • +28
    ./java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java
    • -2
    • +1
    ./java/org/lamsfoundation/lams/tool/rsrc/web/form/ReflectionForm.java
    • -13
    • +9
    ./java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java
    • -2
    • +0
    ./java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java
  6. … 7 more files in changeset.
Tuesday 24 Jul 2018
9:17 pm

Michal Kowalski <mickowal@hotmail.com>

LDEV-4440 Share resource - work in progress, almost finished authoring

Options
    • -2
    • +6
    ./java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java
  2. … 10 more files in changeset.
7:27 pm

Michal Kowalski <mickowal@hotmail.com>

LDEV-4440 Sared resources - authoring - work in progress

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java
    • -0
    • +13
    ./java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java
  3. … 32 more files in changeset.
Monday 23 Jul 2018
10:46 pm

Michal Kowalski <mickowal@hotmail.com>

LDEV-4440 Share Resources & Q&A tools.

Options
    • -6
    • +9
    ./java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java
    • -11
    • +11
    ./java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -1117
    • +0
    ./java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
    • -46
    • +0
    ./java/org/lamsfoundation/lams/tool/rsrc/web/action/ClearSessionAction.java
    • -728
    • +0
    ./java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
    • -288
    • +0
    ./java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
    • -364
    • +0
    ./java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java
    • -22
    • +26
    ./java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java
    • -0
    • +64
    ./java/org/lamsfoundation/lams/tool/rsrc/web/controller/ClearSessionController.java
    • -0
    • +704
    ./java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java
    • -0
    • +249
    ./java/org/lamsfoundation/lams/tool/rsrc/web/controller/MonitoringController.java
    • -0
    • +330
    ./java/org/lamsfoundation/lams/tool/rsrc/web/controller/ViewItemController.java
    • -1
    • +0
    ./java/org/lamsfoundation/lams/tool/rsrc/web/form/ReflectionForm.java
    • -21
    • +2
    ./java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java
    • -9
    • +7
    ./java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceItemForm.java
  16. … 58 more files in changeset.
Friday 20 Jul 2018
8:40 pm

Michal Kowalski <mickowal@hotmail.com>

LDEV-4440 FileValidatorSpringUtil

Options
    • -0
    • +1141
    ./java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java
    • -12
    • +16
    ./java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java
Thursday 03 May 2018
7:26 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -0
    • +16
    ./java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20180425.sql
    • -16
    • +0
    ./java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20180525.sql
  3. … 38 more files in changeset.
Monday 30 Apr 2018
12:40 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -0
    • +16
    ./java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20180525.sql
  2. … 28 more files in changeset.
Saturday 21 Apr 2018
6:33 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

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

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java

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

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

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

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

Options
    • -7
    • +38
    ./java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -1
    • +2
    ./java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
  3. … 19 more files in changeset.
Tuesday 10 Apr 2018
10:27 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4543 Can access resources from monitor with no sessions

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java
    • -7
    • +38
    ./java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
    • -1
    • +2
    ./java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
  5. … 5 more files in changeset.
Saturday 24 Mar 2018
2:12 am

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
    • -7
    • +18
    ./java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -3
    • +36
    ./java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
  3. … 82 more files in changeset.
Monday 05 Mar 2018
8: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
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
  2. … 34 more files in changeset.
Thursday 22 Feb 2018
9:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 All Audit Log entries are now Log Event entries

Options
    • -0
    • +5
    ./java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java
    • -7
    • +14
    ./java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -1
    • +7
    ./java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
    • -1
    • +2
    ./java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
  6. … 61 more files in changeset.
Friday 16 Feb 2018
12:02 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4503 All http resources on a https server open in a popup

Options
    • -4
    • +0
    ./java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
    • -56
    • +0
    ./java/org/lamsfoundation/lams/tool/rsrc/util/ResourceWebUtils.java
    • -11
    • +29
    ./java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java
Tuesday 06 Feb 2018
12:17 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Tool context files no longer reference audit service.

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml
  2. … 62 more files in changeset.
Friday 02 Feb 2018
5:41 am

Andrey Balan

LDEV-4407 Tools to stop using learnerService

There is no need to have a separate ILearnerService designed

for tools only. As long as they require only one method from it

completeToolSession() which we can simply move to

ILamsToolService. After which we just remove learnerService

from the tools.

Options
    • -3
    • +0
    ./java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml
    • -8
    • +1
    ./java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
  3. … 57 more files in changeset.
Friday 26 Jan 2018
9:09 pm

Andrey Balan

LDEV-4407 Tools and core to use learning classes from lams_common

Tools and core start using shared learning classes that were

recently moved from lams_learning to lams_common.

Remove any leftover dependencies on lams_learning.

Options
    • -4
    • +3
    ./java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
  2. … 78 more files in changeset.
7:24 am

Andrey Balan

LDEV-4407 Tools to use contentrepository classes from lams_common

Tools start using shared contentrepository classes that were

recently moved to lams_common from lams_contentrepository.

Remove any leftover dependencies on lams_contentrepository. Which

includes getting rid of getRepositoryLoginTicket() and some other

methods from tools services.

Options
    • -3
    • +0
    ./java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml
    • -12
    • +5
    ./java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java
    • -95
    • +2
    ./java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java
  5. … 74 more files in changeset.
Wednesday 24 Jan 2018
8:52 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4502: Google content shows in popup window

Options
    • -0
    • +14
    ./java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20180123.sql
    • -4
    • +4
    ./java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java
Thursday 18 Jan 2018
1:51 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4413 Share Resources no longer requires a title

Options
    • -16
    • +0
    ./java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
  2. … 4 more files in changeset.
Friday 05 Jan 2018
10:27 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4421 Comments allowed for authored items in Share Resources

Options
    • -0
    • +2
    ./java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
    • -0
    • +10
    ./java/org/lamsfoundation/lams/tool/rsrc/dto/ResourceItemDTO.java
    • -0
    • +9
    ./java/org/lamsfoundation/lams/tool/rsrc/dto/SessionDTO.java
    • -0
    • +10
    ./java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java
    • -1
    • +4
    ./java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -0
    • +2
    ./java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
    • -0
    • +31
    ./java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
    • -0
    • +2
    ./java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java
    • -0
    • +10
    ./java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceItemForm.java
  10. … 57 more files in changeset.
10:26 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4421 Comments allowed for authored items in Share Resources

Options
    • -0
    • +14
    ./java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20171220.sql
  2. … 3 more files in changeset.
Tuesday 19 Dec 2017
8:47 pm

Marcin Cieslak

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

Conflicts:

lams_build/conf/domain.xml

lams_build/lib/lams/lams.jar

lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.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/LearningAction.java

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

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

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_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.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/service/ResourceServiceImpl.java

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

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

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

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

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

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

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

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

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

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

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

Options
    • -0
    • +6
    ./java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
  2. … 45 more files in changeset.