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

noreply at github.com noreply at github.com
Tue Jun 28 20:52:44 UTC 2011


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

  Commit: 9982198cdcc84be381f241812f770a8e1d5ff30d
      https://github.com/fluid-project/infusion/commit/9982198cdcc84be381f241812f770a8e1d5ff30d
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2011-06-28 (Tue, 28 Jun 2011)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptions.css

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

* upstream/master:
  FLUID-4309: Set default background colour of fat panel to white

* master:


  Commit: 4df58836453b4a79a92237fc84e412ce5b260db5
      https://github.com/fluid-project/infusion/commit/4df58836453b4a79a92237fc84e412ce5b260db5
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2011-06-28 (Tue, 28 Jun 2011)

  Changed paths:
    M src/webapp/components/uiOptions/js/UIEnhancer.js
  M src/webapp/framework/core/js/Fluid.js
  M src/webapp/framework/core/js/FluidIoC.js
  M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
  M src/webapp/tests/framework-tests/core/js/FluidJSTests.js

  Log Message:
  -----------
  Merge branch 'master', remote branch 'amb26/FLUID-4285'

* amb26/FLUID-4285:
  FLUID-4285: Fixes after review from colin - "registeredFrom" is now filtered out along the pathway that leads from demands blocks to component records, and the error flagged in UIEnhancer is genuine
  FLUID-4285: Better diagnostics in the case of malformatted component options

* master:


Compare: https://github.com/fluid-project/infusion/compare/c01607e...4df5883



More information about the Commits mailing list