Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge Asia's and Michal's progress in core projects

  1. … 5 more files in changeset.
LDEV-4440 Central migration

  1. … 52 more files in changeset.
LDEV-4407 Fix link to pedPlanner

LDEV-4440 Monitoring migration - necessary changes at central (changed paths for monitoring), removed controllers connected with branching

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

  1. … 103 more files in changeset.
LDEV-4550 Centre learner and other pop ups

Open the window a bit higher than centre for better readibility.

Also clean up obsolete JS functions.

LDEV-4407 Move ped planner stuff to lams_planer

All ped planner related code moved out from lams_central and

lams_common to lams_planer. Although

PedagogicalPlannerActivityForm.java was moved from

lams_central to lams_common to be accessible by LAMS tools.

  1. … 24 more files in changeset.
LDEV-4366 Introduce rubrics to Kumalive

  1. … 29 more files in changeset.
LDEV-4366 Open Kumalive in a pop up window rather than jQuery dialog

  1. … 4 more files in changeset.
LDEV-4255, LDEV-4256: Remove unnecessary "debugger" directive

LDEV-4255, LDEV-4256: Remove unnecessary "debugger" directive

LDEV-4255, LDEV-4256 Removing Configuration UI options no longer used

  1. … 5 more files in changeset.
LDEV-3877: resizing popups

  1. … 1 more file in changeset.
LDEV-3997 LAMS to become LTI compliant tool provider (version 1.1)

  1. … 27 more files in changeset.
LDEV-3997 LAMS to become LTI compliant tool provider (version 1.1)

  1. … 10 more files in changeset.
LDEV-3914: Replacing learner control frames with a div based sliding bar.

  1. … 28 more files in changeset.
LDEV-3674: Remove multiple Flash elements: Authoring, icons, themes, i18n files, WDDX libraries and classes, methods, servlets etc. Rename/rewrite methods for Flashless use.

  1. … 420 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-3543: Allow access to Flash Authoring from the main LAMS screen. Stick to Flash Authoring for Live Edit.

  1. … 3 more files in changeset.
LDEV-2265 fix JS method

LDEV-2265 fixed openLearner() by introducing new method openLearnerShortenedUrl() designed particularly for opening learner window from shortened URLs like /lams/r/*

  1. … 1 more file in changeset.
LDEV-2265 fixed openLearner() by introducing new method openLearnerShortenedUrl() designed particularly for opening learner window from shortened URLs like /lams/r/*

  1. … 1 more file in changeset.
LDEV-2265 Utilise URL Shortner to shorten lesson URL

  1. … 9 more files in changeset.
LDEV-2265 Utilise URL Shortner to shorten lesson URL. Now shortened URL starts with "{LAMS_SERVER}/lams/r/*"

  1. … 11 more files in changeset.
LDEV-2521 update authorWin window when switching between author and pedagogical planner

Merge lams2_3 to head (including things not merged last time due to eclipse's merge wizard not handling the lams2_3 start point as expected)

  1. … 167 more files in changeset.
LDEV-2173 - Putting most of gradebook into its own project for easier maintainence

Database persistence beans and DAO are staying in lams_common

  1. … 46 more files in changeset.
LDEV-2120 Adding links from index page to gradebook

  1. … 3 more files in changeset.
LDEV-1998: Added template management for Pedagogical Planner editor.

  1. … 26 more files in changeset.
LDEV-1998: Additions: - Central: added some files that were not committed earlier and prevented Planner from opening in a pop up window. - Q&A: fixed minor bug with question indexing. - Chat: Planner now strips Instructions from HTML tags. - Notebook: Planner now strips Instructions from HTML tags; fixed bug that set Online Instructions = Offline Instructions (!); Added tooltip with editing advice; adjusted planner form size.

  1. … 17 more files in changeset.