Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.

  1. … 78 more files in changeset.
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.

  1. … 77 more files in changeset.
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

  1. … 45 more files in changeset.
LDEV-4471: Formatted email with SPA calculations for user results

  1. … 7 more files in changeset.
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;".

  1. … 28 more files in changeset.
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

  1. … 28 more files in changeset.
LDEV-4417 Popover portraits in Monitoring

Implmented in Share Resources, Survey, Leader, Mindmap,

Noticeboard, Notebook, Pixlr, Peer Review

  1. … 39 more files in changeset.
LDEV-4417 Popover portraits in Monitoring

Implmented in Share Resources, Survey, Leader, Mindmap,

Noticeboard, Notebook, Pixlr, Peer Review

  1. … 39 more files in changeset.
LDEV-4402 Substitute Gson and Apache JSON with Jackson

Jackson is a top JSON library shipped with WF10.

Apache JSON resides in an ancient library which we do not need for

anything else.

We use GSon only for serializing Java objects to JSON, which Jackson can

do too.

  1. … 132 more files in changeset.
LDEV-2999: Moving the database update into the tool as the Peer Review tool is not included in the standard build.

  1. … 1 more file in changeset.
LDEV-2999 Include a rating option for reviewed resources (authored only). To make the grouped rating of authored resources work properly, session id was added to the rating and rating comments tables and all code using the shared jRating script and shared ratings updated to store the session code. DB script updates existing rating, rating comment records.

  1. … 36 more files in changeset.
LDEV-4233 After teacher hid the learner do not show this user in export file

LDEV-4300 Audit logs when activity is modified in monitor

  1. … 86 more files in changeset.
LDEV-4291 Move getAccessMode method to WebUtil

  1. … 30 more files in changeset.
LDEV-4286 Show authoring advanced tab on re-editing content from monitor

  1. … 26 more files in changeset.
LDEV-4180: Make DB patches produce up-to-date structure during build instead of applying multiple patches. Get rid of unnecessary tables and keys. Modify boolean columns to tinyint(1) Simplify patches where possible.

  1. … 223 more files in changeset.
LDEV-3517 Added Peer Review tool icon

  1. … 4 more files in changeset.
LDEV-4233 Ability to hide users

  1. … 11 more files in changeset.
LDEV-4222: Eliminating exceptions due to division by zero. This creates a NaN.

LDEV-4222: Using ANY_VALUE to make the SQL compatible with MySQL's ONLY_FULL_GROUP_BY setting.

  1. … 2 more files in changeset.
LDEV-4187: Get an learner's status from the tool for a particular tool session, which can be used to regenerate learner progress.

  1. … 37 more files in changeset.
LDEV-4161: Further enhancement to Peer Review - the author can now differentiate what to show on the results, the results page now indicates how many possible reviews can be done and sorts the comments in alphabetical order.

  1. … 6 more files in changeset.
LDEV-4109: Adding explicit comment style rating support to Peer Review. Also fixed a couple of counts that were not calculating correctly - the number of ratings done was being reported on all criteria in the lesson, not the individual criteria.

  1. … 1 more file in changeset.
LDEV-3316: Remove leftovers (comments, exceptions) of Spring layer.

  1. … 19 more files in changeset.
LDEV-4047: Removing green tick method of storing comments (now only saved when going to the next or previous page or triggering paging) and ensuring validation for the comments for star ratings and the justification for hedging is occuring when needed.

  1. … 5 more files in changeset.
LDEV-4072: Spreadsheet export for monitoring.

  1. … 3 more files in changeset.
LDEV-4047: Submitting any comments not submitted with the tick.

  1. … 3 more files in changeset.
LDEV-4048: Adding Rate All to Star Ratings

  1. … 7 more files in changeset.
LDEV-4046: Escaping quotes and other entries in title so that it does not break the javascript.

  1. … 3 more files in changeset.
LDEV-3767: Monitor can send an email to learners with their reviews.

  1. … 12 more files in changeset.