[Commits] [fluid-project/infusion] 106961: FLUID-4323: Files for new demo, including UIO inte...

GitHub noreply at github.com
Tue Mar 26 12:05:47 EDT 2013


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

  Changed paths:
    A src/webapp/integration-demos/uiOptions/ClimateChange.html
    A src/webapp/integration-demos/uiOptions/images/article_climate_change_1.gif
    A src/webapp/integration-demos/uiOptions/images/article_climate_change_2.gif
    A src/webapp/integration-demos/uiOptions/images/article_climate_change_3.gif
    A src/webapp/integration-demos/uiOptions/images/bg.gif
    A src/webapp/integration-demos/uiOptions/images/climate_change_collection_img.jpg
    A src/webapp/integration-demos/uiOptions/images/feature_stories_bullet.png
    A src/webapp/integration-demos/uiOptions/images/head_commerce.png
    A src/webapp/integration-demos/uiOptions/images/head_title.gif
    A src/webapp/integration-demos/uiOptions/images/mid_nav_bullet.png
    A src/webapp/integration-demos/uiOptions/images/nav_bar.png
    A src/webapp/integration-demos/uiOptions/images/search_submit.png
    A src/webapp/integration-demos/uiOptions/images/share_this.gif
    A src/webapp/integration-demos/uiOptions/images/tab_left_side.png
    A src/webapp/integration-demos/uiOptions/images/tab_middle_side.png
    A src/webapp/integration-demos/uiOptions/images/tab_right_side.png
    A src/webapp/integration-demos/uiOptions/images/theme_climate_90.gif
    A src/webapp/integration-demos/uiOptions/js/changeClass.js
    A src/webapp/integration-demos/uiOptions/js/uiOptionsDemo.js
    A src/webapp/integration-demos/uiOptions/main.css

  Log Message:
  -----------
  FLUID-4323: Files for new demo, including UIO integration. This is not cleaned up yet.


  Commit: 294b8e3b7e2ca6b355e2f4bf1bc5efc5b208d9e5
      https://github.com/fluid-project/infusion/commit/294b8e3b7e2ca6b355e2f4bf1bc5efc5b208d9e5
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

  Changed paths:
    A src/webapp/integration-demos/uiOptions/ClimateChange.html
    A src/webapp/integration-demos/uiOptions/images/article_climate_change_1.gif
    A src/webapp/integration-demos/uiOptions/images/article_climate_change_2.gif
    A src/webapp/integration-demos/uiOptions/images/article_climate_change_3.gif
    A src/webapp/integration-demos/uiOptions/images/bg.gif
    A src/webapp/integration-demos/uiOptions/images/climate_change_collection_img.jpg
    A src/webapp/integration-demos/uiOptions/images/feature_stories_bullet.png
    A src/webapp/integration-demos/uiOptions/images/head_commerce.png
    A src/webapp/integration-demos/uiOptions/images/head_title.gif
    A src/webapp/integration-demos/uiOptions/images/mid_nav_bullet.png
    A src/webapp/integration-demos/uiOptions/images/nav_bar.png
    A src/webapp/integration-demos/uiOptions/images/search_submit.png
    A src/webapp/integration-demos/uiOptions/images/share_this.gif
    A src/webapp/integration-demos/uiOptions/images/tab_left_side.png
    A src/webapp/integration-demos/uiOptions/images/tab_middle_side.png
    A src/webapp/integration-demos/uiOptions/images/tab_right_side.png
    A src/webapp/integration-demos/uiOptions/images/theme_climate_90.gif
    A src/webapp/integration-demos/uiOptions/js/changeClass.js
    A src/webapp/integration-demos/uiOptions/js/uiOptionsDemo.js
    A src/webapp/integration-demos/uiOptions/main.css

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


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

  Changed paths:
    A src/webapp/integration-demos/uiOptions/ClimateChange.html
    A src/webapp/integration-demos/uiOptions/images/article_climate_change_1.gif
    A src/webapp/integration-demos/uiOptions/images/article_climate_change_2.gif
    A src/webapp/integration-demos/uiOptions/images/article_climate_change_3.gif
    A src/webapp/integration-demos/uiOptions/images/bg.gif
    A src/webapp/integration-demos/uiOptions/images/climate_change_collection_img.jpg
    A src/webapp/integration-demos/uiOptions/images/feature_stories_bullet.png
    A src/webapp/integration-demos/uiOptions/images/head_commerce.png
    A src/webapp/integration-demos/uiOptions/images/head_title.gif
    A src/webapp/integration-demos/uiOptions/images/mid_nav_bullet.png
    A src/webapp/integration-demos/uiOptions/images/nav_bar.png
    A src/webapp/integration-demos/uiOptions/images/search_submit.png
    A src/webapp/integration-demos/uiOptions/images/share_this.gif
    A src/webapp/integration-demos/uiOptions/images/tab_left_side.png
    A src/webapp/integration-demos/uiOptions/images/tab_middle_side.png
    A src/webapp/integration-demos/uiOptions/images/tab_right_side.png
    A src/webapp/integration-demos/uiOptions/images/theme_climate_90.gif
    A src/webapp/integration-demos/uiOptions/js/changeClass.js
    A src/webapp/integration-demos/uiOptions/js/uiOptionsDemo.js
    A src/webapp/integration-demos/uiOptions/main.css

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

* acheetham/FLUID-4323-demo:
  FLUID-4323: Files for new demo, including UIO integration. This is not cleaned up yet.


Compare: https://github.com/fluid-project/infusion/compare/07481437fefa...31bba6456266


More information about the Commits mailing list