[Commits] [fluid-project/infusion] 2ad5e6: FLUID-4971: Moved full page UIO demos into manual-...

GitHub noreply at github.com
Fri Apr 26 15:58:08 EDT 2013


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: 2ad5e62297506381245f318a056aa8b359337ad0
      https://github.com/fluid-project/infusion/commit/2ad5e62297506381245f318a056aa8b359337ad0
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    R src/webapp/demos/uiOptions/css/UIOptionsFullPage.css
    R src/webapp/demos/uiOptions/html/UIOptionsPreview.html
    M src/webapp/demos/uiOptions/html/uiOptions.html
    R src/webapp/demos/uiOptions/html/uiOptionsFullWithPreview.html
    R src/webapp/demos/uiOptions/html/uiOptionsFullWithoutPreview.html
    A src/webapp/tests/manual-tests/css/UIOptionsFullPage.css
    A src/webapp/tests/manual-tests/html/uiOptionsFullWithPreview.html
    A src/webapp/tests/manual-tests/html/uiOptionsFullWithoutPreview.html
    A src/webapp/tests/manual-tests/html/uiOptionsPreview.html

  Log Message:
  -----------
  FLUID-4971: Moved full page UIO demos into manual-tests


  Commit: bb2b583e0386d697b957ab0d87ad8f3bbb93a991
      https://github.com/fluid-project/infusion/commit/bb2b583e0386d697b957ab0d87ad8f3bbb93a991
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-17 (Wed, 17 Apr 2013)

  Changed paths:
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithPreview.html
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithoutPreview.html
    M src/webapp/tests/manual-tests/html/uiOptionsPreview.html

  Log Message:
  -----------
  FLUID-4971: Moved full page UIO demos into manual-tests


  Commit: 6d785eb515e0e7aa556d134ce563e5c9c139242c
      https://github.com/fluid-project/infusion/commit/6d785eb515e0e7aa556d134ce563e5c9c139242c
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-17 (Wed, 17 Apr 2013)

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

  Log Message:
  -----------
  Merge branch 'FLUID-4981-correct' into FLUID-4971


  Commit: b58f85ac0f8ac98ec1d22af826492491b6e1d1fd
      https://github.com/fluid-project/infusion/commit/b58f85ac0f8ac98ec1d22af826492491b6e1d1fd
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-17 (Wed, 17 Apr 2013)

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

  Log Message:
  -----------
  Merge branch 'FLUID-4981-correct' into FLUID-4971


  Commit: 7755c3b56c40f4d22f0c30c0d122fc503f4bb70e
      https://github.com/fluid-project/infusion/commit/7755c3b56c40f4d22f0c30c0d122fc503f4bb70e
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-17 (Wed, 17 Apr 2013)

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

  Log Message:
  -----------
  Merge branch 'FLUID-4981-correct' into FLUID-4971


  Commit: 4feea43c80bbca3114a64840a8353413714d898a
      https://github.com/fluid-project/infusion/commit/4feea43c80bbca3114a64840a8353413714d898a
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-22 (Mon, 22 Apr 2013)

  Changed paths:
    M src/webapp/demos/uiOptions/html/uiOptions.html
    M src/webapp/demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/tests/manual-tests/ReadMe.txt
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithPreview.html
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithoutPreview.html
    A src/webapp/tests/manual-tests/js/uiOptionsFullPage.js

  Log Message:
  -----------
  FLUID-4971: Edited manual test readme, removed 'return to site' links, moved test js out of demo js, edited demo text. Cancel buttons still broken


  Commit: 586f4dc0873d02224c2d204054c2e0e8ef725b2c
      https://github.com/fluid-project/infusion/commit/586f4dc0873d02224c2d204054c2e0e8ef725b2c
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M ReleaseNotes.txt
    M src/webapp/components/uiOptions/css/FatPanelUIOptions.css
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/css/UIOptions.css
    R src/webapp/components/uiOptions/css/fonts/OpenSans-LICENSE.txt
    R src/webapp/components/uiOptions/css/fonts/OpenSans-Light.ttf
    M src/webapp/components/uiOptions/css/ie8.css
    M src/webapp/components/uiOptions/html/FullNoPreviewUIOptions.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-layout.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-lineSpacer.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-links.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-textFont.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-textSizer.html
    A src/webapp/lib/fonts/OpenSans-LICENSE.txt
    A src/webapp/lib/fonts/OpenSans-Light.ttf

  Log Message:
  -----------
  Merge branch 'FLUID-4981-correct' into FLUID-4971


  Commit: 687eefc502eb159b5a2f9253ca4b23219a75700b
      https://github.com/fluid-project/infusion/commit/687eefc502eb159b5a2f9253ca4b23219a75700b
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/css/UIOptions.css
    M src/webapp/components/uiOptions/js/UIEnhancer.js
    M src/webapp/demos/uiOptions/html/uiOptions.html
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithPreview.html
    M src/webapp/tests/manual-tests/js/uiOptionsFullPage.js

  Log Message:
  -----------
  FLUID-4971: Removed uio-demo-theme class in demos to use default


  Commit: 99ea998a95983e42ad58007a1ad9c795ae401b9d
      https://github.com/fluid-project/infusion/commit/99ea998a95983e42ad58007a1ad9c795ae401b9d
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

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

  Log Message:
  -----------
  FLUID-4971: CSS formatting tweaks


  Commit: 44eb0bbff2c583b3937642815b09d4caa1963b95
      https://github.com/fluid-project/infusion/commit/44eb0bbff2c583b3937642815b09d4caa1963b95
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

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

  Log Message:
  -----------
  FLUID-4971: Detabbed css


  Commit: 0f15a3dcba3634ba8ec5ca1919564ae04cefaebb
      https://github.com/fluid-project/infusion/commit/0f15a3dcba3634ba8ec5ca1919564ae04cefaebb
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

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

  Log Message:
  -----------
  FLUID-4971: Detabbed css


  Commit: f456597fbd70744d02383ff5e33313cff667247a
      https://github.com/fluid-project/infusion/commit/f456597fbd70744d02383ff5e33313cff667247a
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

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

  Log Message:
  -----------
  FLUID-4971: Detabbed css


  Commit: d76c281b31369634a308f2bbb7446242140eddf8
      https://github.com/fluid-project/infusion/commit/d76c281b31369634a308f2bbb7446242140eddf8
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

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

  Log Message:
  -----------
  FLUID-4971: Detabbed css


  Commit: 0db02256805600bc036c13c1bcc2a02940c6d5f4
      https://github.com/fluid-project/infusion/commit/0db02256805600bc036c13c1bcc2a02940c6d5f4
  Author: heidi valles <hvalles at ocad.ca>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M src/webapp/demos/uiOptions/html/uiOptions.html

  Log Message:
  -----------
  FLUID-4971: Removed unused function call in demo


  Commit: dffb310eae32845b407d80673ab7e0a6b7e0de06
      https://github.com/fluid-project/infusion/commit/dffb310eae32845b407d80673ab7e0a6b7e0de06
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptions.css
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/css/UIOptions.css
    M src/webapp/components/uiOptions/css/ie8.css
    M src/webapp/components/uiOptions/js/UIEnhancer.js
    R src/webapp/demos/uiOptions/css/UIOptionsFullPage.css
    R src/webapp/demos/uiOptions/html/UIOptionsPreview.html
    M src/webapp/demos/uiOptions/html/uiOptions.html
    R src/webapp/demos/uiOptions/html/uiOptionsFullWithPreview.html
    R src/webapp/demos/uiOptions/html/uiOptionsFullWithoutPreview.html
    M src/webapp/demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/tests/manual-tests/ReadMe.txt
    A src/webapp/tests/manual-tests/css/UIOptionsFullPage.css
    A src/webapp/tests/manual-tests/html/uiOptionsFullWithPreview.html
    A src/webapp/tests/manual-tests/html/uiOptionsFullWithoutPreview.html
    A src/webapp/tests/manual-tests/html/uiOptionsPreview.html
    A src/webapp/tests/manual-tests/js/uiOptionsFullPage.js

  Log Message:
  -----------
  Merge remote-tracking branch 'heidiv/FLUID-4971'

