lams-github / lams_tool_vote / src / java

org

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
    • -70
    • +0
    ./lamsfoundation/lams/tool/vote/util/VoteToolContentHandler.java
    • -4
    • +7
    ./lamsfoundation/lams/tool/vote/voteApplicationContext.xml
  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
    • -3
    • +2
    ./lamsfoundation/lams/tool/vote/web/action/AuthoringAction.java
    • -4
    • +4
    ./lamsfoundation/lams/tool/vote/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
    • -14
    • +31
    ./lamsfoundation/lams/tool/vote/service/VoteService.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/vote/voteApplicationContext.xml
    • -9
    • +21
    ./lamsfoundation/lams/tool/vote/web/action/LearningAction.java
  4. … 101 more files in changeset.
Thursday 09 Aug 2018
4:41 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 JSON fix

Options
    • -2
    • +4
    ./lamsfoundation/lams/tool/vote/web/controller/LearningController.java
    • -13
    • +18
    ./lamsfoundation/lams/tool/vote/web/controller/MonitoringController.java
    • -2
    • +4
    ./lamsfoundation/lams/tool/vote/web/controller/VoteChartGeneratorController.java
  4. … 6 more files in changeset.
Friday 27 Jul 2018
8:25 pm

Marcin Cieslak

Merge remote-tracking branch 'michal/LDEV-4440' into LDEV-4440

Options
    • -0
    • +0
    ./lamsfoundation/lams/tool/vote/service/VoteService.java
  2. … 14 more files in changeset.
Friday 20 Jul 2018
7:55 pm

Marcin Cieslak

LDEV-4440 Change package name in Vote

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/vote/service/VoteService.java
    • -1245
    • +0
    ./lamsfoundation/lams/tool/vote/web/action/AuthoringController.java
    • -67
    • +0
    ./lamsfoundation/lams/tool/vote/web/action/ClearSessionController.java
    • -1023
    • +0
    ./lamsfoundation/lams/tool/vote/web/action/LearningController.java
    • -512
    • +0
    ./lamsfoundation/lams/tool/vote/web/action/MonitoringController.java
    • -111
    • +0
    ./lamsfoundation/lams/tool/vote/web/action/VoteChartGeneratorController.java
    • -116
    • +0
    ./lamsfoundation/lams/tool/vote/web/action/VotePedagogicalPlannerController.java
    • -0
    • +1245
    ./lamsfoundation/lams/tool/vote/web/controller/AuthoringController.java
    • -0
    • +67
    ./lamsfoundation/lams/tool/vote/web/controller/ClearSessionController.java
    • -0
    • +1023
    ./lamsfoundation/lams/tool/vote/web/controller/LearningController.java
    • -0
    • +512
    ./lamsfoundation/lams/tool/vote/web/controller/MonitoringController.java
    • -0
    • +111
    ./lamsfoundation/lams/tool/vote/web/controller/VoteChartGeneratorController.java
    • -0
    • +116
    ./lamsfoundation/lams/tool/vote/web/controller/VotePedagogicalPlannerController.java
7:22 pm

Marcin Cieslak

LDEV-4440 Fix a bug in Vote PedPlanner form

Options
    • -1
    • +6
    ./lamsfoundation/lams/tool/vote/web/action/VotePedagogicalPlannerController.java
6:59 pm

Marcin Cieslak

LDEV-4440 Rewrite Vote to conform with new guidelines

Options
    • -23
    • +37
    ./lamsfoundation/lams/tool/vote/web/action/AuthoringController.java
    • -14
    • +24
    ./lamsfoundation/lams/tool/vote/web/action/LearningController.java
    • -2
    • +2
    ./lamsfoundation/lams/tool/vote/web/action/MonitoringController.java
  4. … 4 more files in changeset.
5:25 pm

Marcin Cieslak

LDEV-4440 Rewrite validation in PedPlanner forms

