lams-github

lams_tool_mindmap

Clone Tools

Stats

Commits this week: 0
Total Committers: 20
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
    ./src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml
    • -79
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mindmap/util/MindmapToolContentHandler.java
  3. … 74 more files in changeset.
Saturday 25 Aug 2018
7:26 pm

Andrey Balan

LDEV-4407 Other projects stop depending on lams_central

Options
    • -1
    • +0
    ./.classpath
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/ClearSessionAction.java
  4. … 107 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
    • +3
    ./.classpath
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml
    • -46
    • +22
    ./src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java
    • -320
    • +193
    ./src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java
  5. … 100 more files in changeset.
Thursday 16 Aug 2018
10:49 pm

Marcin Cieslak

LDEV-4644 Add outcomes in authoring in all tools

Options
    • -1
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +155
    ./web/WEB-INF/tags/OutcomeAuthor.tag
    • -0
    • +4
    ./web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +2
    ./web/pages/authoring/advanced.jsp
  5. … 115 more files in changeset.
Thursday 09 Aug 2018
6:07 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Changed way of setting content type

Options
    • -3
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/AuthoringController.java
    • -7
    • +6
    ./src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/MonitoringController.java
  4. … 4 more files in changeset.
Friday 03 Aug 2018
7:11 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Fixed save at learning

Options
    • -0
    • +13
    ./web/pages/learning/reflect.jsp
6:44 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Fixed authoring and mapjs

Options
    • -1
    • +1
    ./web/common/mapjs.jsp
    • -19
    • +0
    ./web/layouts/defaultLayout.jsp
    • -11
    • +0
    ./web/layouts/learningLayout.jsp
    • -15
    • +0
    ./web/layouts/tabLayout.jsp
    • -29
    • +29
    ./web/pages/authoring/authoring.jsp
    • -13
    • +15
    ./web/pages/learning/defineLater.jsp
    • -17
    • +20
    ./web/pages/learning/mindmap.jsp
    • -26
    • +14
    ./web/pages/learning/reflect.jsp
    • -19
    • +21
    ./web/pages/learning/submissionDeadline.jsp
    • -2
    • +2
    ./web/pages/monitoring/editActivity.jsp
    • -13
    • +31
    ./web/pages/monitoring/mindmapDisplay.jsp
    • -17
    • +16
    ./web/pages/monitoring/monitoring.jsp
    • -11
    • +15
    ./web/pages/monitoring/reflect.jsp
    • -1
    • +1
    ./web/pages/monitoring/summary.jsp
12:02 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 no tiles anymore

Options
    • -135
    • +0
    ./web/WEB-INF/tiles-defs.xml
12:00 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Fixed saving at authoring, noStruts

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mindmap/dto/RootJSON.java
    • -197
    • +0
    ./web/WEB-INF/struts-config.xml
    • -1
    • +1
    ./web/common/mapjs.jsp
    • -1
    • +1
    ./web/pages/learning/mindmap.jsp
    • -1
    • +1
    ./web/pages/learning/reflect.jsp
    • -1
    • +1
    ./web/pages/monitoring/editActivity.jsp
    • -17
    • +10
    ./web/pages/monitoring/mindmapDisplay.jsp
    • -16
    • +18
    ./web/pages/monitoring/monitoring.jsp
    • -6
    • +11
    ./web/pages/monitoring/reflect.jsp
    • -7
    • +6
    ./web/pages/monitoring/summary.jsp
Thursday 02 Aug 2018
4:59 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Partially repaired authoring

Options
    • -2
    • +2
    ./web/includes/javascript/authoring.js
    • -2
    • +2
    ./web/includes/javascript/monitoring.js
    • -39
    • +37
    ./web/pages/authoring/authoring.jsp
2:30 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Changes at authoring

Options
    • -12
    • +7
    ./web/pages/authoring/authoring.jsp
    • -10
    • +0
    ./web/pages/authoring/basic.jsp
Wednesday 01 Aug 2018
4:48 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Started migration of mindmap - action into controllers, tiles into clear jsp

