Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4440 Add MultipartFilter

This filter is an alternative to using DispatcherServlet's

MultipartResolver support, for example for web applications with custom

web views which do not use Spring's web MVC (e.g. LAMS Servlets).

Merge learning outcomes LDEV-4644 into lams31

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

  1. … 103 more files in changeset.
LDEV-4658 Add new config setting "Enable profile portrait editing"

  1. … 3 more files in changeset.
LDEV-4440 fixed paths at Central

LDEV-4440 Various fixes in admin

  1. … 7 more files in changeset.
LDEV-4440 Portrait fix

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

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

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

  1. … 2 more files in changeset.
LDEV-4440 Central minor fixes

LDEV-4440 LAMS Central learning link fixed

  1. … 13 more files in changeset.
LDEV-4440 changed paths (monitoring)

LDEV-4440 trying to solve problems with grouping upload

  1. … 2 more files in changeset.
LDEV-4440 Central minor fixes

    • -212
    • +0
    ./WEB-INF/tlds/struts/struts-bean-el.tld
    • -382
    • +0
    ./WEB-INF/tlds/struts/struts-bean.tld
    • -3302
    • +0
    ./WEB-INF/tlds/struts/struts-html-el.tld
    • -3302
    • +0
    ./WEB-INF/tlds/struts/struts-html.tld
    • -382
    • +0
    ./WEB-INF/tlds/struts/struts-logic-el.tld
    • -652
    • +0
    ./WEB-INF/tlds/struts/struts-logic.tld
    • -3171
    • +0
    ./WEB-INF/tlds/struts/struts-nested.tld
    • -343
    • +0
    ./WEB-INF/tlds/struts/struts-tiles-el.tld
    • -344
    • +0
    ./WEB-INF/tlds/struts/struts-tiles.tld
  1. … 15 more files in changeset.
LDEV-3322: adding ids/tags for all authoring tests

LDEV-4440 Central monitoring links foxed

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

  1. … 3 more files in changeset.
LDEV-4440 Small fixes after merge

Merge Asia's and Michal's progress in core projects

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

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

    • -19
    • +11
    ./includes/javascript/authoring/authoringGeneral.js
  1. … 38 more files in changeset.
LDEV-4407 Fix link to pedPlanner

LDEV-4649 Outcome export

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

  1. … 5 more files in changeset.
LDEV-3322: resucitating selenium tests

Readapting the old lams_test to LAMS 3.x

  1. … 2 more files in changeset.
LDEV-4440 changed paths to monitoring methods

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

  1. … 11 more files in changeset.
LDEV-4440 Central war

    • -1
    • +1
    ./WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -31
    • +31
    ./WEB-INF/tags/AuthoringRatingCriteria.tag
  1. … 36 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

  1. … 26 more files in changeset.