[Commits] [fluid-project/infusion] b83fad: FLUID-4924: Added scaleValue model transformer wit...

GitHub noreply at github.com
Fri Jul 5 02:16:15 EDT 2013


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: b83fad772a0a0584678738cf26351a99df6f1db7
      https://github.com/fluid-project/infusion/commit/b83fad772a0a0584678738cf26351a99df6f1db7
  Author: Kasper Markus <kasper2 at markus.dk>
  Date:   2013-02-23 (Sat, 23 Feb 2013)

  Changed paths:
    M src/webapp/framework/core/js/ModelTransformations.js
    M src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js

  Log Message:
  -----------
  FLUID-4924: Added scaleValue model transformer with tests


  Commit: 5fe5782da570d45af95119a480697497774f7d50
      https://github.com/fluid-project/infusion/commit/5fe5782da570d45af95119a480697497774f7d50
  Author: Kasper Markus <kasper2 at markus.dk>
  Date:   2013-02-24 (Sun, 24 Feb 2013)

  Changed paths:
    M src/webapp/framework/core/js/ModelTransformations.js
    M src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js

  Log Message:
  -----------
  FLUID-4924: Added binaryOp transformation with tests. Made lookup function that is to be used with parameters to allow both <key> and <keyPath> to be used for defining input to functions.


  Commit: 408f549c0bad413f0979bf1bac5f77bd4353659b
      https://github.com/fluid-project/infusion/commit/408f549c0bad413f0979bf1bac5f77bd4353659b
  Author: Kasper Markus <kasper2 at markus.dk>
  Date:   2013-02-24 (Sun, 24 Feb 2013)

  Changed paths:
    M src/webapp/framework/core/js/ModelTransformations.js
    M src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js

  Log Message:
  -----------
  GPII-4924: Added ability to have nested expanders in valuemapper as well as inputPath as value to outputValue (via outputValuePath)


  Commit: 01edd375a7f723418a72d9d141082501bcf27648
      https://github.com/fluid-project/infusion/commit/01edd375a7f723418a72d9d141082501bcf27648
  Author: Kasper Markus <kasper2 at markus.dk>
  Date:   2013-02-24 (Sun, 24 Feb 2013)

  Changed paths:
    M src/webapp/components/uploader/js/DemoUploadManager.js
    M src/webapp/components/uploader/js/FileQueue.js
    M src/webapp/components/uploader/js/FileQueueView.js
    M src/webapp/components/uploader/js/FlashUploaderSupport.js
    M src/webapp/components/uploader/js/HTML5UploaderSupport.js
    M src/webapp/components/uploader/js/MimeTypeExtensions.js
    M src/webapp/components/uploader/js/Uploader.js
    M src/webapp/components/uploader/js/UploaderCompatibility-Infusion1.2.js
    M src/webapp/components/uploader/js/UploaderCompatibility-Infusion1.3.js
    M src/webapp/framework/core/js/DataBinding.js
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/framework/core/js/ModelTransformations.js
    M src/webapp/framework/enhancement/js/ProgressiveEnhancement.js
    M src/webapp/tests/all-tests.html
    M src/webapp/tests/component-tests/uploader/html/FileQueue-test.html
    M src/webapp/tests/component-tests/uploader/js/UploaderCompatibilityTests.js
    M src/webapp/tests/component-tests/uploader/js/UploaderTests.js
    M src/webapp/tests/framework-tests/core/js/DataBindingTests.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
    M src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js
    M src/webapp/tests/framework-tests/enhancement/js/ProgressiveEnhancementTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'amb26/FLUID-4916' into FLUID-4924-4916


  Commit: a47e4d8001155e5b73270fead2531f2cf510633f
      https://github.com/fluid-project/infusion/commit/a47e4d8001155e5b73270fead2531f2cf510633f
  Author: Kasper Markus <kasper2 at markus.dk>
  Date:   2013-02-26 (Tue, 26 Feb 2013)

  Changed paths:
    M src/webapp/framework/core/js/ModelTransformations.js
    M src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js

  Log Message:
  -----------
  GPII-4924: Save before starting work of splitting it into two files. I'm halfway through some minor improvement to the valueMapper (defaultOutputValue, ability to use value from path as the output, etc)


  Commit: d898b18fa43ba1c2cc48eb5a5546048a33beb8ed
      https://github.com/fluid-project/infusion/commit/d898b18fa43ba1c2cc48eb5a5546048a33beb8ed
  Author: Kasper Markus <kasper2 at markus.dk>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

  Changed paths:
    A src/webapp/framework/core/js/ModelTransformationUtils.js
    M src/webapp/framework/core/js/ModelTransformations.js
    M src/webapp/tests/framework-tests/core/html/ModelTransformations-test.html
    M src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js

  Log Message:
  -----------
  GPII-4924: Implemented conditional expander with tests and deleted crazy new non-functioning test-cases from valueMapper


  Commit: c689da88df2060fbad00e88566bc280bb537239f
      https://github.com/fluid-project/infusion/commit/c689da88df2060fbad00e88566bc280bb537239f
  Author: Kasper Markus <kasper2 at markus.dk>
  Date:   2013-03-01 (Fri, 01 Mar 2013)

  Changed paths:
    M src/webapp/framework/core/js/ModelTransformationUtils.js
    M src/webapp/framework/core/js/ModelTransformations.js
    M src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js

  Log Message:
  -----------
  GPII-4924: Implemented multiInputTransformFunction and updated the relevant transformations


  Commit: 6f8c1b576236b6f3b213241ee9e79f3809fc2c57
      https://github.com/fluid-project/infusion/commit/6f8c1b576236b6f3b213241ee9e79f3809fc2c57
  Author: Kasper Markus <kasper2 at markus.dk>
  Date:   2013-03-01 (Fri, 01 Mar 2013)

  Changed paths:
    M src/webapp/framework/core/js/ModelTransformationUtils.js
    M src/webapp/framework/core/js/ModelTransformations.js
    M src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js

  Log Message:
  -----------
  GPII-4924: Made collect input paths recursive and added collect input path functionality to multiInputTransformFunctions


  Commit: f8dd6640b23764a938a03f760fedcc912facc093
      https://github.com/fluid-project/infusion/commit/f8dd6640b23764a938a03f760fedcc912facc093
  Author: Kasper Markus <kasper2 at markus.dk>
  Date:   2013-03-02 (Sat, 02 Mar 2013)

  Changed paths:
    M src/webapp/framework/core/js/ModelTransformations.js
    M src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js

  Log Message:
  -----------
  GPII-4924: Moved objectToHash and hashToObject over from XML handler and fixed to be compatible with latest changes to transformer


  Commit: 76c056167c64e9b0b0db4196ce5f2a3ea1fdae94
      https://github.com/fluid-project/infusion/commit/76c056167c64e9b0b0db4196ce5f2a3ea1fdae94
  Author: Kasper Markus <kasper2 at markus.dk>
  Date:   2013-03-02 (Sat, 02 Mar 2013)

  Changed paths:
    M src/webapp/framework/core/js/ModelTransformations.js
    M src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js

  Log Message:
  -----------
  GPII-4924: made the binary lookup table global. Also added 'expectedInputPaths' to the testcases to be run when input path collection is supported


  Commit: 6ac1a29fdc2e0f942afd68b356fa9caa9ac667be
      https://github.com/fluid-project/infusion/commit/6ac1a29fdc2e0f942afd68b356fa9caa9ac667be
  Author: Kasper Markus <kasper2 at markus.dk>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M src/webapp/framework/core/js/ModelTransformations.js
    M src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js

  Log Message:
  -----------
  FLUID-4924: Cleaned up the arraytoobject tets slightly and changed it so the key and input-path variables don't go into an options block. Also implemented the arraytooutputs and inputstoarray functions required by NVDA


  Commit: e4b0a6defdd1b4c5690433ee8b806c72c9612b9a
      https://github.com/fluid-project/infusion/commit/e4b0a6defdd1b4c5690433ee8b806c72c9612b9a
  Author: Kasper Markus <kasper2 at markus.dk>
  Date:   2013-03-08 (Fri, 08 Mar 2013)

  Changed paths:
    M src/webapp/framework/core/js/ModelTransformations.js
    M src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js

  Log Message:
  -----------
  FLUID-4924: Fixed issue with paths for objectToArray and arrayToObject. Added test for it


  Commit: 2b12c96dcdda46622e3fa65aa6f252a4c948156a
      https://github.com/fluid-project/infusion/commit/2b12c96dcdda46622e3fa65aa6f252a4c948156a
  Author: kaspermarkus <kasper2 at markus.dk>
  Date:   2013-03-15 (Fri, 15 Mar 2013)

  Changed paths:
    M src/webapp/framework/core/frameworkDependencies.json
    M src/webapp/module/includes.json

  Log Message:
  -----------
  FLUID-4924: Added modeltransformationutil file to required places


  Commit: 66ee21477ec74de69890c676e54b182ee93aed68
      https://github.com/fluid-project/infusion/commit/66ee21477ec74de69890c676e54b182ee93aed68
  Author: kaspermarkus <kasper2 at markus.dk>
  Date:   2013-03-15 (Fri, 15 Mar 2013)

  Changed paths:
    M src/webapp/framework/core/js/ModelTransformationUtils.js
    M src/webapp/framework/core/js/ModelTransformations.js
    M src/webapp/tests/component-tests/uploader/html/UploaderCompatibility-test.html

  Log Message:
  -----------
  FLUID-4924: Ensured that the ordering of expandSpec and expander argument was in a consistent ordering to avoid confusing stupid people like me ... also added utils reference to uploader test so it now passes again


  Commit: f9b65221688a202ed175b58fab8dd75549ba90ba
      https://github.com/fluid-project/infusion/commit/f9b65221688a202ed175b58fab8dd75549ba90ba
  Author: kaspermarkus <kasper2 at markus.dk>
  Date:   2013-03-15 (Fri, 15 Mar 2013)

  Changed paths:
    M src/webapp/components/reorderer/js/GeometricManager.js
    M src/webapp/components/reorderer/js/ModuleLayout.js
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/renderer/js/RendererUtilities.js
    M src/webapp/framework/renderer/js/fluidRenderer.js
    A src/webapp/module/devIncludes.json
    M src/webapp/module/fluid.js
    M src/webapp/tests/framework-tests/core/js/FluidJSTests.js
    M src/webapp/tests/framework-tests/renderer/html/Renderer-test.html
    M src/webapp/tests/framework-tests/renderer/html/RendererUtilities-test.html
    M src/webapp/tests/framework-tests/renderer/js/RendererTests.js
    M src/webapp/tests/framework-tests/renderer/js/RendererUtilitiesTests.js
    M src/webapp/tests/lib/README
    M src/webapp/tests/lib/qunit/VERSION
    M src/webapp/tests/lib/qunit/addons/composite/index.html
    M src/webapp/tests/lib/qunit/addons/composite/qunit-composite.js
    M src/webapp/tests/lib/qunit/css/qunit.css
    M src/webapp/tests/lib/qunit/js/qunit.js

  Log Message:
  -----------
  FLUID-4924: merged with upstream/master


  Commit: 7914f25c08732543496847dc5ef7afd0b44afe55
      https://github.com/fluid-project/infusion/commit/7914f25c08732543496847dc5ef7afd0b44afe55
  Author: kaspermarkus <kasper2 at markus.dk>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    M src/webapp/framework/core/js/ModelTransformations.js

  Log Message:
  -----------
  FLUID-4924: JSLinted the ModelTransfromations file


  Commit: e132b228f3d6a9da5974dbb3701189b14055c319
      https://github.com/fluid-project/infusion/commit/e132b228f3d6a9da5974dbb3701189b14055c319
  Author: kaspermarkus <kasper2 at markus.dk>
  Date:   2013-03-20 (Wed, 20 Mar 2013)

  Changed paths:
    M src/webapp/framework/core/js/ModelTransformations.js

  Log Message:
  -----------
  GPII-4924: Fixed minor issue with ArrayToOUtputs, where a fluid.error would be thrown if no input was found at path or given as value


  Commit: 04efd6535df057093cb6c2eed7fd1f50d72631eb
      https://github.com/fluid-project/infusion/commit/04efd6535df057093cb6c2eed7fd1f50d72631eb
  Author: Kasper Markus <kasper2 at markus.dk>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

  Changed paths:
    M src/webapp/components/reorderer/js/Reorderer.js
    A src/webapp/components/uiOptions/js/Enactors.js
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    A src/webapp/components/uiOptions/js/ModelRelay.js
    M src/webapp/components/uiOptions/js/UIEnhancer.js
    M src/webapp/components/uiOptions/uiOptionsDependencies.json
    M src/webapp/demos/uiOptions/html/uiOptions.html
    M src/webapp/demos/uiOptions/html/uiOptionsFullWithPreview.html
    M src/webapp/demos/uiOptions/html/uiOptionsFullWithoutPreview.html
    M src/webapp/demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/framework/core/js/DataBinding.js
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/framework/enhancement/js/ProgressiveEnhancement.js
    M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
    M src/webapp/integration-demos/uportal/html/portal.html
    M src/webapp/integration-demos/uportal/js/portal.js
    A src/webapp/tests/component-tests/uiOptions/html/Enactors-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullNoPreviewUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullPreviewUIOptions-test.html
    A src/webapp/tests/component-tests/uiOptions/html/ModelRelay-test.html
    A src/webapp/tests/component-tests/uiOptions/html/PageEnhancer-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html
    A src/webapp/tests/component-tests/uiOptions/js/EnactorsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/FullPreviewUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    A src/webapp/tests/component-tests/uiOptions/js/ModelRelayTests.js
    A src/webapp/tests/component-tests/uiOptions/js/PageEnhancerTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js
    M src/webapp/tests/component-tests/uploader/html/DemoUploadManager-test.html
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
    M src/webapp/tests/framework-tests/core/js/FluidJSTests.js
    M src/webapp/tests/test-core/testTests/html/Testing-test.html
    M src/webapp/tests/test-core/testTests/js/TestingTests.js
    M src/webapp/tests/test-core/utils/js/IoCTestUtils.js

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into transformations


  Commit: f8b288820995d0b7fcf3479c528083eef6ff6ce6
      https://github.com/fluid-project/infusion/commit/f8b288820995d0b7fcf3479c528083eef6ff6ce6
  Author: kaspermarkus <kasper2 at markus.dk>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M src/webapp/framework/core/js/ModelTransformations.js
    M src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js

  Log Message:
  -----------
  SP-45: Added rounding function required by the C4A work.


  Commit: 9aef441e3ea67c7c4fe8b0d28ee3a92c25e011c6
      https://github.com/fluid-project/infusion/commit/9aef441e3ea67c7c4fe8b0d28ee3a92c25e011c6
  Author: Kasper Markus <kasper2 at markus.dk>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M ReleaseNotes.txt
    M build-scripts/build.properties
    M src/webapp/components/inlineEdit/js/InlineEdit.js
    M src/webapp/components/inlineEdit/js/InlineEditIntegrations.js
    M src/webapp/components/progress/js/Progress.js
    M src/webapp/components/reorderer/js/Reorderer.js
    M src/webapp/components/tooltip/js/Tooltip.js
    M src/webapp/components/uiOptions/css/FatPanelUIOptions.css
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/css/UIOptions.css
    A src/webapp/components/uiOptions/css/ie8.css
    A src/webapp/components/uiOptions/fonts/InfusionIcons-UIOptions.eot
    A src/webapp/components/uiOptions/fonts/InfusionIcons-UIOptions.ttf
    M src/webapp/components/uiOptions/html/FatPanelUIOptions.html
    M src/webapp/components/uiOptions/html/FatPanelUIOptionsFrame.html
    M src/webapp/components/uiOptions/html/FullNoPreviewUIOptions.html
    M src/webapp/components/uiOptions/html/FullPreviewUIOptions.html
    A src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-layout.html
    A src/webapp/components/uiOptions/html/UIOptionsTemplate-lineSpacer.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-links.html
    R src/webapp/components/uiOptions/html/UIOptionsTemplate-text.html
    A src/webapp/components/uiOptions/html/UIOptionsTemplate-textFont.html
    A src/webapp/components/uiOptions/html/UIOptionsTemplate-textSizer.html
    R src/webapp/components/uiOptions/images/bw/uio_icon_bigA_hc_20x20.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_layoutandnavigation_hcInverted_16x16.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_layoutandnavigation_hc_16x16.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_layoutandnavigation_hc_18x18.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_linesNarrow_hc_16x12.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_linesWide_hc_16x21.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_linksandbuttons_hcInverted_16x16.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_linksandbuttons_hc_16x16.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_linksandbuttons_hc_18x18.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_reset_hcInverted_16x16.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_smallA_hc_10x10.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_textanddisplay_hcInverted_16x16.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_textanddisplay_hc_16x16.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_textanddisplay_hc_18x18.png
    R src/webapp/components/uiOptions/images/by/uio_icon_bigA_blackYellow_20x20.png
    R src/webapp/components/uiOptions/images/by/uio_icon_layoutandnavigation_blackYellowInverted_16x16.png
    R src/webapp/components/uiOptions/images/by/uio_icon_layoutandnavigation_blackYellow_16x16.png
    R src/webapp/components/uiOptions/images/by/uio_icon_layoutandnavigation_blackYellow_18x18.png
    R src/webapp/components/uiOptions/images/by/uio_icon_linesNarrow_blackYellow_16x12.png
    R src/webapp/components/uiOptions/images/by/uio_icon_linesWide_blackYellow_16x21.png
    R src/webapp/components/uiOptions/images/by/uio_icon_linksandbuttons_blackYellowInverted_16x16.png
    R src/webapp/components/uiOptions/images/by/uio_icon_linksandbuttons_blackYellow_16x16.png
    R src/webapp/components/uiOptions/images/by/uio_icon_linksandbuttons_blackYellow_18x18.png
    R src/webapp/components/uiOptions/images/by/uio_icon_reset_blackYellowInverted_16x16.png
    R src/webapp/components/uiOptions/images/by/uio_icon_smallA_blackYellow_10x10.png
    R src/webapp/components/uiOptions/images/by/uio_icon_textanddisplay_blackYellowInverted_16x16.png
    R src/webapp/components/uiOptions/images/by/uio_icon_textanddisplay_blackYellow_16x16.png
    R src/webapp/components/uiOptions/images/by/uio_icon_textanddisplay_blackYellow_18x18.png
    A src/webapp/components/uiOptions/images/default/fatpanelbg.png
    R src/webapp/components/uiOptions/images/default/uio_icon_bigA_default_20x20.png
    R src/webapp/components/uiOptions/images/default/uio_icon_layoutandnavigation_defaultInverted_16x16.png
    R src/webapp/components/uiOptions/images/default/uio_icon_layoutandnavigation_default_16x16.png
    R src/webapp/components/uiOptions/images/default/uio_icon_layoutandnavigation_default_18x18.png
    R src/webapp/components/uiOptions/images/default/uio_icon_linesNarrow_default_16x12.png
    R src/webapp/components/uiOptions/images/default/uio_icon_linesWide_default_16x21.png
    R src/webapp/components/uiOptions/images/default/uio_icon_linksandbuttons_defaultInverted_16x16.png
    R src/webapp/components/uiOptions/images/default/uio_icon_linksandbuttons_default_16x16.png
    R src/webapp/components/uiOptions/images/default/uio_icon_linksandbuttons_default_18x18.png
    R src/webapp/components/uiOptions/images/default/uio_icon_reset_defaultInverted_16x16.png
    R src/webapp/components/uiOptions/images/default/uio_icon_sliderhandle.png
    R src/webapp/components/uiOptions/images/default/uio_icon_smallA_default_10x10.png
    R src/webapp/components/uiOptions/images/default/uio_icon_textanddisplay_defaultInverted_16x16.png
    R src/webapp/components/uiOptions/images/default/uio_icon_textanddisplay_default_16x16.png
    R src/webapp/components/uiOptions/images/default/uio_icon_textanddisplay_default_18x18.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_bigA_hci_20x20.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_layoutandnavigation_hciInverted_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_layoutandnavigation_hci_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_layoutandnavigation_hci_18x18.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_linesNarrow_hci_16x12.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_linesWide_hci_16x21.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_linksandbuttons_hciInverted_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_linksandbuttons_hci_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_linksandbuttons_hci_18x18.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_reset_hciInverted_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_smallA_hci_10x10.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_textanddisplay_hciInverted_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_textanddisplay_hci_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_textanddisplay_hci_18x18.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_bigA_yellowBlack_20x20.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_layoutandnavigation_yellowBlackInverted_16x16.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_layoutandnavigation_yellowBlack_16x16.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_layoutandnavigation_yellowBlack_18x18.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_linesNarrow_yellowBlack_16x12.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_linesWide_yellowBlack_16x21.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_linksandbuttons_yellowBlackInverted_16x16.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_linksandbuttons_yellowBlack_16x16.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_linksandbuttons_yellowBlack_18x18.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_reset_yellowBlackInverted_16x16.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_smallA_yellowBlack_10x10.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_textanddisplay_yellowBlackInverted_16x16.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_textanddisplay_yellowBlack_16x16.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_textanddisplay_yellowBlack_18x18.png
    A src/webapp/components/uiOptions/js/Enactor.js
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/FullNoPreviewUIOptions.js
    M src/webapp/components/uiOptions/js/FullPreviewUIOptions.js
    A src/webapp/components/uiOptions/js/ModelRelay.js
    A src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/components/uiOptions/js/Store.js
    A src/webapp/components/uiOptions/js/TextfieldSlider.js
    M src/webapp/components/uiOptions/js/UIEnhancer.js
    M src/webapp/components/uiOptions/js/UIOptions.js
    A src/webapp/components/uiOptions/js/i18n.js
    M src/webapp/components/uiOptions/uiOptionsDependencies.json
    M src/webapp/components/undo/js/Undo.js
    M src/webapp/components/uploader/js/DemoUploadManager.js
    M src/webapp/components/uploader/js/FileQueueView.js
    M src/webapp/components/uploader/js/Flash9UploaderSupport.js
    M src/webapp/components/uploader/js/FlashUploaderSupport.js
    M src/webapp/components/uploader/js/HTML5UploaderSupport.js
    M src/webapp/components/uploader/js/Uploader.js
    M src/webapp/demos/inlineEdit/rich/html/inlineEdit.html
    M src/webapp/demos/inlineEdit/simple/html/inlineEdit.html
    M src/webapp/demos/progress/html/progress.html
    R src/webapp/demos/uiOptions/css/UIOptionsFullPage.css
    M src/webapp/demos/uiOptions/css/uiOptions.css
    R src/webapp/demos/uiOptions/html/UIOptionsPreview.html
    M src/webapp/demos/uiOptions/html/uiOptions.html
    R src/webapp/demos/uiOptions/html/uiOptionsFullWithPreview.html
    R src/webapp/demos/uiOptions/html/uiOptionsFullWithoutPreview.html
    M src/webapp/demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/framework/core/js/DataBinding.js
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/framework/core/js/FluidView.js
    M src/webapp/framework/enhancement/js/ProgressiveEnhancement.js
    M src/webapp/framework/renderer/js/RendererUtilities.js
    M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
    M src/webapp/integration-demos/uportal/html/portal.html
    M src/webapp/integration-demos/uportal/js/portal.js
    A src/webapp/lib/fonts/OpenSans-LICENSE.txt
    A src/webapp/lib/fonts/OpenSans-Light.ttf
    A src/webapp/lib/fonts/OpenSans-Regular.ttf
    A src/webapp/lib/fonts/OpenSans-Semibold.ttf
    A src/webapp/lib/fonts/fontsDependencies.json
    A src/webapp/lib/jquery/plugins/touchPunch/jQueryTouchPunchPluginDependencies.json
    A src/webapp/lib/jquery/plugins/touchPunch/js/jquery.ui.touch-punch.js
    M src/webapp/tests/all-tests.html
    M src/webapp/tests/component-tests/inlineEdit/js/InlineEditTests.js
    M src/webapp/tests/component-tests/progress/html/Progress-test.html
    M src/webapp/tests/component-tests/progress/js/ProgressTests.js
    M src/webapp/tests/component-tests/reorderer/js/ImageReordererTests.js
    M src/webapp/tests/component-tests/tooltip/html/Tooltip-test.html
    M src/webapp/tests/component-tests/tooltip/js/TooltipTests.js
    A src/webapp/tests/component-tests/uiOptions/all-tests.html
    A src/webapp/tests/component-tests/uiOptions/html/Enactor-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullNoPreviewUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullPreviewUIOptions-test.html
    A src/webapp/tests/component-tests/uiOptions/html/I18n-test.html
    A src/webapp/tests/component-tests/uiOptions/html/ModelRelay-test.html
    A src/webapp/tests/component-tests/uiOptions/html/PageEnhancer-test.html
    A src/webapp/tests/component-tests/uiOptions/html/SettingsPanels-test.html
    M src/webapp/tests/component-tests/uiOptions/html/TextfieldSlider-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html
    A src/webapp/tests/component-tests/uiOptions/js/EnactorTests.js
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/FullPreviewUIOptionsTests.js
    A src/webapp/tests/component-tests/uiOptions/js/I18nTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    A src/webapp/tests/component-tests/uiOptions/js/ModelRelayTests.js
    A src/webapp/tests/component-tests/uiOptions/js/PageEnhancerTests.js
    A src/webapp/tests/component-tests/uiOptions/js/SettingsPanelsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/StoreTests.js
    M src/webapp/tests/component-tests/uiOptions/js/TextfieldSliderTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js
    M src/webapp/tests/component-tests/uploader/html/DemoUploadManager-test.html
    M src/webapp/tests/component-tests/uploader/html/SWFUploadManager-test.html
    M src/webapp/tests/component-tests/uploader/js/DemoUploadManagerTests.js
    M src/webapp/tests/component-tests/uploader/js/FileQueueViewTests.js
    M src/webapp/tests/component-tests/uploader/js/HTML5UploaderSupportTests.js
    M src/webapp/tests/component-tests/uploader/js/SWFUploadManagerTests.js
    M src/webapp/tests/component-tests/uploader/js/UploaderCompatibilityTests.js
    M src/webapp/tests/component-tests/uploader/js/UploaderTestUtilities.js
    M src/webapp/tests/component-tests/uploader/js/UploaderTests.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
    M src/webapp/tests/framework-tests/core/js/FluidJSTests.js
    M src/webapp/tests/framework-tests/renderer/js/RendererUtilitiesTests.js
    M src/webapp/tests/manual-tests/ReadMe.txt
    A src/webapp/tests/manual-tests/css/UIOptionsFullPage.css
    M src/webapp/tests/manual-tests/html/SomeKindOfNews.html
    M src/webapp/tests/manual-tests/html/dropdown.html
    A src/webapp/tests/manual-tests/html/uiOptionsFullWithPreview.html
    A src/webapp/tests/manual-tests/html/uiOptionsFullWithoutPreview.html
    A src/webapp/tests/manual-tests/html/uiOptionsPreview.html
    M src/webapp/tests/manual-tests/js/someKindOfNews.js
    A src/webapp/tests/manual-tests/js/uiOptionsFullPage.js
    M src/webapp/tests/test-core/jqUnit/js/jqUnit-browser.js
    M src/webapp/tests/test-core/jqUnit/js/jqUnit.js
    M src/webapp/tests/test-core/testTests/html/Testing-test.html
    M src/webapp/tests/test-core/testTests/js/TestingTests.js
    M src/webapp/tests/test-core/utils/js/IoCTestUtils.js

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into transformationWork


  Commit: daf6dc871c78e97e295ee0aae05dbd101e84e3b0
      https://github.com/fluid-project/infusion/commit/daf6dc871c78e97e295ee0aae05dbd101e84e3b0
  Author: Kasper Markus <kasper2 at markus.dk>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M src/webapp/framework/core/frameworkDependencies.json
    R src/webapp/framework/core/js/ModelTransformationUtils.js
    M src/webapp/framework/core/js/ModelTransformations.js
    A src/webapp/framework/core/js/ModelTransformationsExpanders.js

  Log Message:
  -----------
  GPII-113: Renamed files according to Antranigs comment and fixed spacing next to binary operators


  Commit: c6fcd6d239e40b4cc035786f0f59c338075b02b8
      https://github.com/fluid-project/infusion/commit/c6fcd6d239e40b4cc035786f0f59c338075b02b8
  Author: Kasper Markus <kasper2 at markus.dk>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M src/webapp/framework/core/js/ModelTransformations.js
    M src/webapp/tests/framework-tests/core/html/ModelTransformations-test.html

  Log Message:
  -----------
  GPII-113: updated references to renamed files


  Commit: 1a4d3deccd3d3eec7032cb2ee7eef3ee207387cd
      https://github.com/fluid-project/infusion/commit/1a4d3deccd3d3eec7032cb2ee7eef3ee207387cd
  Author: Kasper Markus <kasper2 at markus.dk>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Changed paths:
    M src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js

  Log Message:
  -----------
  GPII-113: Jslint'ed the test file


  Commit: 4413fc78898e0e7f00a013b11d00a6bacd4d2660
      https://github.com/fluid-project/infusion/commit/4413fc78898e0e7f00a013b11d00a6bacd4d2660
  Author: Kasper Markus <kasper2 at markus.dk>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Changed paths:
    M src/webapp/framework/core/js/ModelTransformations.js
    M src/webapp/framework/core/js/ModelTransformationsExpanders.js
    M src/webapp/tests/component-tests/uploader/html/UploaderCompatibility-test.html

  Log Message:
  -----------
  GPII-113: jslinted everything, fixed a code weirdness where I checked for null in conditional expanders


  Commit: d1c3a4133508ebdbff50ffd97ec0a532c98ba9dc
      https://github.com/fluid-project/infusion/commit/d1c3a4133508ebdbff50ffd97ec0a532c98ba9dc
  Author: Kasper Markus <kasper2 at markus.dk>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Changed paths:
    M ReleaseNotes.txt
    M build-scripts/build.properties
    M src/webapp/components/inlineEdit/js/InlineEdit.js
    M src/webapp/components/inlineEdit/js/InlineEditIntegrations.js
    M src/webapp/components/progress/js/Progress.js
    M src/webapp/components/reorderer/js/Reorderer.js
    M src/webapp/components/tooltip/js/Tooltip.js
    M src/webapp/components/uiOptions/css/FatPanelUIOptions.css
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/css/UIOptions.css
    A src/webapp/components/uiOptions/css/ie8.css
    A src/webapp/components/uiOptions/fonts/InfusionIcons-UIOptions.eot
    A src/webapp/components/uiOptions/fonts/InfusionIcons-UIOptions.ttf
    M src/webapp/components/uiOptions/html/FatPanelUIOptions.html
    M src/webapp/components/uiOptions/html/FatPanelUIOptionsFrame.html
    M src/webapp/components/uiOptions/html/FullNoPreviewUIOptions.html
    M src/webapp/components/uiOptions/html/FullPreviewUIOptions.html
    A src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-layout.html
    A src/webapp/components/uiOptions/html/UIOptionsTemplate-lineSpacer.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-links.html
    R src/webapp/components/uiOptions/html/UIOptionsTemplate-text.html
    A src/webapp/components/uiOptions/html/UIOptionsTemplate-textFont.html
    A src/webapp/components/uiOptions/html/UIOptionsTemplate-textSizer.html
    R src/webapp/components/uiOptions/images/bw/uio_icon_bigA_hc_20x20.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_layoutandnavigation_hcInverted_16x16.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_layoutandnavigation_hc_16x16.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_layoutandnavigation_hc_18x18.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_linesNarrow_hc_16x12.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_linesWide_hc_16x21.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_linksandbuttons_hcInverted_16x16.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_linksandbuttons_hc_16x16.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_linksandbuttons_hc_18x18.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_reset_hcInverted_16x16.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_smallA_hc_10x10.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_textanddisplay_hcInverted_16x16.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_textanddisplay_hc_16x16.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_textanddisplay_hc_18x18.png
    R src/webapp/components/uiOptions/images/by/uio_icon_bigA_blackYellow_20x20.png
    R src/webapp/components/uiOptions/images/by/uio_icon_layoutandnavigation_blackYellowInverted_16x16.png
    R src/webapp/components/uiOptions/images/by/uio_icon_layoutandnavigation_blackYellow_16x16.png
    R src/webapp/components/uiOptions/images/by/uio_icon_layoutandnavigation_blackYellow_18x18.png
    R src/webapp/components/uiOptions/images/by/uio_icon_linesNarrow_blackYellow_16x12.png
    R src/webapp/components/uiOptions/images/by/uio_icon_linesWide_blackYellow_16x21.png
    R src/webapp/components/uiOptions/images/by/uio_icon_linksandbuttons_blackYellowInverted_16x16.png
    R src/webapp/components/uiOptions/images/by/uio_icon_linksandbuttons_blackYellow_16x16.png
    R src/webapp/components/uiOptions/images/by/uio_icon_linksandbuttons_blackYellow_18x18.png
    R src/webapp/components/uiOptions/images/by/uio_icon_reset_blackYellowInverted_16x16.png
    R src/webapp/components/uiOptions/images/by/uio_icon_smallA_blackYellow_10x10.png
    R src/webapp/components/uiOptions/images/by/uio_icon_textanddisplay_blackYellowInverted_16x16.png
    R src/webapp/components/uiOptions/images/by/uio_icon_textanddisplay_blackYellow_16x16.png
    R src/webapp/components/uiOptions/images/by/uio_icon_textanddisplay_blackYellow_18x18.png
    A src/webapp/components/uiOptions/images/default/fatpanelbg.png
    R src/webapp/components/uiOptions/images/default/uio_icon_bigA_default_20x20.png
    R src/webapp/components/uiOptions/images/default/uio_icon_layoutandnavigation_defaultInverted_16x16.png
    R src/webapp/components/uiOptions/images/default/uio_icon_layoutandnavigation_default_16x16.png
    R src/webapp/components/uiOptions/images/default/uio_icon_layoutandnavigation_default_18x18.png
    R src/webapp/components/uiOptions/images/default/uio_icon_linesNarrow_default_16x12.png
    R src/webapp/components/uiOptions/images/default/uio_icon_linesWide_default_16x21.png
    R src/webapp/components/uiOptions/images/default/uio_icon_linksandbuttons_defaultInverted_16x16.png
    R src/webapp/components/uiOptions/images/default/uio_icon_linksandbuttons_default_16x16.png
    R src/webapp/components/uiOptions/images/default/uio_icon_linksandbuttons_default_18x18.png
    R src/webapp/components/uiOptions/images/default/uio_icon_reset_defaultInverted_16x16.png
    R src/webapp/components/uiOptions/images/default/uio_icon_sliderhandle.png
    R src/webapp/components/uiOptions/images/default/uio_icon_smallA_default_10x10.png
    R src/webapp/components/uiOptions/images/default/uio_icon_textanddisplay_defaultInverted_16x16.png
    R src/webapp/components/uiOptions/images/default/uio_icon_textanddisplay_default_16x16.png
    R src/webapp/components/uiOptions/images/default/uio_icon_textanddisplay_default_18x18.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_bigA_hci_20x20.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_layoutandnavigation_hciInverted_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_layoutandnavigation_hci_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_layoutandnavigation_hci_18x18.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_linesNarrow_hci_16x12.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_linesWide_hci_16x21.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_linksandbuttons_hciInverted_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_linksandbuttons_hci_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_linksandbuttons_hci_18x18.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_reset_hciInverted_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_smallA_hci_10x10.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_textanddisplay_hciInverted_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_textanddisplay_hci_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_textanddisplay_hci_18x18.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_bigA_yellowBlack_20x20.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_layoutandnavigation_yellowBlackInverted_16x16.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_layoutandnavigation_yellowBlack_16x16.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_layoutandnavigation_yellowBlack_18x18.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_linesNarrow_yellowBlack_16x12.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_linesWide_yellowBlack_16x21.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_linksandbuttons_yellowBlackInverted_16x16.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_linksandbuttons_yellowBlack_16x16.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_linksandbuttons_yellowBlack_18x18.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_reset_yellowBlackInverted_16x16.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_smallA_yellowBlack_10x10.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_textanddisplay_yellowBlackInverted_16x16.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_textanddisplay_yellowBlack_16x16.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_textanddisplay_yellowBlack_18x18.png
    A src/webapp/components/uiOptions/js/Enactor.js
    R src/webapp/components/uiOptions/js/Enactors.js
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/FullNoPreviewUIOptions.js
    M src/webapp/components/uiOptions/js/FullPreviewUIOptions.js
    M src/webapp/components/uiOptions/js/ModelRelay.js
    A src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/components/uiOptions/js/Store.js
    A src/webapp/components/uiOptions/js/TextfieldSlider.js
    M src/webapp/components/uiOptions/js/UIEnhancer.js
    M src/webapp/components/uiOptions/js/UIOptions.js
    A src/webapp/components/uiOptions/js/i18n.js
    M src/webapp/components/uiOptions/uiOptionsDependencies.json
    M src/webapp/components/undo/js/Undo.js
    M src/webapp/components/uploader/js/DemoUploadManager.js
    M src/webapp/components/uploader/js/FileQueueView.js
    M src/webapp/components/uploader/js/Flash9UploaderSupport.js
    M src/webapp/components/uploader/js/FlashUploaderSupport.js
    M src/webapp/components/uploader/js/HTML5UploaderSupport.js
    M src/webapp/components/uploader/js/Uploader.js
    M src/webapp/demos/inlineEdit/rich/html/inlineEdit.html
    M src/webapp/demos/inlineEdit/simple/html/inlineEdit.html
    M src/webapp/demos/progress/html/progress.html
    R src/webapp/demos/uiOptions/css/UIOptionsFullPage.css
    M src/webapp/demos/uiOptions/css/uiOptions.css
    R src/webapp/demos/uiOptions/html/UIOptionsPreview.html
    M src/webapp/demos/uiOptions/html/uiOptions.html
    R src/webapp/demos/uiOptions/html/uiOptionsFullWithPreview.html
    R src/webapp/demos/uiOptions/html/uiOptionsFullWithoutPreview.html
    M src/webapp/demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/framework/core/frameworkDependencies.json
    M src/webapp/framework/core/js/DataBinding.js
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/framework/core/js/FluidView.js
    R src/webapp/framework/core/js/ModelTransformationUtils.js
    M src/webapp/framework/core/js/ModelTransformations.js
    A src/webapp/framework/core/js/ModelTransformationsExpanders.js
    M src/webapp/framework/renderer/js/RendererUtilities.js
    M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
    M src/webapp/integration-demos/uportal/html/portal.html
    M src/webapp/integration-demos/uportal/js/portal.js
    A src/webapp/lib/fonts/OpenSans-LICENSE.txt
    A src/webapp/lib/fonts/OpenSans-Light.ttf
    A src/webapp/lib/fonts/OpenSans-Regular.ttf
    A src/webapp/lib/fonts/OpenSans-Semibold.ttf
    A src/webapp/lib/fonts/fontsDependencies.json
    A src/webapp/lib/jquery/plugins/touchPunch/jQueryTouchPunchPluginDependencies.json
    A src/webapp/lib/jquery/plugins/touchPunch/js/jquery.ui.touch-punch.js
    M src/webapp/tests/all-tests.html
    M src/webapp/tests/component-tests/inlineEdit/js/InlineEditTests.js
    M src/webapp/tests/component-tests/progress/html/Progress-test.html
    M src/webapp/tests/component-tests/progress/js/ProgressTests.js
    M src/webapp/tests/component-tests/reorderer/js/ImageReordererTests.js
    M src/webapp/tests/component-tests/tooltip/html/Tooltip-test.html
    M src/webapp/tests/component-tests/tooltip/js/TooltipTests.js
    A src/webapp/tests/component-tests/uiOptions/all-tests.html
    A src/webapp/tests/component-tests/uiOptions/html/Enactor-test.html
    R src/webapp/tests/component-tests/uiOptions/html/Enactors-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullNoPreviewUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullPreviewUIOptions-test.html
    A src/webapp/tests/component-tests/uiOptions/html/I18n-test.html
    M src/webapp/tests/component-tests/uiOptions/html/ModelRelay-test.html
    M src/webapp/tests/component-tests/uiOptions/html/PageEnhancer-test.html
    A src/webapp/tests/component-tests/uiOptions/html/SettingsPanels-test.html
    M src/webapp/tests/component-tests/uiOptions/html/TextfieldSlider-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html
    A src/webapp/tests/component-tests/uiOptions/js/EnactorTests.js
    R src/webapp/tests/component-tests/uiOptions/js/EnactorsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/FullPreviewUIOptionsTests.js
    A src/webapp/tests/component-tests/uiOptions/js/I18nTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    M src/webapp/tests/component-tests/uiOptions/js/PageEnhancerTests.js
    A src/webapp/tests/component-tests/uiOptions/js/SettingsPanelsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/StoreTests.js
    M src/webapp/tests/component-tests/uiOptions/js/TextfieldSliderTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js
    M src/webapp/tests/component-tests/uploader/html/SWFUploadManager-test.html
    M src/webapp/tests/component-tests/uploader/html/UploaderCompatibility-test.html
    M src/webapp/tests/component-tests/uploader/js/DemoUploadManagerTests.js
    M src/webapp/tests/component-tests/uploader/js/FileQueueViewTests.js
    M src/webapp/tests/component-tests/uploader/js/HTML5UploaderSupportTests.js
    M src/webapp/tests/component-tests/uploader/js/SWFUploadManagerTests.js
    M src/webapp/tests/component-tests/uploader/js/UploaderCompatibilityTests.js
    M src/webapp/tests/component-tests/uploader/js/UploaderTestUtilities.js
    M src/webapp/tests/component-tests/uploader/js/UploaderTests.js
    M src/webapp/tests/framework-tests/core/html/ModelTransformations-test.html
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
    M src/webapp/tests/framework-tests/core/js/FluidJSTests.js
    M src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js
    M src/webapp/tests/framework-tests/renderer/js/RendererUtilitiesTests.js
    M src/webapp/tests/manual-tests/ReadMe.txt
    A src/webapp/tests/manual-tests/css/UIOptionsFullPage.css
    M src/webapp/tests/manual-tests/html/SomeKindOfNews.html
    M src/webapp/tests/manual-tests/html/dropdown.html
    A src/webapp/tests/manual-tests/html/uiOptionsFullWithPreview.html
    A src/webapp/tests/manual-tests/html/uiOptionsFullWithoutPreview.html
    A src/webapp/tests/manual-tests/html/uiOptionsPreview.html
    M src/webapp/tests/manual-tests/js/someKindOfNews.js
    A src/webapp/tests/manual-tests/js/uiOptionsFullPage.js
    M src/webapp/tests/test-core/jqUnit/js/jqUnit-browser.js
    M src/webapp/tests/test-core/jqUnit/js/jqUnit.js
    M src/webapp/tests/test-core/testTests/js/TestingTests.js

  Log Message:
  -----------
  Merge branch 'transformationWork' into transformations


  Commit: 2ff3110ac327b7d1c7af35bd15d20bb627bcc3e5
      https://github.com/fluid-project/infusion/commit/2ff3110ac327b7d1c7af35bd15d20bb627bcc3e5
  Author: Kasper Markus <kasper2 at markus.dk>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Changed paths:
    M src/webapp/module/includes.json

  Log Message:
  -----------
  GPII-113: forgot to update the includes.json to the new filename... everythnig should be in order now


  Commit: 259362585c5460345fc11989edca8d2a27495734
      https://github.com/fluid-project/infusion/commit/259362585c5460345fc11989edca8d2a27495734
  Author: kaspermarkus <kasper2 at markus.dk>
  Date:   2013-06-25 (Tue, 25 Jun 2013)

  Changed paths:
    M src/webapp/components/uploader/ReadMe.txt
    M src/webapp/framework/core/frameworkDependencies.json
    A src/webapp/framework/core/js/ModelTransformation.js
    A src/webapp/framework/core/js/ModelTransformationTransforms.js
    R src/webapp/framework/core/js/ModelTransformations.js
    R src/webapp/framework/core/js/ModelTransformationsExpanders.js
    M src/webapp/module/includes.json
    M src/webapp/tests/all-tests.html
    M src/webapp/tests/component-tests/uploader/html/UploaderCompatibility-test.html
    A src/webapp/tests/framework-tests/core/html/ModelTransformation-test.html
    R src/webapp/tests/framework-tests/core/html/ModelTransformations-test.html
    A src/webapp/tests/framework-tests/core/js/ModelTransformationTests.js
    R src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js

  Log Message:
  -----------
  GPII-113: Renamed InputsToArray and ArrayToOutputs to names suggested by antranig. Added default values to presentValue and missingValue to those two functions as well (true and false, respectively. Renamed the ModelTransformation files to singular transformation, and furthermore renamed modelTransformationExpander to ModelTransformaionTransforms. removed usage of fluid.merge.


  Commit: c1002ecc714662b1b43e13261453ed0ecb6602b8
      https://github.com/fluid-project/infusion/commit/c1002ecc714662b1b43e13261453ed0ecb6602b8
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M ReleaseNotes.txt
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/css/FullUIOptions.css
    M src/webapp/components/uiOptions/css/UIOptions.css
    M src/webapp/components/uiOptions/html/FatPanelUIOptions.html
    M src/webapp/components/uiOptions/html/FullNoPreviewUIOptions.html
    M src/webapp/components/uiOptions/html/FullPreviewUIOptions.html
    A src/webapp/components/uiOptions/html/UIOptionsTemplate-lineSpace.html
    R src/webapp/components/uiOptions/html/UIOptionsTemplate-lineSpacer.html
    A src/webapp/components/uiOptions/html/UIOptionsTemplate-textSize.html
    R src/webapp/components/uiOptions/html/UIOptionsTemplate-textSizer.html
    R src/webapp/components/uiOptions/images/bw/uio_icon_cancel_hc_13x13.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_save_hc_13x13.png
    R src/webapp/components/uiOptions/images/by/uio_icon_cancel_blackYellow_13x13.png
    R src/webapp/components/uiOptions/images/by/uio_icon_save_blackYellow_13x13.png
    R src/webapp/components/uiOptions/images/default/uio_icon_cancel_default_13x13.png
    R src/webapp/components/uiOptions/images/default/uio_icon_save_default_13x13.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_cancel_hci_13x13.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_reset_hci_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_save_hci_13x13.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_cancel_yellowBlack_13x13.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_save_yellowBlack_13x13.png
    R src/webapp/components/uiOptions/js/Enactor.js
    A src/webapp/components/uiOptions/js/Enactors.js
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/FullNoPreviewUIOptions.js
    M src/webapp/components/uiOptions/js/FullPreviewUIOptions.js
    A src/webapp/components/uiOptions/js/Panels.js
    R src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/components/uiOptions/js/TextfieldSlider.js
    M src/webapp/components/uiOptions/js/UIEnhancer.js
    M src/webapp/components/uiOptions/js/UIOptions.js
    M src/webapp/components/uiOptions/js/i18n.js
    M src/webapp/components/uiOptions/uiOptionsDependencies.json
    M src/webapp/components/uploader/css/Uploader.css
    A src/webapp/components/uploader/fonts/InfusionIcons-Uploader.eot
    A src/webapp/components/uploader/fonts/InfusionIcons-Uploader.ttf
    M src/webapp/components/uploader/html/Uploader.html
    M src/webapp/components/uploader/js/DemoUploadManager.js
    M src/webapp/components/uploader/js/FileQueueView.js
    M src/webapp/demos/uiOptions/html/uiOptions.html
    M src/webapp/demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/framework/renderer/js/fluidRenderer.js
    M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
    R src/webapp/integration-demos/uportal/css/portal.css
    R src/webapp/integration-demos/uportal/html/portal.html
    R src/webapp/integration-demos/uportal/images/application.png
    R src/webapp/integration-demos/uportal/images/application_add.png
    R src/webapp/integration-demos/uportal/images/application_edit.png
    R src/webapp/integration-demos/uportal/images/color_swatch.png
    R src/webapp/integration-demos/uportal/images/cross.png
    R src/webapp/integration-demos/uportal/images/headerbar.png
    R src/webapp/integration-demos/uportal/images/help.png
    R src/webapp/integration-demos/uportal/images/house.png
    R src/webapp/integration-demos/uportal/images/layout_content.png
    R src/webapp/integration-demos/uportal/images/locked.png
    R src/webapp/integration-demos/uportal/images/map.png
    R src/webapp/integration-demos/uportal/images/page_column_back.png
    R src/webapp/integration-demos/uportal/images/portal_logo.png
    R src/webapp/integration-demos/uportal/images/portlet_corner_bottomleft.png
    R src/webapp/integration-demos/uportal/images/portlet_corner_bottomright.png
    R src/webapp/integration-demos/uportal/images/portlet_corner_topleft.png
    R src/webapp/integration-demos/uportal/images/portlet_corner_topright.png
    R src/webapp/integration-demos/uportal/images/tab1.jpg
    R src/webapp/integration-demos/uportal/images/tab_add.png
    R src/webapp/integration-demos/uportal/images/top_light_fade.png
    R src/webapp/integration-demos/uportal/images/user.png
    R src/webapp/integration-demos/uportal/images/weather.png
    R src/webapp/integration-demos/uportal/images/zoom.png
    R src/webapp/integration-demos/uportal/js/portal.js
    A src/webapp/tests/component-tests/reorderer/html/NestedReorderer-test.html
    A src/webapp/tests/component-tests/reorderer/js/NestedReorderTests.js
    M src/webapp/tests/component-tests/uiOptions/all-tests.html
    R src/webapp/tests/component-tests/uiOptions/html/Enactor-test.html
    A src/webapp/tests/component-tests/uiOptions/html/Enactors-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullNoPreviewUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullPreviewUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/PageEnhancer-test.html
    A src/webapp/tests/component-tests/uiOptions/html/Panels-test.html
    R src/webapp/tests/component-tests/uiOptions/html/SettingsPanels-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html
    R src/webapp/tests/component-tests/uiOptions/js/EnactorTests.js
    A src/webapp/tests/component-tests/uiOptions/js/EnactorsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/FullPreviewUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    M src/webapp/tests/component-tests/uiOptions/js/PageEnhancerTests.js
    A src/webapp/tests/component-tests/uiOptions/js/PanelsTests.js
    R src/webapp/tests/component-tests/uiOptions/js/SettingsPanelsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/TextfieldSliderTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js
    M src/webapp/tests/framework-tests/core/js/CachingTests.js
    M src/webapp/tests/framework-tests/core/js/DataBindingTests.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
    M src/webapp/tests/framework-tests/core/js/FluidJSTests.js
    A src/webapp/tests/framework-tests/renderer/data/MediaPanelTemplate.html
    M src/webapp/tests/framework-tests/renderer/html/RendererUtilities-test.html
    M src/webapp/tests/framework-tests/renderer/js/RendererUtilitiesTests.js
    M src/webapp/tests/manual-tests/html/SomeKindOfNews.html
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithPreview.html
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithoutPreview.html
    M src/webapp/tests/manual-tests/js/someKindOfNews.js
    M src/webapp/tests/manual-tests/js/uiOptionsFullPage.js

  Log Message:
  -----------
  Merge branch 'master' into FLUID-5083


  Commit: 5dcf19688f53757b9808c8838e1d2aac7014baee
      https://github.com/fluid-project/infusion/commit/5dcf19688f53757b9808c8838e1d2aac7014baee
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M src/webapp/framework/core/js/ModelTransformation.js
    M src/webapp/framework/core/js/ModelTransformationTransforms.js
    M src/webapp/tests/framework-tests/core/js/ModelTransformationTests.js

  Log Message:
  -----------
  FLUID-5083: Code cleanup


  Commit: a27619d1c5b59f0d27ffad379762e5e234cf5932
      https://github.com/fluid-project/infusion/commit/a27619d1c5b59f0d27ffad379762e5e234cf5932
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M src/webapp/components/uploader/ReadMe.txt
    M src/webapp/framework/core/frameworkDependencies.json
    A src/webapp/framework/core/js/ModelTransformation.js
    A src/webapp/framework/core/js/ModelTransformationTransforms.js
    R src/webapp/framework/core/js/ModelTransformations.js
    M src/webapp/module/includes.json
    M src/webapp/tests/all-tests.html
    M src/webapp/tests/component-tests/uploader/html/UploaderCompatibility-test.html
    A src/webapp/tests/framework-tests/core/html/ModelTransformation-test.html
    R src/webapp/tests/framework-tests/core/html/ModelTransformations-test.html
    A src/webapp/tests/framework-tests/core/js/ModelTransformationTests.js
    R src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js

  Log Message:
  -----------
  Merge branch 'FLUID-5083'

* FLUID-5083: (23 commits)
  FLUID-5083: Code cleanup
  GPII-113: Renamed InputsToArray and ArrayToOutputs to names suggested by antranig. Added default values to presentValue and missingValue to those two functions as well (true and false, respectively. Renamed the ModelTransformation files to singular transformation, and furthermore renamed modelTransformationExpander to ModelTransformaionTransforms. removed usage of fluid.merge.
  GPII-113: forgot to update the includes.json to the new filename... everythnig should be in order now
  GPII-113: jslinted everything, fixed a code weirdness where I checked for null in conditional expanders
  GPII-113: Jslint'ed the test file
  GPII-113: updated references to renamed files
  GPII-113: Renamed files according to Antranigs comment and fixed spacing next to binary operators
  SP-45: Added rounding function required by the C4A work.
  GPII-4924: Fixed minor issue with ArrayToOUtputs, where a fluid.error would be thrown if no input was found at path or given as value
  FLUID-4924: JSLinted the ModelTransfromations file
  FLUID-4924: Ensured that the ordering of expandSpec and expander argument was in a consistent ordering to avoid confusing stupid people like me ... also added utils reference to uploader test so it now passes again
  FLUID-4924: Added modeltransformationutil file to required places
  FLUID-4924: Fixed issue with paths for objectToArray and arrayToObject. Added test for it
  FLUID-4924: Cleaned up the arraytoobject tets slightly and changed it so the key and input-path variables don't go into an options block. Also implemented the arraytooutputs and inputstoarray functions required by NVDA
  GPII-4924: made the binary lookup table global. Also added 'expectedInputPaths' to the testcases to be run when input path collection is supported
  GPII-4924: Moved objectToHash and hashToObject over from XML handler and fixed to be compatible with latest changes to transformer
  GPII-4924: Made collect input paths recursive and added collect input path functionality to multiInputTransformFunctions
  GPII-4924: Implemented multiInputTransformFunction and updated the relevant transformations
  GPII-4924: Implemented conditional expander with tests and deleted crazy new non-functioning test-cases from valueMapper
  GPII-4924: Save before starting work of splitting it into two files. I'm halfway through some minor improvement to the valueMapper (defaultOutputValue, ability to use value from path as the output, etc)
  ...


Compare: https://github.com/fluid-project/infusion/compare/77fa9e025196...a27619d1c5b5


More information about the Commits mailing list