Options
    • -3
    • +2
    ./.classpath
    • -13
    • +19
    ./.externalToolBuilders/SASS Mindmap.launch
    • -1
    • +1
    ./build.xml
    • -0
    • +23
    ./src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/patch20180731.sql
    • -306
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java
    • -51
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/ClearSessionAction.java
    • -741
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java
    • -291
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningWebsocketServer.java
    • -220
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java
    • -104
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/PedagogicalPlannerAction.java
    • -0
    • +290
    ./src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/AuthoringController.java
    • -0
    • +71
    ./src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/ClearSessionController.java
    • -0
    • +680
    ./src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningController.java
    • -0
    • +291
    ./src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningWebsocketServer.java
    • -0
    • +188
    ./src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/MonitoringController.java
  16. … 47 more files in changeset.
Thursday 05 Jul 2018
9:35 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4612 Mindmap has full screen mode.

Options
    • -4
    • +19
    ./web/common/mapjs.jsp
    • -1
    • +15
    ./web/includes/css/mindmap.scss
    • -0
    • +1
    ./web/pages/authoring/authoring.jsp
    • -0
    • +1
    ./web/pages/learning/mindmap.jsp
    • -0
    • +1
    ./web/pages/monitoring/mindmapDisplay.jsp
  6. … 4 more files in changeset.
Sunday 24 Jun 2018
8: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
    • -0
    • +1
    ./.classpath
    • -0
    • +151
    ./src/java/org/lamsfoundation/lams/tool/mindmap/dto/IdeaJSON.java
    • -0
    • +55
    ./src/java/org/lamsfoundation/lams/tool/mindmap/dto/NotifyActionJSON.java
    • -0
    • +46
    ./src/java/org/lamsfoundation/lams/tool/mindmap/dto/NotifyResponseJSON.java
    • -0
    • +110
    ./src/java/org/lamsfoundation/lams/tool/mindmap/dto/RootJSON.java
    • -37
    • +12
    ./src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java
    • -76
    • +34
    ./src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java
    • -321
    • +198
    ./src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java
    • -0
    • +291
    ./src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningWebsocketServer.java
  10. … 15 more files in changeset.
Thursday 14 Jun 2018
1:35 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4588: adding removing labels

In English, Greek and Spanish

Options
    • -14
    • +16
    ./conf/language/lams/ApplicationResources.properties
    • -6
    • +15
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -8
    • +14
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -8
    • +14
    ./conf/language/lams/ApplicationResources_es_ES.properties
Monday 04 Jun 2018
12:08 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4588 Remove obselete Flash code

Options
    • -29
    • +0
    ./src/flash/AS/ActionLoader.as
    • -18
    • +0
    ./src/flash/AS/BaseConcept.as
    • -119
    • +0
    ./src/flash/AS/BasicColor.as
    • -194
    • +0
    ./src/flash/AS/Branch.as
    • -453
    • +0
    ./src/flash/AS/Concept.as
    • -43
    • +0
    ./src/flash/AS/ConnectionIcon.as
    • -94
    • +0
    ./src/flash/AS/DeleteMessage.as
    • -243
    • +0
    ./src/flash/AS/Design.as
    • -12
    • +0
    ./src/flash/AS/InformationEvent.as
    • -114
    • +0
    ./src/flash/AS/InternalBranch.as
    • -132
    • +0
    ./src/flash/AS/InternalConcept.as
    • -184
    • +0
    ./src/flash/AS/MindMap.as
    • -33
    • +0
    ./src/flash/AS/Mindmap tool.flp
    • -82
    • +0
    ./src/flash/AS/MultiPlayer.as
    • -8
    • +0
    ./src/flash/AS/NoPlayer.as
  16. … 19 more files in changeset.
11:16 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4588 Show creator name as hover in multiuser mode

Options
    • -4
    • +8
    ./src/java/org/lamsfoundation/lams/tool/mindmap/dto/IdeaJSON.java
    • -4
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mindmap/dto/RootJSON.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java
    • -17
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java
    • -4
    • +27
    ./web/common/mapjs.jsp
    • -0
    • +13
    ./web/includes/css/mindmap.scss
Wednesday 30 May 2018
8:01 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4588 Websockets replace polling for multiuser mode

