[Commits] [fluid-project/infusion] 30725e: Merge branch 'master' into FLUID-4473

noreply at github.com noreply at github.com
Fri Sep 30 20:18:57 UTC 2011


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

  Commit: 30725e65acd44292cc856641cb96a8755349a495
      https://github.com/fluid-project/infusion/commit/30725e65acd44292cc856641cb96a8755349a495
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2011-09-30 (Fri, 30 Sep 2011)

  Changed paths:
    M build-scripts/build.properties
  M pom.xml
  M project.xml
  M src/webapp/components/uploader/js/Uploader.js
  M src/webapp/demos/reorderer/layoutReorderer/js/layoutReordererDemo.js
  M src/webapp/framework/core/js/Fluid.js
  M src/webapp/tests/manual-tests/html/versioning.html
  M src/webapp/tests/manual-tests/js/simple-progress.js

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


  Commit: d15ea9f019adedf445ab0540958be5454c535186
      https://github.com/fluid-project/infusion/commit/d15ea9f019adedf445ab0540958be5454c535186
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2011-09-30 (Fri, 30 Sep 2011)

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

  Log Message:
  -----------
  FLUID-4473: Re-constructed fluid.uiEnhancer.numerizeLineHeight along with its context and reduced the browser dependency.


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

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

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

* FLUID-4473:
  FLUID-4473: Re-constructed fluid.uiEnhancer.numerizeLineHeight along with its context and reduced the browser dependency.
  FLUID-4473: Adjusted the arguments of fluid.uiEnhancer.numerizeLineHeight.
  FLUID-4473: Tweaks on namespacing, comments etc.
  FLUID-4473: Applied line-height string value 'normal' === 1.2em and added the corresponding unit tests.
  FLUID-4473: Fixed the issue that line spacing in sakai demo does not work in IE9 and Safari5.


Compare: https://github.com/fluid-project/infusion/compare/a612d15...ebfda19


More information about the Commits mailing list