[Commits] [fluid-project/infusion] 799b59: FLUID-4247: Updating a copyright in the demos

noreply at github.com noreply at github.com
Fri Jul 8 14:52:10 UTC 2011


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

  Commit: 799b59093e13e3c18bee73da6831f402359c409e
      https://github.com/fluid-project/infusion/commit/799b59093e13e3c18bee73da6831f402359c409e
  Author: Anastasia Cheetham <acheetham at ocad.ca>
  Date:   2011-07-08 (Fri, 08 Jul 2011)

  Changed paths:
    M src/webapp/demos/uploader/js/uploader.js

  Log Message:
  -----------
  FLUID-4247: Updating a copyright in the demos


  Commit: 3a0cebb145d0ed2606cb45e6c4757d885f04eb30
      https://github.com/fluid-project/infusion/commit/3a0cebb145d0ed2606cb45e6c4757d885f04eb30
  Author: Anastasia Cheetham <acheetham at ocad.ca>
  Date:   2011-07-08 (Fri, 08 Jul 2011)

  Changed paths:
    M build-scripts/build.properties
  M src/webapp/components/inlineEdit/inlineEditDependencies.json
  A src/webapp/components/uiOptions/css/FatPanelSlidingPanel.css
  M src/webapp/components/uiOptions/css/FatPanelUIOptions.css
  A src/webapp/components/uiOptions/html/FatPanelUIOptionsFrame.html
  M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
  M src/webapp/components/uiOptions/js/UIEnhancer.js
  M src/webapp/components/uiOptions/js/UIOptions.js
  M src/webapp/components/uiOptions/uiOptionsDependencies.json
  M src/webapp/components/uploader/ReadMe.txt
  M src/webapp/demos/uiOptions/FatPanelUIOptions/html/uiOptions.html
  A src/webapp/demos/uiOptions/FatPanelUIOptions/js/fatPanelUIOptions.js
  M src/webapp/framework/fss/fssDependencies.json
  A src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
  M src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-test.html
  A src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
  M src/webapp/tests/component-tests/uiOptions/js/StoreTests.js
  M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js

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

Conflicts:
	src/webapp/components/uiOptions/js/UIEnhancer.js


  Commit: 035d6ecd87b730bec9147586be8b4c5c634221ff
      https://github.com/fluid-project/infusion/commit/035d6ecd87b730bec9147586be8b4c5c634221ff
  Author: Anastasia Cheetham <acheetham at ocad.ca>
  Date:   2011-07-08 (Fri, 08 Jul 2011)

  Changed paths:
    M src/webapp/tests/component-tests/inlineEdit/js/InlineEditTests.js
  M src/webapp/tests/component-tests/reorderer/js/ImageReordererTestConstants.js
  M src/webapp/tests/component-tests/reorderer/js/ImageReordererTests.js
  M src/webapp/tests/component-tests/tableOfContents/js/TableOfContentsTests.js
  M src/webapp/tests/component-tests/tabs/js/TabsTests.js
  M src/webapp/tests/component-tests/uiOptions/js/SlidingPanelTests.js
  M src/webapp/tests/component-tests/uiOptions/js/TextfieldSliderTests.js
  M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js
  M src/webapp/tests/component-tests/uploader/js/ErrorPanelTests.js
  M src/webapp/tests/component-tests/uploader/js/SWFUploadManagerTests.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/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
  M src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js
  M src/webapp/tests/framework-tests/enhancement/js/ProgressiveEnhancementTests.js
  M src/webapp/tests/framework-tests/renderer/js/RendererTests.js
  M src/webapp/tests/framework-tests/renderer/js/RendererUtilitiesTests.js

  Log Message:
  -----------
  FLUID-4247: Updating the rest of the copyright information


  Commit: fdd7f26fdc713ade66f4028cced04f4a89725f1e
      https://github.com/fluid-project/infusion/commit/fdd7f26fdc713ade66f4028cced04f4a89725f1e
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2011-07-08 (Fri, 08 Jul 2011)

  Changed paths:
    M src/webapp/components/inlineEdit/js/InlineEdit.js
  M src/webapp/components/inlineEdit/js/InlineEditIntegrations.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/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/uploader/js/Flash9UploaderSupport.js
  M src/webapp/components/uploader/js/MimeTypeExtensions.js
  M src/webapp/components/uploader/js/UploaderCompatibility-Infusion1.2.js
  M src/webapp/demos/uploader/js/uploader.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/FluidView.js
  M src/webapp/framework/core/js/ModelTransformations.js
  M src/webapp/framework/core/js/jquery.keyboard-a11y.js
  M src/webapp/tests/component-tests/inlineEdit/js/InlineEditTests.js
  M src/webapp/tests/component-tests/reorderer/js/ImageReordererTestConstants.js
  M src/webapp/tests/component-tests/reorderer/js/ImageReordererTests.js
  M src/webapp/tests/component-tests/tableOfContents/js/TableOfContentsTests.js
  M src/webapp/tests/component-tests/tabs/js/TabsTests.js
  M src/webapp/tests/component-tests/uiOptions/js/SlidingPanelTests.js
  M src/webapp/tests/component-tests/uiOptions/js/TextfieldSliderTests.js
  M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js
  M src/webapp/tests/component-tests/uploader/js/ErrorPanelTests.js
  M src/webapp/tests/component-tests/uploader/js/SWFUploadManagerTests.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/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
  M src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js
  M src/webapp/tests/framework-tests/enhancement/js/ProgressiveEnhancementTests.js
  M src/webapp/tests/framework-tests/renderer/js/RendererTests.js
  M src/webapp/tests/framework-tests/renderer/js/RendererUtilitiesTests.js

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

* anastasia/FLUID-4247-copyrights:
  FLUID-4247: Updating the rest of the copyright information
  FLUID-4247: Updating a copyright in the demos
  FLUDI-4247: Updated copyrights and licenses for framework files.
  FLUID-4247: Updating copyrights (in progress)


Compare: https://github.com/fluid-project/infusion/compare/0a38738...fdd7f26


More information about the Commits mailing list