Options
    • -2
    • +3
    ./.classpath
    • -0
    • +19
    ./build.xml
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mindmap/dao/IMindmapNodeDAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mindmap/dao/IMindmapRequestDAO.java
    • -2
    • +7
    ./src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapNodeDAO.java
    • -5
    • +6
    ./src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapRequestDAO.java
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapRequest.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mindmap/service/IMindmapService.java
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java
    • -291
    • +14
    ./src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java
    • -0
    • +290
    ./src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningWebsocketServer.java
    • -86
    • +114
    ./web/common/mapjs.jsp
Monday 28 May 2018
12:52 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4588 Authoring mode and layout tweaks

Options
    • -24
    • +36
    ./web/common/mapjs.jsp
    • -2
    • +2
    ./web/includes/css/mindmap.scss
10:24 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4588 Adding a colour picker

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -103
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java
    • -22
    • +65
    ./web/common/mapjs.jsp
    • -1
    • +0
    ./web/includes/css/mindmap.scss
    • -54
    • +79
    ./web/includes/javascript/mapjs/main.js
    • -1
    • +2
    ./web/pages/authoring/authoring.jsp
    • -1
    • +4
    ./web/pages/learning/mindmap.jsp
    • -4
    • +5
    ./web/pages/monitoring/mindmapDisplay.jsp
  9. … 3 more files in changeset.
Tuesday 22 May 2018
8:12 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4588 Flash removed from authoring, learning and monitor

Options
    • -0
    • +16
    ./.externalToolBuilders/SASS Mindmap.launch
    • -0
    • +1
    ./.gitignore
    • -0
    • +9
    ./.project
    • -1
    • +3
    ./build.properties
    • -85
    • +0
    ./conf/language/ApplicationResources.properties
    • -8
    • +12
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +15
    ./src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/patch20180517.sql
    • -0
    • +141
    ./src/java/org/lamsfoundation/lams/tool/mindmap/dto/IdeaJSON.java
    • -0
    • +57
    ./src/java/org/lamsfoundation/lams/tool/mindmap/dto/NotifyActionJSON.java
    • -0
    • +48
    ./src/java/org/lamsfoundation/lams/tool/mindmap/dto/NotifyResponseJSON.java
    • -0
    • +102
    ./src/java/org/lamsfoundation/lams/tool/mindmap/dto/RootJSON.java
    • -3
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mindmap/service/IMindmapService.java
    • -37
    • +12
    ./src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/tool/mindmap/util/xmlmodel/PollResponseModel.java
    • -74
    • +34
    ./src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java
  16. … 15 more files in changeset.
3:04 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating and fixing labels

There's quite a lot of work required with labels and it's not jsut translations but rearringing them according to language, string lenght, etc. Also we shouild be more accurate in naming users. When we are referring to students, we should call them students instead of users. Quite a few of these instances in this commit

Options
    • -6
    • +6
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 48 more files in changeset.
Monday 21 May 2018
11:10 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating labels

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 25 more files in changeset.
7:03 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: updating labels

Mainly Spanish and a little bit of Greek and Norwegian

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 38 more files in changeset.
Wednesday 09 May 2018
1:59 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4559 Comments can be left anonymously.

Options
    • -1
    • +6
    ./web/WEB-INF/tags/Comments.tag
    • -1
    • +22
    ./web/WEB-INF/tags/CommentsAuthor.tag
  3. … 91 more files in changeset.
Monday 09 Apr 2018
9:46 pm

Marcin Cieslak

LDEV-4540 Introduce hooks in command websockets

When a command is added, the JSON can contain "hookTrigger" and

"hookParams" attributes.

hookTrigger is just a string which uniquely identifies a page. If this

page set the same commandWebsocketHookTrigger, then command is consumed

and function defined on this page as commandWebsocketHook is run with

parameters taken from hookParams from JSON.

This way back end can tell exact page on front end to run any code it

defines itself.

Options
    • -0
    • +8
    ./web/WEB-INF/tags/Page.tag
  2. … 35 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
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java
  2. … 83 more files in changeset.
Thursday 22 Mar 2018
1:55 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4533 Exception details are hidden as per system config

Options
    • -27
    • +14
    ./web/error.jsp
  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
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java
  2. … 65 more files in changeset.
Thursday 15 Feb 2018
11:54 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4514 Greek names appear in notification window correctly.

Also added some HTML escaping to the display of the leader's name

in tool messages.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/LeaderDisplay.tag
  2. … 33 more files in changeset.