Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4649 Fix outcome/scale export file extension

Merge learning outcomes LDEV-4644 into lams31

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

Conflicts:

lams_admin/.classpath

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams-gradebook.jar

lams_build/lib/lams/lams.jar

lams_central/.classpath

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java

lams_central/src/java/org/lamsfoundation/lams/rest/RestServlet.java

lams_central/src/java/org/lamsfoundation/lams/rest/ToolRestManager.java

lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java

lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java

lams_central/web/includes/javascript/pedagogicalPlanner.js

lams_common/.classpath

lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java

lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

lams_gradebook/.classpath

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java

lams_learning/.classpath

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java

lams_monitoring/.classpath

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

lams_tool_assessment/.classpath

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_bbb/.classpath

lams_tool_chat/.classpath

lams_tool_doku/.classpath

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java

lams_tool_eadventure/.classpath

lams_tool_forum/.classpath

lams_tool_images/.classpath

lams_tool_kaltura/.classpath

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java

lams_tool_lamc/.classpath

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

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

lams_tool_laqa/.classpath

lams_tool_larsrc/.classpath

lams_tool_leader/.classpath

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/LearningAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java

lams_tool_nb/.classpath

lams_tool_notebook/.classpath

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java

lams_tool_sbmt/.classpath

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

lams_tool_scratchie/.classpath

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/web/actions/LearningAction.java

lams_tool_spreadsheet/.classpath

lams_tool_survey/.classpath

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java

lams_tool_task/.classpath

lams_tool_vote/.classpath

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

lams_tool_wiki/.classpath

    • -21
    • +19
    ./lamsfoundation/lams/authoring/ObjectExtractor.java
    • -6
    • +6
    ./lamsfoundation/lams/rest/RestServlet.java
    • -6
    • +4
    ./lamsfoundation/lams/web/IndexAction.java
    • -9
    • +10
    ./lamsfoundation/lams/web/OrganisationGroupAction.java
  1. … 92 more files in changeset.
LDEV-4440 Learning branching fixes

  1. … 2 more files in changeset.
LDEV-4440 Various fixes in admin

  1. … 7 more files in changeset.
LDEV-4440 EXportContetContrller

LDEV-4440 Portrait fix

  1. … 7 more files in changeset.
LDEV-4649 Outcome import

  1. … 4 more files in changeset.
LDEV-4649 Scale import

  1. … 6 more files in changeset.
LDEV-4653 enforceAllowLearnerRestart can't be null

  1. … 4 more files in changeset.
LDEV-4440 Central Tbl fixes

  1. … 1 more file in changeset.
LDEV-4440 LAMS Central learning link fixed

  1. … 27 more files in changeset.
LDEV-4440 Central noStruts Library

    • -1
    • +1
    ./lamsfoundation/lams/web/PortraitSaveController.java
    • -100
    • +100
    ./lamsfoundation/lams/web/TextSearchActionForm.java
    • -114
    • +114
    ./lamsfoundation/lams/web/planner/PedagogicalPlannerActivityForm.java
    • -3
    • +0
    ./lamsfoundation/lams/web/tag/HtmlTag.java
  1. … 7 more files in changeset.
LDEV-4440 Central minor fixes

    • -2
    • +2
    ./lamsfoundation/lams/web/HomeController.java
    • -9
    • +2
    ./lamsfoundation/lams/web/PasswordChangeController.java
    • -12
    • +3
    ./lamsfoundation/lams/web/PortraitSaveController.java
    • -6
    • +14
    ./lamsfoundation/lams/web/QuestionsController.java
  1. … 21 more files in changeset.
LDEV-4440 Central monitoring links foxed

    • -14
    • +14
    ./lamsfoundation/lams/web/LAMSConnectorServlet.java
    • -5
    • +2
    ./lamsfoundation/lams/web/OrganisationGroupController.java
    • -1
    • +1
    ./lamsfoundation/lams/web/PortraitSaveController.java
  1. … 1 more file in changeset.
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.