* heidiv/FLUID-4971:
  FLUID-4971: Removed unused function call in demo
  FLUID-4971: Detabbed css
  FLUID-4971: Detabbed css
  FLUID-4971: Detabbed css
  FLUID-4971: Detabbed css
  FLUID-4971: CSS formatting tweaks
  FLUID-4971: Removed uio-demo-theme class in demos to use default
  FLUID-4971: Edited manual test readme, removed 'return to site' links, moved test js out of demo js, edited demo text. Cancel buttons still broken
  FLUID-4971: Moved full page UIO demos into manual-tests
  FLUID-4971: Moved full page UIO demos into manual-tests

Conflicts:
	src/webapp/demos/uiOptions/js/uiOptionsDemo.js


  Commit: f2d78946c4bbec9e9897ec53f00f41ab3bbe2a88
      https://github.com/fluid-project/infusion/commit/f2d78946c4bbec9e9897ec53f00f41ab3bbe2a88
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithoutPreview.html
    M src/webapp/tests/manual-tests/js/uiOptionsFullPage.js

  Log Message:
  -----------
  FLUID-4971: Fixed the full page manual tests.


  Commit: 96afc309f3a3aa7aa85a8801b414ece6a42737da
      https://github.com/fluid-project/infusion/commit/96afc309f3a3aa7aa85a8801b414ece6a42737da
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptions.css
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/css/UIOptions.css
    M src/webapp/components/uiOptions/css/ie8.css
    M src/webapp/components/uiOptions/js/UIEnhancer.js
    R src/webapp/demos/uiOptions/css/UIOptionsFullPage.css
    R src/webapp/demos/uiOptions/html/UIOptionsPreview.html
    M src/webapp/demos/uiOptions/html/uiOptions.html
    R src/webapp/demos/uiOptions/html/uiOptionsFullWithPreview.html
    R src/webapp/demos/uiOptions/html/uiOptionsFullWithoutPreview.html
    M src/webapp/demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/tests/manual-tests/ReadMe.txt
    A src/webapp/tests/manual-tests/css/UIOptionsFullPage.css
    A src/webapp/tests/manual-tests/html/uiOptionsFullWithPreview.html
    A src/webapp/tests/manual-tests/html/uiOptionsFullWithoutPreview.html
    A src/webapp/tests/manual-tests/html/uiOptionsPreview.html
    A src/webapp/tests/manual-tests/js/uiOptionsFullPage.js

  Log Message:
  -----------
  Merge remote-tracking branch 'cindyli/FLUID-4971'

* cindyli/FLUID-4971:
  FLUID-4971: Fixed the full page manual tests.
  FLUID-4971: Removed unused function call in demo
  FLUID-4971: Detabbed css
  FLUID-4971: Detabbed css
  FLUID-4971: Detabbed css
  FLUID-4971: Detabbed css
  FLUID-4971: CSS formatting tweaks
  FLUID-4971: Removed uio-demo-theme class in demos to use default
  FLUID-4971: Edited manual test readme, removed 'return to site' links, moved test js out of demo js, edited demo text. Cancel buttons still broken
  FLUID-4971: Moved full page UIO demos into manual-tests
  FLUID-4971: Moved full page UIO demos into manual-tests


Compare: https://github.com/fluid-project/infusion/compare/ffd7f9f9de88...96afc309f3a3


More information about the Commits mailing list