Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4440 Central minor fixes

    • -2
    • +1
    ./lamsfoundation/lams/web/HomeController.java
  1. … 8 more files in changeset.
LDEV-4440 Central migration

    • -2
    • +3
    ./lamsfoundation/lams/web/PasswordChangeController.java
    • -2
    • +3
    ./lamsfoundation/lams/web/PortraitSaveController.java
  1. … 5 more files in changeset.
LDEV-4407 Corrected name of the authoring service bean

LDEV-4653 Add param "Learners can restart the lesson" to integrations

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

    • -0
    • +48
    ./lamsfoundation/lams/web/DisplayGroupController.java
    • -1
    • +1
    ./lamsfoundation/lams/web/FindUserLessonsController.java
    • -6
    • +6
    ./lamsfoundation/lams/web/HomeController.java
    • -10
    • +10
    ./lamsfoundation/lams/web/IndexController.java
    • -0
    • +1
    ./lamsfoundation/lams/web/LessonConditionsController.java
    • -2
    • +6
    ./lamsfoundation/lams/web/PasswordChangeController.java
    • -4
    • +9
    ./lamsfoundation/lams/web/PortraitSaveController.java
    • -9
    • +13
    ./lamsfoundation/lams/web/ProfileSaveController.java
  1. … 40 more files in changeset.
Merge branch 'LDEV-4407'

  1. … 4 more files in changeset.
LDEV-4407 Other projects stop depending on lams_contentrepository

    • -77
    • +0
    ./lamsfoundation/lams/util/CentralToolContentHandler.java
  1. … 71 more files in changeset.
LDEV-4649 Outcome export

  1. … 6 more files in changeset.
LDEV-4649 Outcome scale export

  1. … 7 more files in changeset.
LDEV-4440 Monitoring migration - necessary changes at central (changed paths for monitoring), removed controllers connected with branching

    • -1
    • +1
    ./lamsfoundation/lams/web/HomeAction.java
  1. … 15 more files in changeset.
LDEV-4440 Central war

    • -2
    • +2
    ./lamsfoundation/lams/web/HomeController.java
  1. … 49 more files in changeset.
LDEV-4407 Remove obsolete methods

  1. … 2 more files in changeset.
LDEV-4407 Prepare lams_central to not being accessible from other modules

Split IAuthoringService into IAuthoringFullService and IAuthoringService

interfaces:

1. IAuthoringFullService is going to be used by lams_central only

2. IAuthoringService - by all other modules

    • -6
    • +6
    ./lamsfoundation/lams/rest/RestServlet.java
    • -67
    • +0
    ./lamsfoundation/lams/rest/RestTags.java
    • -31
    • +0
    ./lamsfoundation/lams/rest/ToolRestManager.java
    • -79
    • +0
    ./lamsfoundation/lams/util/BufferOverflowException.java
    • -905
    • +0
    ./lamsfoundation/lams/util/CircularByteBuffer.java
  1. … 12 more files in changeset.
LDEV-4652 Validating the title as it becomes the design name

  1. … 3 more files in changeset.
LDEV-4440 Central *.java migration

    • -406
    • +0
    ./lamsfoundation/lams/web/DisplayGroupAction.java
    • -0
    • +320
    ./lamsfoundation/lams/web/DisplayGroupController.java
    • -4
    • +1
    ./lamsfoundation/lams/web/EmailForm.java
    • -193
    • +0
    ./lamsfoundation/lams/web/EmailUserAction.java
    • -0
    • +167
    ./lamsfoundation/lams/web/EmailUserController.java
    • -159
    • +0
    ./lamsfoundation/lams/web/FindUserLessonsAction.java
    • -0
    • +137
    ./lamsfoundation/lams/web/FindUserLessonsController.java
    • -428
    • +0
    ./lamsfoundation/lams/web/HomeAction.java
    • -0
    • +383
    ./lamsfoundation/lams/web/HomeController.java
    • -315
    • +0
    ./lamsfoundation/lams/web/IndexAction.java
    • -0
    • +297
    ./lamsfoundation/lams/web/IndexController.java
    • -343
    • +0
    ./lamsfoundation/lams/web/LessonConditionsAction.java
  1. … 53 more files in changeset.
LDEV-4440 Central

    • -0
    • +507
    ./lamsfoundation/lams/authoring/web/AuthoringController.java
    • -0
    • +148
    ./lamsfoundation/lams/authoring/web/ExportToolContentController.java
    • -0
    • +188
    ./lamsfoundation/lams/authoring/web/ImportToolContentController.java
    • -0
    • +666
    ./lamsfoundation/lams/comments/web/CommentController.java
    • -10
    • +12
    ./lamsfoundation/lams/comments/web/CommentForm.java
  1. … 21 more files in changeset.
LDEV-4645 Add default lesson settings to integrated servers

  1. … 7 more files in changeset.
LDEV-4650 Add default, immutable outcome scale

  1. … 8 more files in changeset.
LDEV-4644 Display and edit outcome results in monitor gradebook

  1. … 16 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

    • -3
    • +45
    ./lamsfoundation/lams/web/IndexAction.java
    • -0
    • +41
    ./lamsfoundation/lams/web/ProfileAction.java
  1. … 100 more files in changeset.
LDEV-4440 Grade book

    • -1
    • +1
    ./lamsfoundation/lams/web/HomeAction.java
  1. … 4 more files in changeset.
LDEV-4644 Add OutcomeAutor tag for outcome mapping

  1. … 20 more files in changeset.
LDEV-4638 Option to turn on confidence levels for iRA tRA

    • -0
    • +2
    ./lamsfoundation/lams/rest/RestTags.java
  1. … 6 more files in changeset.
LDEV-4646 Introduce LoginServlet that will forward to login.jsp

It was added to be able to set locale for login.jsp. As

LocaleFilter doesn't get fired when login.jsp is requested.

    • -0
    • +34
    ./lamsfoundation/lams/web/LoginServlet.java
  1. … 1 more file in changeset.
LDEV-4644 Add scale management

    • -0
    • +93
    ./lamsfoundation/lams/web/outcome/OutcomeScaleForm.java
  1. … 16 more files in changeset.
LDEV-4644 Global outcomes management via sysadmin

  1. … 4 more files in changeset.
LDEV-4644 Add content folder ID for CKEditor to outcomes and scales

  1. … 13 more files in changeset.
LDEV-4644 Add/edit learning outcome

    • -0
    • +303
    ./lamsfoundation/lams/web/outcome/OutcomeAction.java
    • -0
    • +84
    ./lamsfoundation/lams/web/outcome/OutcomeForm.java
  1. … 11 more files in changeset.
LDEV-4644 Add outcomes in More Options on index page

  1. … 1 more file in changeset.
LDEV-4639 Use tour instead of tutorials video on first login

Tutorial videos have never been fully implemented. We get rid of them in

favour of tours.

    • -1
    • +1
    ./lamsfoundation/lams/web/IndexAction.java
    • -170
    • +0
    ./lamsfoundation/lams/web/TutorialAction.java
  1. … 17 more files in changeset.