Options
    • -5
    • +6
    ./lamsfoundation/lams/tool/vote/web/action/VotePedagogicalPlannerController.java
    • -3
    • +8
    ./lamsfoundation/lams/tool/vote/web/form/VotePedagogicalPlannerForm.java
  3. … 7 more files in changeset.
Sunday 24 Jun 2018
9:26 pm

Marcin Cieslak

Merge branch 'lams31' into LDEV-4440

Conflicts:

lams_build/3rdParty.userlibraries

lams_build/lib/lams/lams-central.jar

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

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

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

lams_tool_vote/web/WEB-INF/tags/CommentsAuthor.tag

Options
    • -13
    • +37
    ./lamsfoundation/lams/tool/vote/service/VoteService.java
    • -9
    • +20
    ./lamsfoundation/lams/tool/vote/web/action/LearningController.java
    • -8
    • +6
    ./lamsfoundation/lams/tool/vote/web/action/MonitoringController.java
  4. … 12 more files in changeset.
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
    ./lamsfoundation/lams/tool/vote/dbupdates/patch20180425.sql
    • -16
    • +0
    ./lamsfoundation/lams/tool/vote/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
    ./lamsfoundation/lams/tool/vote/dbupdates/patch20180525.sql
  2. … 28 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
    • -13
    • +31
    ./lamsfoundation/lams/tool/vote/service/VoteService.java
    • -9
    • +21
    ./lamsfoundation/lams/tool/vote/web/action/LearningAction.java
    • -8
    • +6
    ./lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java
  4. … 81 more files in changeset.
Thursday 08 Mar 2018
11:02 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4525 Fixed Reflection issues

Options
    • -0
    • +2
    ./lamsfoundation/lams/tool/vote/service/IVoteService.java
    • -0
    • +5
    ./lamsfoundation/lams/tool/vote/service/VoteService.java
    • -9
    • +21
    ./lamsfoundation/lams/tool/vote/web/action/LearningAction.java
  4. … 2 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
    • -6
    • +6
    ./lamsfoundation/lams/tool/vote/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
    • -13
    • +26
    ./lamsfoundation/lams/tool/vote/service/VoteService.java
  2. … 65 more files in changeset.
Tuesday 06 Feb 2018
12:17 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/vote/voteApplicationContext.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
    • -25
    • +2
    ./lamsfoundation/lams/tool/vote/service/VoteService.java
    • -2
    • +1
    ./lamsfoundation/lams/tool/vote/voteApplicationContext.xml
  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
    • -5
    • +4
    ./lamsfoundation/lams/tool/vote/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
    • -1
    • +1
    ./lamsfoundation/lams/tool/vote/web/form/VotePedagogicalPlannerForm.java
  2. … 77 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
    ./lamsfoundation/lams/tool/vote/service/VoteService.java
  2. … 45 more files in changeset.
Thursday 02 Nov 2017
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
    ./lamsfoundation/lams/tool/vote/service/VoteService.java
  2. … 28 more files in changeset.
Monday 23 Oct 2017
11:00 pm

Marcin Cieslak

LDEV-4440 Add missing URLs to Vote tool

Options
    • -0
    • +2
    ./lamsfoundation/lams/tool/vote/dbupdates/patch20171023.sql
2:12 pm

Marcin Cieslak

LDEV-4440 Change tool access URLs to reflect migration to Spring MVC

Options
    • -0
    • +21
    ./lamsfoundation/lams/tool/vote/dbupdates/patch20171023.sql
Friday 20 Oct 2017
4:15 am

Marcin Cieslak

LDEV-4440 Add a test library which does not reference Struts

After full LAMS migration to Spring MVC it will become

3rdParty.userlibraries

