[Commits] [fluid-project/infusion] db2d65: Merge branch 'master' into FLUID-4247

noreply at github.com noreply at github.com
Mon Oct 3 19:49:06 UTC 2011


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion

  Commit: db2d65821c4893f652e9e8134469c307e5a54b0c
      https://github.com/fluid-project/infusion/commit/db2d65821c4893f652e9e8134469c307e5a54b0c
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2011-10-03 (Mon, 03 Oct 2011)

  Changed paths:
    M src/webapp/components/uiOptions/js/UIEnhancer.js
  M src/webapp/framework/core/js/Fluid.js
  M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js

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


  Commit: 4b6479d4b303d67dd115c1e505dd5fa2bdff1291
      https://github.com/fluid-project/infusion/commit/4b6479d4b303d67dd115c1e505dd5fa2bdff1291
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2011-10-03 (Mon, 03 Oct 2011)

  Changed paths:
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
  M src/webapp/tests/component-tests/uiOptions/js/FullNoPreviewUIOptionsTests.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/UIEnhancerTests.js
  M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js
  M src/webapp/tests/component-tests/uiOptions/js/URLUtilitiesTests.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/UploaderTests.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/FluidJSTests.js
  M src/webapp/tests/framework-tests/core/js/FluidViewTests.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/test-core/jqUnit/js/jqUnit.js
  M src/webapp/tests/test-core/utils/js/TestUtils.js

  Log Message:
  -----------
  FLUID-4247: updating copyrights

Updated the copyrights for the js files in the tests directory.


  Commit: bbe686f874bbc4c5afe2eef54d44d9b237d12f05
      https://github.com/fluid-project/infusion/commit/bbe686f874bbc4c5afe2eef54d44d9b237d12f05
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2011-10-03 (Mon, 03 Oct 2011)

  Changed paths:
    M src/webapp/framework/core/js/Fluid.js
  M src/webapp/tests/3rd-party-tests/jQuery/js/jQueryTests.js
  M src/webapp/tests/component-tests/reorderer/js/ImageReordererTestConstants.js
  M src/webapp/tests/framework-tests/core/js/FluidJSTests.js

  Log Message:
  -----------
  FLUID-4247: Adding a couple of missing copyrights

Adding in missing copyrights for Charly Molter and John Kremer


  Commit: 4a86a6fa8cf1ab370ae90e0b9aadb5c71afacdb4
      https://github.com/fluid-project/infusion/commit/4a86a6fa8cf1ab370ae90e0b9aadb5c71afacdb4
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2011-10-03 (Mon, 03 Oct 2011)

  Changed paths:
    M build-scripts/lib/jscssp/LICENSE.txt
  M build-scripts/lib/jscssp/js/jscssp.js

  Log Message:
  -----------
  FLUID-4247: Adds a brief description of our modifications to JSCSSP.


  Commit: 8e7479bf6430326348e080882b961f74dbbbe95e
      https://github.com/fluid-project/infusion/commit/8e7479bf6430326348e080882b961f74dbbbe95e
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2011-10-03 (Mon, 03 Oct 2011)

  Changed paths:
    M build-scripts/lib/jscssp/LICENSE.txt
  M build-scripts/lib/jscssp/js/jscssp.js

  Log Message:
  -----------
  Merge remote-tracking branch 'colin/FLUID-4247' into FLUID-4247


  Commit: 521c4d7f6a9b26896ed334bde56e502ad07e92e7
      https://github.com/fluid-project/infusion/commit/521c4d7f6a9b26896ed334bde56e502ad07e92e7
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2011-10-03 (Mon, 03 Oct 2011)

  Changed paths:
    M build-scripts/lib/jscssp/LICENSE.txt
  M build-scripts/lib/jscssp/js/jscssp.js
  A build-scripts/lib/rhino/LICENSE.txt
  M src/webapp/components/pager/js/Pager.js
  M src/webapp/components/reorderer/js/GeometricManager.js
  M src/webapp/components/reorderer/js/ImageReorderer.js
  M src/webapp/components/reorderer/js/Reorderer.js
  M src/webapp/components/tableOfContents/js/TableOfContents.js
  M src/webapp/components/tabs/js/Tabs.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/SlidingPanel.js
  M src/webapp/components/uiOptions/js/Store.js
  M src/webapp/components/uiOptions/js/UIEnhancer.js
  M src/webapp/components/uiOptions/js/UIOptions.js
  M src/webapp/components/uiOptions/js/URLUtilities.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/MimeTypeExtensions.js
  M src/webapp/components/uploader/js/Uploader.js
  M src/webapp/components/uploader/js/UploaderCompatibility-Infusion1.2.js
  M src/webapp/demos/fss/linearize/js/linearizeDemo.js
  A src/webapp/demos/lib/chili/chili-LICENSE.txt
  M src/webapp/demos/pager/js/pagerDemo.js
  M src/webapp/demos/portal/js/demoAssets.js
  M src/webapp/demos/progress/js/progressDemo.js
  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/FluidDebugging.js
  M src/webapp/framework/core/js/FluidDocument.js
  M src/webapp/framework/core/js/FluidIoC.js
  M src/webapp/framework/core/js/FluidRequests.js
  M src/webapp/framework/core/js/jquery.keyboard-a11y.js
  M src/webapp/framework/enhancement/js/ProgressiveEnhancement.js
  M src/webapp/integration-demos/uportal/js/portal.js
  M src/webapp/tests/3rd-party-tests/jQuery/js/jQueryTests.js
  M src/webapp/tests/component-tests/reorderer/js/ImageReordererTestConstants.js
  M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
  M src/webapp/tests/component-tests/uiOptions/js/FullNoPreviewUIOptionsTests.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/UIEnhancerTests.js
  M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js
  M src/webapp/tests/component-tests/uiOptions/js/URLUtilitiesTests.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/UploaderTests.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/FluidJSTests.js
  M src/webapp/tests/framework-tests/core/js/FluidViewTests.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/test-core/jqUnit/js/jqUnit.js
  M src/webapp/tests/test-core/utils/js/TestUtils.js

  Log Message:
  -----------
  Merge remote-tracking branch 'jobara/FLUID-4247'

* jobara/FLUID-4247:
  FLUID-4247: Adds a brief description of our modifications to JSCSSP.
  FLUID-4247: Adding a couple of missing copyrights
  FLUID-4247: updating copyrights
  FLUID-4247: Start of license and copyright update


Compare: https://github.com/fluid-project/infusion/compare/93d9c88...521c4d7


More information about the Commits mailing list