[Commits] [fluid-project/infusion] 29eee3: FLUID-4323: Implemented "simplified content".

GitHub noreply at github.com
Tue Mar 26 15:44:56 EDT 2013


  Branch: refs/heads/demo
  Home:   https://github.com/fluid-project/infusion
  Commit: 29eee30754e34a0026ce8239d50d39a814fbe0f6
      https://github.com/fluid-project/infusion/commit/29eee30754e34a0026ce8239d50d39a814fbe0f6
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

  Changed paths:
    M src/webapp/integration-demos/uiOptions/ClimateChange.html
    M src/webapp/integration-demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/integration-demos/uiOptions/js/uiOptionsExtra.js

  Log Message:
  -----------
  FLUID-4323: Implemented "simplified content".


  Commit: 8d63530db5e982c1293109826d5e52ff7dcbe97d
      https://github.com/fluid-project/infusion/commit/8d63530db5e982c1293109826d5e52ff7dcbe97d
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

  Changed paths:
    M src/webapp/integration-demos/uiOptions/ClimateChange.html
    M src/webapp/integration-demos/uiOptions/main.css

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/demo' into demo


  Commit: 74d78b6a2db26f6794573c7b9f6c96801e1c6d6b
      https://github.com/fluid-project/infusion/commit/74d78b6a2db26f6794573c7b9f6c96801e1c6d6b
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

  Changed paths:
    M src/webapp/integration-demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/integration-demos/uiOptions/js/uiOptionsExtra.js

  Log Message:
  -----------
  FLUID-4323: Fixed the way to feed in the content container into simplifiedContent component.


  Commit: 80eda2cfb47ae4c8b4d8a0dcfc4c5fe8e3bd21a1
      https://github.com/fluid-project/infusion/commit/80eda2cfb47ae4c8b4d8a0dcfc4c5fe8e3bd21a1
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/tests/component-tests/uiOptions/html/TextfieldSlider-test.html
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/demo' into demo


  Commit: cd8822d68f30d72fc66da47ce1597ba7208f53c2
      https://github.com/fluid-project/infusion/commit/cd8822d68f30d72fc66da47ce1597ba7208f53c2
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

  Changed paths:
    M src/webapp/integration-demos/uiOptions/ClimateChange.html
    M src/webapp/integration-demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/integration-demos/uiOptions/js/uiOptionsExtra.js

  Log Message:
  -----------
  FLUID-4323: Moved the content selector into options.selectors block.


  Commit: 34cf2e5b2b0f1ed7d8a407cdc2093d0d4c9c91b6
      https://github.com/fluid-project/infusion/commit/34cf2e5b2b0f1ed7d8a407cdc2093d0d4c9c91b6
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

  Changed paths:
    M src/webapp/integration-demos/uiOptions/ClimateChange.html
    M src/webapp/integration-demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/integration-demos/uiOptions/js/uiOptionsExtra.js

  Log Message:
  -----------
  Merge remote-tracking branch 'cindyli/demo' into demo

* cindyli/demo:
  FLUID-4323: Moved the content selector into options.selectors block.
  FLUID-4323: Fixed the way to feed in the content container into simplifiedContent component.
  FLUID-4323: Implemented "simplified content".


Compare: https://github.com/fluid-project/infusion/compare/a5bf124b039a...34cf2e5b2b0f


More information about the Commits mailing list