[Commits] [fluid-project/infusion] 14ab51: FLUID-5161: adding back a uiOptions component

GitHub noreply at github.com
Fri Oct 11 12:06:47 EDT 2013


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: 14ab51cd94bfbb87a625300aac2e533353e7fe7c
      https://github.com/fluid-project/infusion/commit/14ab51cd94bfbb87a625300aac2e533353e7fe7c
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-08 (Tue, 08 Oct 2013)

  Changed paths:
    M build-scripts/build.properties
    A src/components/uiOptions/UIOptions.js
    A src/components/uiOptions/uiOptionsDependencies.json

  Log Message:
  -----------
  FLUID-5161: adding back a uiOptions component


  Commit: 37c666cb48ae723d163df24a6c74b39ecd3e52fe
      https://github.com/fluid-project/infusion/commit/37c666cb48ae723d163df24a6c74b39ecd3e52fe
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-09 (Wed, 09 Oct 2013)

  Changed paths:
    A src/tests/manual-tests/html/prefsEditorSeparatedPanelSchema.html
    A src/tests/manual-tests/js/prefsEditorSeparatedPanelSchema.js

  Log Message:
  -----------
  FLUID-5161: separated panel w/ shema manual test

Added the manual test for the separated panel prefs editor using the schema in preparation for replacing the current framework demo with a UI Options demo.


  Commit: d46209094d42d2c4aedda0cf2e639302c84741ef
      https://github.com/fluid-project/infusion/commit/d46209094d42d2c4aedda0cf2e639302c84741ef
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-09 (Wed, 09 Oct 2013)

  Changed paths:
    M src/demos/index.html
    M src/demos/portal/css/portal.css
    R src/demos/portal/images/prefsEditor.png
    A src/demos/portal/images/uiOptions.png
    R src/demos/prefsEditor/css/ie8.css
    R src/demos/prefsEditor/css/prefsEditor.css
    R src/demos/prefsEditor/demo.html
    R src/demos/prefsEditor/fonts/Lato-Black.ttf
    R src/demos/prefsEditor/fonts/Lato-Light.ttf
    R src/demos/prefsEditor/fonts/Lato-LightItalic.ttf
    R src/demos/prefsEditor/fonts/Lato-Regular.ttf
    R src/demos/prefsEditor/fonts/LoveYaLikeASister.ttf
    R src/demos/prefsEditor/html/prefsEditor.html
    R src/demos/prefsEditor/images/arrow_left.png
    R src/demos/prefsEditor/images/arrow_right.png
    R src/demos/prefsEditor/images/background_texture.png
    R src/demos/prefsEditor/images/photo_apple.png
    R src/demos/prefsEditor/images/photo_orange.png
    R src/demos/prefsEditor/js/prefsEditorDemo.js
    A src/demos/uiOptions/css/ie8.css
    A src/demos/uiOptions/css/uiOptions.css
    A src/demos/uiOptions/demo.html
    A src/demos/uiOptions/fonts/Lato-Black.ttf
    A src/demos/uiOptions/fonts/Lato-Light.ttf
    A src/demos/uiOptions/fonts/Lato-LightItalic.ttf
    A src/demos/uiOptions/fonts/Lato-Regular.ttf
    A src/demos/uiOptions/fonts/LoveYaLikeASister.ttf
    A src/demos/uiOptions/html/uiOptions.html
    A src/demos/uiOptions/images/arrow_left.png
    A src/demos/uiOptions/images/arrow_right.png
    A src/demos/uiOptions/images/background_texture.png
    A src/demos/uiOptions/images/photo_apple.png
    A src/demos/uiOptions/images/photo_orange.png
    M src/tests/manual-tests/html/prefsEditorPreview.html
    M src/tests/manual-tests/html/prefsEditorSeparatedPanel.html
    M src/tests/manual-tests/html/prefsEditorSeparatedPanelSchema.html

  Log Message:
  -----------
  FLUID-5161: Added ui options demo

Put the UI Options demo back and moved the preferences framework demo to a manual test.


  Commit: 0dfb9c8f3c1c3f5d713b8c1dea78dfa747643d65
      https://github.com/fluid-project/infusion/commit/0dfb9c8f3c1c3f5d713b8c1dea78dfa747643d65
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

  Changed paths:
    M build-scripts/build.properties
    A src/components/uiOptions/UIOptions.js
    A src/components/uiOptions/uiOptionsDependencies.json
    M src/demos/index.html
    M src/demos/portal/css/portal.css
    R src/demos/portal/images/prefsEditor.png
    A src/demos/portal/images/uiOptions.png
    R src/demos/prefsEditor/css/ie8.css
    R src/demos/prefsEditor/css/prefsEditor.css
    R src/demos/prefsEditor/demo.html
    R src/demos/prefsEditor/fonts/Lato-Black.ttf
    R src/demos/prefsEditor/fonts/Lato-Light.ttf
    R src/demos/prefsEditor/fonts/Lato-LightItalic.ttf
    R src/demos/prefsEditor/fonts/Lato-Regular.ttf
    R src/demos/prefsEditor/fonts/LoveYaLikeASister.ttf
    R src/demos/prefsEditor/html/prefsEditor.html
    R src/demos/prefsEditor/images/arrow_left.png
    R src/demos/prefsEditor/images/arrow_right.png
    R src/demos/prefsEditor/images/background_texture.png
    R src/demos/prefsEditor/images/photo_apple.png
    R src/demos/prefsEditor/images/photo_orange.png
    R src/demos/prefsEditor/js/prefsEditorDemo.js
    A src/demos/uiOptions/css/ie8.css
    A src/demos/uiOptions/css/uiOptions.css
    A src/demos/uiOptions/demo.html
    A src/demos/uiOptions/fonts/Lato-Black.ttf
    A src/demos/uiOptions/fonts/Lato-Light.ttf
    A src/demos/uiOptions/fonts/Lato-LightItalic.ttf
    A src/demos/uiOptions/fonts/Lato-Regular.ttf
    A src/demos/uiOptions/fonts/LoveYaLikeASister.ttf
    A src/demos/uiOptions/html/uiOptions.html
    A src/demos/uiOptions/images/arrow_left.png
    A src/demos/uiOptions/images/arrow_right.png
    A src/demos/uiOptions/images/background_texture.png
    A src/demos/uiOptions/images/photo_apple.png
    A src/demos/uiOptions/images/photo_orange.png
    M src/tests/manual-tests/html/prefsEditorPreview.html
    M src/tests/manual-tests/html/prefsEditorSeparatedPanel.html
    A src/tests/manual-tests/html/prefsEditorSeparatedPanelSchema.html
    A src/tests/manual-tests/js/prefsEditorSeparatedPanelSchema.js

  Log Message:
  -----------
  Merge remote-tracking branch 'jobara/FLUID-5161'

* jobara/FLUID-5161:
  FLUID-5161: Added ui options demo
  FLUID-5161: separated panel w/ shema manual test
  FLUID-5161: adding back a uiOptions component


Compare: https://github.com/fluid-project/infusion/compare/b4422d732612...0dfb9c8f3c1c


More information about the Commits mailing list