[Commits] [fluid-project/infusion] 3b5a7d: Merge branch 'master' into FLUID-4453

noreply at github.com noreply at github.com
Thu Sep 22 19:43:42 UTC 2011


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

  Commit: 3b5a7d7955a71029fba67dea95fdff80cfe791b5
      https://github.com/fluid-project/infusion/commit/3b5a7d7955a71029fba67dea95fdff80cfe791b5
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2011-09-21 (Wed, 21 Sep 2011)

  Changed paths:
    M src/webapp/components/uploader/js/HTML5UploaderSupport.js
  M src/webapp/demos/uploader/html/uploader.html
  R src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptionsFrame-test.html
  A src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptionsFrame.html
  M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
  M src/webapp/tests/component-tests/uploader/js/HTML5UploaderSupportTests.js

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


  Commit: d78557c041276a973ba245ff43438b866d0e0fe4
      https://github.com/fluid-project/infusion/commit/d78557c041276a973ba245ff43438b866d0e0fe4
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2011-09-22 (Thu, 22 Sep 2011)

  Changed paths:
    M src/webapp/components/tableOfContents/js/TableOfContents.js
  R src/webapp/components/uiOptions/html/FullNoPreviewUIOptions-test.html
  M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
  M src/webapp/components/uiOptions/js/SlidingPanel.js
  M src/webapp/components/uiOptions/js/UIOptions.js
  M src/webapp/demos/uiOptions/html/UIOptionsPreview.html
  M src/webapp/demos/uiOptions/html/uiOptionsFullWithPreview.html
  M src/webapp/demos/uiOptions/js/uiOptionsDemo.js
  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/TestPreviewTemplate.html
  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

  Log Message:
  -----------
  Merge remote-tracking branch 'amb26/FLUID-4453'

* amb26/FLUID-4453:
  FLUID-4453: Linting and timing fix
  FLUID-4453: Linting fixes
  FLUID-4453: All test cases passing and functionality verified in IE6
  FLUID-4453: Hackish strategy for resolving cross-iframe DOM manipulation issue on IE6.


Compare: https://github.com/fluid-project/infusion/compare/8fe20fd...d78557c


More information about the Commits mailing list