[Commits] [fluid-project/infusion] 23ca91: FLUID-5104: The reset button on the full page with...

GitHub noreply at github.com
Tue Aug 13 13:27:45 EDT 2013


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: 23ca9113289d033e9b243294e527b24c51fc34f7
      https://github.com/fluid-project/infusion/commit/23ca9113289d033e9b243294e527b24c51fc34f7
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M src/components/uiOptions/js/FatPanelUIOptions.js
    M src/components/uiOptions/js/FullNoPreviewUIOptions.js
    M src/components/uiOptions/js/UIOptions.js

  Log Message:
  -----------
  FLUID-5104: The reset button on the full page with preview demo only resets preview window rather than both preview and the main page. Also updated uiOptions component to be more comply with the latest framework.


  Commit: 77399cb6b734f805b43f2cd6b4267bef1e03a3a2
      https://github.com/fluid-project/infusion/commit/77399cb6b734f805b43f2cd6b4267bef1e03a3a2
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    R src/integration-demos/sakai/css/chat.css
    R src/integration-demos/sakai/css/sakai.css
    R src/integration-demos/sakai/css/sakai.layout.css
    R src/integration-demos/sakai/css/sakai.theme.coal.css
    R src/integration-demos/sakai/css/sakai.theme.mist.css
    R src/integration-demos/sakai/css/sakai.theme.rust.css
    R src/integration-demos/sakai/css/sakai.theme.slate.css
    R src/integration-demos/sakai/html/UIOptionsPreview.html
    R src/integration-demos/sakai/html/ui-options-fss-sakai.html
    R src/integration-demos/sakai/images/accept.png
    R src/integration-demos/sakai/images/application_lightning.png
    R src/integration-demos/sakai/images/banner_inst.gif
    R src/integration-demos/sakai/images/coal-icons/icon-menu-Delete.png
    R src/integration-demos/sakai/images/coal-icons/icon-options-ListOrGrid.png
    R src/integration-demos/sakai/images/coal-icons/icon-widget-Close.png
    R src/integration-demos/sakai/images/coal-icons/icon-widget-More.png
    R src/integration-demos/sakai/images/coal-icons/icon-widget-ShowSettings.png
    R src/integration-demos/sakai/images/dt-arrow-up.png
    R src/integration-demos/sakai/images/edit-look-feel.png
    R src/integration-demos/sakai/images/exclamation.png
    R src/integration-demos/sakai/images/flag_blue.png
    R src/integration-demos/sakai/images/folder.png
    R src/integration-demos/sakai/images/header2.png
    R src/integration-demos/sakai/images/help.png
    R src/integration-demos/sakai/images/input.png
    R src/integration-demos/sakai/images/lhr-close.png
    R src/integration-demos/sakai/images/lhr-help.png
    R src/integration-demos/sakai/images/logo_inst.gif
    R src/integration-demos/sakai/images/m2-header4-up.png
    R src/integration-demos/sakai/images/m2-header5-up.png
    R src/integration-demos/sakai/images/mist-icons/icon-menu-Delete.png
    R src/integration-demos/sakai/images/mist-icons/icon-options-ListOrGrid.png
    R src/integration-demos/sakai/images/mist-icons/icon-widget-Close.png
    R src/integration-demos/sakai/images/mist-icons/icon-widget-More.png
    R src/integration-demos/sakai/images/mist-icons/icon-widget-ShowSettings.png
    R src/integration-demos/sakai/images/people.png
    R src/integration-demos/sakai/images/redo.png
    R src/integration-demos/sakai/images/rust-icons/icon-menu-Delete.png
    R src/integration-demos/sakai/images/rust-icons/icon-options-ListOrGrid.png
    R src/integration-demos/sakai/images/rust-icons/icon-widget-Close.png
    R src/integration-demos/sakai/images/rust-icons/icon-widget-More.png
    R src/integration-demos/sakai/images/rust-icons/icon-widget-Settings.png
    R src/integration-demos/sakai/images/sakai_powered.gif
    R src/integration-demos/sakai/images/save.png
    R src/integration-demos/sakai/images/slate-icons/icon-menu-Delete.png
    R src/integration-demos/sakai/images/slate-icons/icon-options-ListOrGrid.png
    R src/integration-demos/sakai/images/sortascending.gif
    R src/integration-demos/sakai/images/tab-arrow-down-active.gif
    R src/integration-demos/sakai/images/tab-arrow-down.gif
    R src/integration-demos/sakai/images/tab-left-selected.gif
    R src/integration-demos/sakai/images/tab-left.gif
    R src/integration-demos/sakai/images/tab-right-selected.gif
    R src/integration-demos/sakai/images/tab-right.gif
    R src/integration-demos/sakai/images/transparent.gif
    R src/integration-demos/sakai/images/undo.png
    M src/tests/manual-tests/html/simple-progress.html

  Log Message:
  -----------
  Merge branch 'master' into FLUID-5104


  Commit: 48f3f6c4268227610b24d42deedd4708338904c1
      https://github.com/fluid-project/infusion/commit/48f3f6c4268227610b24d42deedd4708338904c1
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M src/components/uiOptions/js/UIOptions.js
    M src/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js

  Log Message:
  -----------
  FLUID-5104: Clicking reset button on the full page with preview demo would reset the adjusters as well as the preview window, without resetting applied settings on the main page.


  Commit: 7af464161e76e5df8b7365b7b2834b8d3ab4ec64
      https://github.com/fluid-project/infusion/commit/7af464161e76e5df8b7365b7b2834b8d3ab4ec64
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

  Changed paths:
    M src/components/uiOptions/js/FatPanelUIOptions.js
    M src/components/uiOptions/js/FullNoPreviewUIOptions.js
    M src/components/uiOptions/js/UIOptions.js
    M src/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js

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

* cindyli/FLUID-5104:
  FLUID-5104: Clicking reset button on the full page with preview demo would reset the adjusters as well as the preview window, without resetting applied settings on the main page.
  FLUID-5104: The reset button on the full page with preview demo only resets preview window rather than both preview and the main page. Also updated uiOptions component to be more comply with the latest framework.


Compare: https://github.com/fluid-project/infusion/compare/6bcf6d0d4ba6...7af464161e76


More information about the Commits mailing list