Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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-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.
LDEV-4417 Popover portraits in Monitoring

Implmented in Share Resources, Survey, Leader, Mindmap,

Noticeboard, Notebook, Pixlr, Peer Review

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

Implmented in Share Resources, Survey, Leader, Mindmap,

Noticeboard, Notebook, Pixlr, Peer Review

  1. … 42 more files in changeset.
Merge remote-tracking branch 'origin/master' into lams31

Multiple conflicts resolved with JSON replace and class move to

packages.

  1. … 33 more files in changeset.
LDEV-4407 Move lams_contentrepository exceptions to the proper package

lams_contentrepository's exception classes were moved to

contentrepository.exception package.

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

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

  1. … 66 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. … 131 more files in changeset.
LDEV-4394 Make page reload and websocket close requests cross-node

Some requests have been sent only to websockets on current node. Now

they are detected in DB and run on all nodes.

  1. … 10 more files in changeset.
LDEV-4252: Use another collection type instead of synchronisation.

  1. … 3 more files in changeset.
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-4282 Don't display next activity button until a leader has been chosen

  1. … 3 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-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-3952: updating scripts to be compatible with MySQL 5.7

  1. … 43 more files in changeset.
LDEV-3750 Improve performance of pushing marks to gradebook

  1. … 36 more files in changeset.
LDEV-3750 Added ability to request all available tool outputs per toolContentId instead of querying them one by one

  1. … 36 more files in changeset.
LDEV-3776: Remove $Id CVS keyword.

  1. … 1015 more files in changeset.
LDEV-3776: Remove $Id CVS keyword.

  1. … 1265 more files in changeset.
LDEV-3776: Clean up and format all LAMS Java code.

  1. … 2106 more files in changeset.
LDEV-3776: Clean up and format all LAMS Java code.

  1. … 1846 more files in changeset.
LDEV-3401: Convert XDoclet annotations to empty comments.

  1. … 465 more files in changeset.
LDEV-3660: Remove export potfolio resources: Java classes, JPS, DB entries and labels. Remove localLinkPath attribute from CSS tag as it was only used for export portfolio.

  1. … 371 more files in changeset.
LDEV-3556: Remove LAMS 1 methods for importing Tool content.

  1. … 27 more files in changeset.
LDEV-3640: Generate only a warning when there is no foreign key to drop.

  1. … 28 more files in changeset.
LDEV-3638: Remove lesson and all its resources on demand. Files in content repository stay. Clean up unnecessary code, format.

  1. … 47 more files in changeset.
LDEV-3640: Add cascades in tool tables.

  1. … 28 more files in changeset.
LDEV-3638: Remove lesson and all its resources on demand. Files in content repository stay. Clean up unnecessary code, format.

  1. … 48 more files in changeset.
LDEV-3640: Add cascades in tool tables.

  1. … 27 more files in changeset.
LDEV-3633: Allow specyfing port which MySQL runs on. Disable SSL for building LAMS as it generates a warning message. New MySQL does not accept ALTER IGNORE TABLE statements.

  1. … 24 more files in changeset.