Options
    • -33
    • +0
    ./lamsfoundation/lams/tool/vote/VoteAppConstants.java
    • -2
    • +2
    ./lamsfoundation/lams/tool/vote/service/VoteService.java
    • -37
    • +0
    ./lamsfoundation/lams/tool/vote/util/VoteUtils.java
    • -1338
    • +0
    ./lamsfoundation/lams/tool/vote/web/action/AuthoringAction.java
    • -0
    • +1231
    ./lamsfoundation/lams/tool/vote/web/action/AuthoringController.java
    • -51
    • +0
    ./lamsfoundation/lams/tool/vote/web/action/ClearSessionAction.java
    • -0
    • +67
    ./lamsfoundation/lams/tool/vote/web/action/ClearSessionController.java
    • -1086
    • +0
    ./lamsfoundation/lams/tool/vote/web/action/LearningAction.java
    • -0
    • +1002
    ./lamsfoundation/lams/tool/vote/web/action/LearningController.java
    • -562
    • +0
    ./lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java
    • -0
    • +514
    ./lamsfoundation/lams/tool/vote/web/action/MonitoringController.java
    • -121
    • +0
    ./lamsfoundation/lams/tool/vote/web/action/VoteChartGeneratorAction.java
    • -0
    • +111
    ./lamsfoundation/lams/tool/vote/web/action/VoteChartGeneratorController.java
    • -128
    • +0
    ./lamsfoundation/lams/tool/vote/web/action/VotePedagogicalPlannerAction.java
    • -0
    • +110
    ./lamsfoundation/lams/tool/vote/web/action/VotePedagogicalPlannerController.java
  16. … 53 more files in changeset.
Monday 09 Oct 2017
5:08 pm

Marcin Cieslak

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

Conflicts:

lams_build/lib/lams/lams.jar

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.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/web/actions/LearningWebsocketServer.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java

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

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

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.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/web/action/MonitoringAction.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/MonitoringAction.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
    • -3
    • +3
    ./lamsfoundation/lams/tool/vote/service/VoteService.java
    • -6
    • +13
    ./lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java
  3. … 28 more files in changeset.
Thursday 14 Sep 2017
8:48 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Scratchie, Spreadsheet, Scribe, Task, Vote

Options
    • -0
    • +2
    ./lamsfoundation/lams/tool/vote/VoteAppConstants.java
    • -3
    • +4
    ./lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java
    • -17
    • +39
    ./lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java
    • -0
    • +9
    ./lamsfoundation/lams/tool/vote/dto/OpenTextAnswerDTO.java
    • -3
    • +3
    ./lamsfoundation/lams/tool/vote/service/VoteService.java
    • -6
    • +13
    ./lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java
  7. … 30 more files in changeset.
8:48 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Scratchie, Spreadsheet, Scribe, Task, Vote

Options
    • -0
    • +2
    ./lamsfoundation/lams/tool/vote/VoteAppConstants.java
    • -3
    • +4
    ./lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java
    • -17
    • +39
    ./lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java
    • -0
    • +9
    ./lamsfoundation/lams/tool/vote/dto/OpenTextAnswerDTO.java
    • -3
    • +3
    ./lamsfoundation/lams/tool/vote/service/VoteService.java
    • -6
    • +13
    ./lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java
  7. … 30 more files in changeset.
Saturday 26 Aug 2017
4:04 pm

Marcin Cieslak

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

Multiple conflicts resolved with JSON replace and class move to

packages.

Options
    • -0
    • +2048
    ./lamsfoundation/lams/tool/vote/service/VoteService.java
    • -0
    • +1086
    ./lamsfoundation/lams/tool/vote/web/action/LearningAction.java
    • -0
    • +555
    ./lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java
    • -0
    • +121
    ./lamsfoundation/lams/tool/vote/web/action/VoteChartGeneratorAction.java
  5. … 30 more files in changeset.
Friday 18 Aug 2017
2:43 am

Andrey Balan

LDEV-4407 Move classes to the proper packages

Action classes were moved to admin.web.action package; forms to

admin.web.form; DTOs to admin.web.dto.

(To access files' earlier history use Eclipse's Show in History feature

or run 'git log --follow ./path/to/file')

Options
    • -0
    • +2042
    ./lamsfoundation/lams/tool/vote/service/VoteService.java
    • -2042
    • +0
    ./lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/vote/voteApplicationContext.xml
  4. … 74 more files in changeset.