toolcontent

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'master' into v4.0

# Conflicts:

# lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_build/build.xml

# lams_build/liblist.txt

# lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

# lams_central/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_central/web/authoringConfirm.jsp

# lams_central/web/common/taglibs.jsp

# lams_central/web/includes/javascript/authoring/authoringGeneral.js

# lams_central/web/includes/javascript/outcome.js

# lams_central/web/outcome/outcomeEdit.jsp

# lams_central/web/outcome/outcomeManage.jsp

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

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

# lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java

# lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java

# lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp

# lams_tool_laqa/web/authoring/newQuestionBox.jsp

# lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp

# lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java

# lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java

# lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/web/pages/authoring/basic.jsp

# lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_www/web/WEB-INF/tags/OutcomeAuthor.tag

  1. … 94 more files in changeset.
LDEV-4932 Start using /common/taglibs.jsp in lams_central

  1. … 67 more files in changeset.
LDEV-4759 Panels are now cards.

  1. … 506 more files in changeset.
LDEV-4759 Authoring and monitoring tabs working

  1. … 315 more files in changeset.
LDEV-4755 Scan when importing LDs

  1. … 3 more files in changeset.
LDEV-4391 Prevent double clicking on Save As and Import buttons

Even though Save button in Save As dialog does not seem to get spinning

arrows, it gets disabled straight away and double submit does not

happen. The arrows never get a chance to get rendered as code

responsible for saving works quickly and calls reset() method on the

button.

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

  1. … 27 more files in changeset.
LDEV-4237: Include label informing the max size file LDEV-4241: File upload validation LDEV-4240: Consistent upload widget Updating the QTI Import to use the new code.

  1. … 3 more files in changeset.
LDEV-3735, LDEV-3674: Rewrite LD import using JDK XML tools. Remove cglib library which does not seem to be used by XStream anymore. Remove Axis and wsdl4j libraries, and several Java classes made obsolete by Flash removal. Fix LD import in FLA and several Tools.

  1. … 38 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. … 413 more files in changeset.
LDEV-3696: Update central to bootstrap

  1. … 10 more files in changeset.
LDEV-2917: Use <!DOCTYPE html> everywhere.

  1. … 164 more files in changeset.
LDEV-3556: Remove IMS export and .las import.

  1. … 16 more files in changeset.
LDEV-2840: we reinstate the uniqueID but instead of using a randomly generated file we user the userID instead

  1. … 1 more file in changeset.
more merging lams2_3 into head

  1. … 32 more files in changeset.
LDEV-2150: icons in buttons import/export

  1. … 1 more file in changeset.
LDEV-2108 - Creating backend functionality to allow importing sequences from lamscommunity

    • -0
    • +58
    ./importresultLC.jsp
  1. … 9 more files in changeset.
LDEV-1889: Box with the export format choice is now called "Advanced options" and it can be shown and hidden. It uses the same script as advanced option in monitoring summary.

  1. … 2 more files in changeset.
LDEV-1861 Adding customCSV

import.jsp changed to include the customCSV so it can be sent to tooladapter tools

LDEV-1352: The XML output had namespace entries (wrong ones) scattered throughout the output, so now nearly all properties have their correct namespace nominated. This isn't obvious when you use Firefox to view the XML - you need to look at the text file directly.

LDEV-1352: Added properties and the IMSLD conditions that use the properties, to selectively hide/show the branches. Updated the LAMS schema file and removed some activity attributes that don't need to be in the export.

  1. … 2 more files in changeset.
LDEV-1671: Adding a different label for select another file

LDEV-1352: Adding branching to IMSLD export. The branch activities are now exported, along with the branch mappings, conditions and groupings in a structured format. Still problems with ordering of the activities within a branch, there aren't any conditions to control the branches and the groups don't line up with IMS LD groups.

  1. … 1 more file in changeset.
LDEV-1341: Tweaked messages so that the two new messages use the same key (saves work for the translators).

LDEV-1341Import learning design dialog. Some sapce added between the buttons and the blue area

LDEV-1341Import learning design dialog box to detect empty fiel

(2) The error message screen changed so that it has "Close" and "Select File To Import" and the "Select File To Import" button returns the user back to the first import screen, so that they can have another go.

LDEV-1341 1st task. Import learning design dialog box now has validation to see if a file has been selected.

  1. … 4 more files in changeset.
LDEV-1255: Moving the code for stopping jsps caching to a new custom tag, so that it can be applied consistently across all pages.

  1. … 41 more files in changeset.
LDEV-1181: Check the wddx packet to make sure it really is a wddx packet before importing, and cleaned up the look of the error messages.

  1. … 1 more file in changeset.
removed lams langstring tag from title element value