[Commits] [fluid-project/infusion] a35df2: Merge branch 'master', remote branch 'upstream/mas...

noreply at github.com noreply at github.com
Mon Jul 25 18:49:49 UTC 2011


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

  Commit: a35df2fe24d321d83668594d232c07253398a0da
      https://github.com/fluid-project/infusion/commit/a35df2fe24d321d83668594d232c07253398a0da
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2011-07-25 (Mon, 25 Jul 2011)

  Changed paths:
    A src/webapp/components/tableOfContents/css/TableOfContents.css
  M src/webapp/components/tableOfContents/html/TableOfContents.html
  M src/webapp/components/tableOfContents/js/TableOfContents.js
  M src/webapp/components/uiOptions/html/FatPanelUIOptionsFrame.html
  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/UIEnhancer.js
  M src/webapp/components/uiOptions/js/UIOptions.js
  M src/webapp/demos/uiOptions/FatPanelUIOptions/html/uiOptions.html
  M src/webapp/demos/uiOptions/FatPanelUIOptions/js/fatPanelUIOptions.js
  M src/webapp/demos/uiOptions/FullNoPreviewUIOptions/html/uiOptions.html
  M src/webapp/demos/uiOptions/FullPreviewUIOptions/html/UIOptionsPreview.html
  M src/webapp/demos/uiOptions/FullPreviewUIOptions/html/uiOptions.html
  M src/webapp/framework/core/js/Fluid.js
  M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
  M src/webapp/lib/jquery/ui/css/default-theme/images/ui-bg_flat_0_aaaaaa_40x100.png
  M src/webapp/lib/jquery/ui/css/default-theme/images/ui-bg_flat_75_ffffff_40x100.png
  M src/webapp/lib/jquery/ui/css/default-theme/images/ui-bg_glass_55_fbf9ee_1x400.png
  M src/webapp/lib/jquery/ui/css/default-theme/images/ui-bg_glass_65_ffffff_1x400.png
  M src/webapp/lib/jquery/ui/css/default-theme/images/ui-bg_glass_75_dadada_1x400.png
  M src/webapp/lib/jquery/ui/css/default-theme/images/ui-bg_glass_75_e6e6e6_1x400.png
  M src/webapp/lib/jquery/ui/css/default-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png
  M src/webapp/lib/jquery/ui/css/default-theme/images/ui-bg_inset-soft_95_fef1ec_1x100.png
  M src/webapp/lib/jquery/ui/css/default-theme/images/ui-icons_222222_256x240.png
  M src/webapp/lib/jquery/ui/css/default-theme/images/ui-icons_2e83ff_256x240.png
  M src/webapp/lib/jquery/ui/css/default-theme/images/ui-icons_454545_256x240.png
  M src/webapp/lib/jquery/ui/css/default-theme/images/ui-icons_888888_256x240.png
  M src/webapp/lib/jquery/ui/css/default-theme/images/ui-icons_cd0a0a_256x240.png
  M src/webapp/lib/jquery/ui/css/default-theme/jquery.ui.theme.css
  M src/webapp/standalone-demos/table-of-contents/html/TableOfContents.html
  A src/webapp/standalone-demos/table-of-contents/js/table-of-contents-example.js
  M src/webapp/tests/component-tests/tableOfContents/html/TableOfContents-test.html
  M src/webapp/tests/component-tests/tableOfContents/js/TableOfContentsTests.js
  M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
  M src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-test.html
  M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.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/FluidJSTests.js
  M src/webapp/tests/manual-tests/js/someKindOfNews.js

  Log Message:
  -----------
  Merge branch 'master', remote branch 'upstream/master'

* upstream/master: (88 commits)
  FLUID-4317: more fix on ui enhancer unit tests.
  FLUID-4317: More fix on ui enhancer unit tests.
  FLUID-4317: Fixed the ui enhancer unit tests. Modified a bunch of file permissions from 755 to 644.
  FLUID-4317: removed the deprecated default definition of table of content template url from UI enhancer.
  FLUID-4348: removed pageEnhancer from fat panel IoC tree to ensure its configurability.
  FLUID-4317: Merged and integrated the new table of content component from harris/FLUID-4209.
  FLUID-4350: Implementation of fluid.generateGuid() which produces very likely unique ids
  FLUID-4317: Fixed the unit test hanging issue in chrome. The left issue is that the fat panel demo fails due to a framework unique id generation issue.
  FLUID-4317: A buggy experiment with the fix on the issue that the ui options unit tests hang on chrome.
  FLUID-4209: Use fluid.allocateSimpleId() instead
  FLUID-4349: Changed to a falsy check
  FLUID-4349: fluid.allocateSimpleId() improved
  FLUID-4317: Intermediate commit for uiOptions unit tests that injects uiEnhancer directly into test component IoC tree, which fixes the potential issue caused by the fact that each call to pageEnhancer registers an entry to static environment. Although this approach does not fix the original issue that the run hangs on the second test case in chrome, ie and safari, but passes in firefox.
  FLUID-4317: code clean up - replace tabs with spaces.
  FLUID-4317: Added more unit test for uiOptins.templateLoader. More fix is followed to fix the issue that the unit tests hang on chrome, ie and safari.
  FLUID-4209: Fixed a problem with IE7,8 substr
  FLUID-4209: Refractored standalone code
  FLUID-4209: jslint and removed comments
  FLUID-4209: Refractored code and added comments
  FLUID-4209: Revert jqUnit.js
  ...

* master:


  Commit: 9106cfa3772afc45676ae66555578dbd0991c668
      https://github.com/fluid-project/infusion/commit/9106cfa3772afc45676ae66555578dbd0991c668
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2011-07-25 (Mon, 25 Jul 2011)

  Changed paths:
    M README.txt
  M ReleaseNotes.txt

  Log Message:
  -----------
  Merge branch 'master', remote branch 'acheetham/FLUID-4251-readmeReleaseNotes'

* acheetham/FLUID-4251-readmeReleaseNotes:
  FLUID-4251: small wording fix
  FLUID-4251: Trimming README based on Colin's suggestions.
  FLUID-4251: Updated the release notes and README for the 1.4 release.

* master:


  Commit: 11ec3fac8c562d6085a41bdf81ad1c0d79250f44
      https://github.com/fluid-project/infusion/commit/11ec3fac8c562d6085a41bdf81ad1c0d79250f44
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2011-07-25 (Mon, 25 Jul 2011)

  Changed paths:
    M README.txt
  M ReleaseNotes.txt
  A build-scripts/build-README.txt

  Log Message:
  -----------
  FLUID-4251: Improvements to the README and release notes, as well as a new readme for the build system.


Compare: https://github.com/fluid-project/infusion/compare/6d6c5dd...11ec3fa


More information about the Commits mailing list