[Commits] [fluid-project/infusion] 5e8259: Merge branch 'demo' into FLUID-4323-demo

GitHub noreply at github.com
Wed Mar 27 13:25:44 EDT 2013


  Branch: refs/heads/demo
  Home:   https://github.com/fluid-project/infusion
  Commit: 5e825915728e971cad3866f6fbb5ba7044a5a336
      https://github.com/fluid-project/infusion/commit/5e825915728e971cad3866f6fbb5ba7044a5a336
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2013-03-27 (Wed, 27 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptions.css
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/html/FatPanelUIOptions.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.html
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/demos/uiOptions/css/uiOptions.css
    M src/webapp/demos/uiOptions/html/uiOptions.html
    M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js

  Log Message:
  -----------
  Merge branch 'demo' into FLUID-4323-demo


  Commit: 0abc929f86782d30e8ae7d7d3066ac39831241c1
      https://github.com/fluid-project/infusion/commit/0abc929f86782d30e8ae7d7d3066ac39831241c1
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2013-03-27 (Wed, 27 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptions.css
    M src/webapp/integration-demos/uiOptions/ClimateChange.html
    M src/webapp/integration-demos/uiOptions/templates/FatPanelUIOptions.html

  Log Message:
  -----------
  FLUID-4323: Update the integration demo to the new Reset button; fix the styling for the reset button


  Commit: 2ca7509ad86da941a3141b141253d18650be53ce
      https://github.com/fluid-project/infusion/commit/2ca7509ad86da941a3141b141253d18650be53ce
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2013-03-27 (Wed, 27 Mar 2013)

  Log Message:
  -----------
  Merge branch 'demo' into FLUID-4323-demo


  Commit: 7c3cff88d9b41199ae8c3ba1665e04a56b42052f
      https://github.com/fluid-project/infusion/commit/7c3cff88d9b41199ae8c3ba1665e04a56b42052f
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2013-03-27 (Wed, 27 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptions.css
    M src/webapp/integration-demos/uiOptions/ClimateChange.html
    M src/webapp/integration-demos/uiOptions/templates/FatPanelUIOptions.html

  Log Message:
  -----------
  Merge remote-tracking branch 'acheetham/FLUID-4323-demo' into demo

* acheetham/FLUID-4323-demo:
  FLUID-4323: Update the integration demo to the new Reset button; fix the styling for the reset button


Compare: https://github.com/fluid-project/infusion/compare/b7938ae837f9...7c3cff88d9b4


More information about the Commits mailing list