[Commits] [fluid-project/first-discovery] e3cd30: FLOE-331: Saved these state info into the central ...

GitHub noreply at github.com
Fri Sep 25 16:01:11 UTC 2015


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/first-discovery
  Commit: e3cd3007c2f82b8b7087d0a4c13cb3930c19b671
      https://github.com/fluid-project/first-discovery/commit/e3cd3007c2f82b8b7087d0a4c13cb3930c19b671
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-05-13 (Wed, 13 May 2015)

  Changed paths:
    M src/js/firstDiscoveryEditor.js
    M src/js/navIcons.js

  Log Message:
  -----------
  FLOE-331: Saved these state info into the central model: the current panel number and the visited panel numbers. These states help to preserve navigation icon states (confirmed or active states) at page reload.


  Commit: 4fede4e8e9aa565d6ff274da34181b636e6c0232
      https://github.com/fluid-project/first-discovery/commit/4fede4e8e9aa565d6ff274da34181b636e6c0232
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M demos/index.html
    M src/js/firstDiscoveryEditor.js
    A src/js/keyboardShortcut.js
    M src/js/ttsHookup.js
    M tests/all-tests.html
    M tests/html/firstDiscoveryEditor-Tests.html
    M tests/html/keyboardInput-Tests.html
    A tests/html/keyboardShortcut-Tests.html
    M tests/html/ttsHookup-Tests.html
    M tests/js/firstDiscoveryEditorTests.js
    M tests/js/keyboardInputTests.js
    A tests/js/keyboardShortcutTests.js
    M tests/js/testUtils.js
    M tests/js/ttsHookupTests.js

  Log Message:
  -----------
  Merge branch 'master' into FLOE-331


  Commit: cba81f2321370044c31b73d141fda1854a0d1320
      https://github.com/fluid-project/first-discovery/commit/cba81f2321370044c31b73d141fda1854a0d1320
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-05-19 (Tue, 19 May 2015)

  Changed paths:
    M src/js/firstDiscoveryEditor.js

  Log Message:
  -----------
  FLOE-331: Add model relay for saving sticky key panel states into the central model.


  Commit: 57b25f0505a8147679f794cee5545a17bdc105e8
      https://github.com/fluid-project/first-discovery/commit/57b25f0505a8147679f794cee5545a17bdc105e8
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-05-19 (Tue, 19 May 2015)

  Changed paths:
    M src/html/keyboard.html
    M src/html/lang.html
    M src/html/rangeTemplate.html
    M src/html/speakText.html
    M src/html/welcomeTemplate.html
    M src/js/keyboardInput.js
    M src/js/panels.js
    M src/js/ttsHookup.js
    M src/messages/keyboard.json
    M src/messages/textSize.json
    M tests/html/keyboardInput-Tests.html
    M tests/html/panels-Tests.html
    M tests/html/ttsHookup-Tests.html
    M tests/js/keyboardInputTests.js
    M tests/js/panelsTests.js
    M tests/js/ttsHookupTests.js

  Log Message:
  -----------
  Merge branch 'master' into FLOE-331


  Commit: 851a1fad907be7cd98045fffdc21d7a01ff3df49
      https://github.com/fluid-project/first-discovery/commit/851a1fad907be7cd98045fffdc21d7a01ff3df49
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M .jshintrc
    A demos/assessment/css/assessment.css
    A demos/assessment/html/firstDiscovery.html
    A demos/assessment/images/dino-X.png
    A demos/assessment/images/dino-Y.png
    A demos/assessment/images/dino-Z.png
    A demos/assessment/index.html
    A demos/assessment/math3-2.html
    A demos/assessment/messages/captions_en-US.json
    A demos/assessment/messages/congratulations_en-US.json
    A demos/assessment/messages/contrast_en-US.json
    A demos/assessment/messages/firstDiscovery_en-US.json
    A demos/assessment/messages/lang_en-US.json
    A demos/assessment/messages/onScreenKeyboard_en-US.json
    A demos/assessment/messages/speakText_en-US.json
    A demos/assessment/messages/speechRate_en-US.json
    A demos/assessment/messages/textSize_en-US.json
    A demos/assessment/messages/welcome_en-US.json
    A demos/assessment/schemas/schemas.js
    M demos/index.html
    A demos/js/demos.js
    A demos/voting/css/style.css
    A demos/voting/css/vote.css
    A demos/voting/fonts/voting.eot
    A demos/voting/fonts/voting.ttf
    A demos/voting/fonts/voting.zip
    A demos/voting/html/firstDiscovery.html
    A demos/voting/index.html
    A demos/voting/messages/firstDiscovery_en-US.json
    A demos/voting/messages/firstDiscovery_es-MX.json
    A demos/voting/messages/firstDiscovery_fr-FR.json
    A demos/voting/messages/welcome_en-US.json
    A demos/voting/messages/welcome_es-MX.json
    A demos/voting/messages/welcome_fr-FR.json
    A demos/voting/schemas/schemas.js
    A demos/voting/vote.html
    M src/css/style.css
    M src/fonts/pga-fd.eot
    M src/fonts/pga-fd.ttf
    M src/html/contrast.html
    M src/html/firstDiscovery.html
    M src/html/keyboard.html
    M src/html/lang.html
    M src/html/rangeTemplate.html
    A src/html/rangeWithDisabledMsgTemplate.html
    R src/html/speakText.html
    R src/html/tts.html
    A src/html/yesNo.html
    M src/js/firstDiscoveryEditor.js
    M src/js/helpButton.js
    M src/js/keyboardInput.js
    A src/js/nav.js
    M src/js/navButtons.js
    M src/js/navIcons.js
    M src/js/panels.js
    M src/js/selfVoicing.js
    A src/js/stepCount.js
    M src/js/stickyKeysAdjuster.js
    M src/js/tooltip.js
    M src/js/ttsHookup.js
    M src/lib/infusion/VERSION.md
    M src/lib/infusion/infusion-custom.js
    A src/messages/captions_en-US.json
    A src/messages/captions_es-MX.json
    R src/messages/congratulations.json
    A src/messages/congratulations_en-US.json
    A src/messages/congratulations_es-MX.json
    A src/messages/congratulations_fr-FR.json
    R src/messages/contrast.json
    A src/messages/contrast_en-US.json
    A src/messages/contrast_es-MX.json
    R src/messages/firstDiscovery.json
    A src/messages/firstDiscovery_en-US.json
    A src/messages/firstDiscovery_es-MX.json
    A src/messages/firstDiscovery_fr-FR.json
    R src/messages/firstDiscovery_fr.json
    R src/messages/keyboard.json
    A src/messages/keyboard_en-US.json
    A src/messages/keyboard_es-MX.json
    A src/messages/keyboard_fr-FR.json
    R src/messages/lang.json
    A src/messages/lang_en-US.json
    A src/messages/lang_es-MX.json
    A src/messages/lang_fr-FR.json
    R src/messages/lang_fr.json
    A src/messages/onScreenKeyboard_en-US.json
    A src/messages/onScreenKeyboard_es-MX.json
    A src/messages/showSounds_en-US.json
    A src/messages/showSounds_es-MX.json
    R src/messages/speakText.json
    A src/messages/speakText_en-US.json
    A src/messages/speakText_es-MX.json
    A src/messages/speakText_fr-FR.json
    A src/messages/speechRate_en-US.json
    A src/messages/speechRate_es-MX.json
    R src/messages/textSize.json
    A src/messages/textSize_en-US.json
    A src/messages/textSize_es-MX.json
    A src/messages/textSize_fr-FR.json
    R src/messages/welcome.json
    A src/messages/welcome_en-US.json
    A src/messages/welcome_es-MX.json
    A src/messages/welcome_fr-FR.json
    M src/schemas/schemas.js
    M tests/all-tests.html
    M tests/html/firstDiscoveryEditor-Tests.html
    A tests/html/nav-Tests.html
    M tests/html/navIcons-Tests.html
    M tests/html/panels-Tests.html
    A tests/html/stepCount-Tests.html
    M tests/html/ttsHookup-Tests.html
    M tests/js/firstDiscoveryEditorTests.js
    M tests/js/helpButtonTests.js
    M tests/js/keyboardInputTests.js
    M tests/js/navButtonsTests.js
    M tests/js/navIconsTests.js
    A tests/js/navTests.js
    M tests/js/panelsTests.js
    M tests/js/selfVoicingTests.js
    A tests/js/stepCountTests.js
    M tests/js/stickyKeysAdjusterTests.js
    M tests/js/testUtils.js
    M tests/js/ttsHookupTests.js

  Log Message:
  -----------
  Merge branch 'master' into FLOE-331 and merge conflicts

# Conflicts:
#	src/js/firstDiscoveryEditor.js
#	src/js/navIcons.js


  Commit: 35f3c4e88406b17a533b07c1ce76bdc601f4b876
      https://github.com/fluid-project/first-discovery/commit/35f3c4e88406b17a533b07c1ce76bdc601f4b876
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-06-19 (Fri, 19 Jun 2015)

  Changed paths:
    M src/js/firstDiscoveryEditor.js
    M src/js/navIcons.js
    M src/js/panels.js
    M src/lib/infusion/Infusion-LICENSE.txt
    M src/lib/infusion/VERSION.md
    M src/lib/infusion/infusion-custom.js
    M src/lib/infusion/src/components/tableOfContents/css/TableOfContents.css
    M src/lib/infusion/src/components/tableOfContents/html/TableOfContents.html
    M src/lib/infusion/src/framework/core/css/fluid.css
    M src/lib/infusion/src/framework/preferences/css/Enactors.css
    M src/lib/infusion/src/framework/preferences/css/FullNoPreviewPrefsEditor.css
    M src/lib/infusion/src/framework/preferences/css/FullPrefsEditor.css
    M src/lib/infusion/src/framework/preferences/css/FullPreviewPrefsEditor.css
    M src/lib/infusion/src/framework/preferences/css/PrefsEditor.css
    M src/lib/infusion/src/framework/preferences/css/SeparatedPanelPrefsEditor.css
    M src/lib/infusion/src/framework/preferences/css/SeparatedPanelPrefsEditorFrame.css
    M src/lib/infusion/src/framework/preferences/css/stylus/Enactors.styl
    M src/lib/infusion/src/framework/preferences/css/stylus/FullNoPreviewPrefsEditor.styl
    M src/lib/infusion/src/framework/preferences/css/stylus/FullPrefsEditor.styl
    M src/lib/infusion/src/framework/preferences/css/stylus/FullPreviewPrefsEditor.styl
    M src/lib/infusion/src/framework/preferences/css/stylus/PrefsEditor.styl
    M src/lib/infusion/src/framework/preferences/css/stylus/README.md
    M src/lib/infusion/src/framework/preferences/css/stylus/SeparatedPanelPrefsEditor.styl
    M src/lib/infusion/src/framework/preferences/css/stylus/SeparatedPanelPrefsEditorFrame.styl
    M src/lib/infusion/src/framework/preferences/css/stylus/utils/Helpers.styl
    M src/lib/infusion/src/framework/preferences/css/stylus/utils/Themes.styl
    M src/lib/infusion/src/framework/preferences/fonts/InfusionIcons-PrefsEditor.eot
    M src/lib/infusion/src/framework/preferences/fonts/InfusionIcons-PrefsEditor.ttf
    M src/lib/infusion/src/framework/preferences/html/FullNoPreviewPrefsEditor.html
    M src/lib/infusion/src/framework/preferences/html/FullPreviewPrefsEditor.html
    M src/lib/infusion/src/framework/preferences/html/PrefsEditorTemplate-contrast.html
    M src/lib/infusion/src/framework/preferences/html/PrefsEditorTemplate-emphasizeLinks.html
    M src/lib/infusion/src/framework/preferences/html/PrefsEditorTemplate-inputsLarger.html
    M src/lib/infusion/src/framework/preferences/html/PrefsEditorTemplate-layout.html
    M src/lib/infusion/src/framework/preferences/html/PrefsEditorTemplate-lineSpace.html
    M src/lib/infusion/src/framework/preferences/html/PrefsEditorTemplate-linksControls.html
    M src/lib/infusion/src/framework/preferences/html/PrefsEditorTemplate-speak.html
    M src/lib/infusion/src/framework/preferences/html/PrefsEditorTemplate-textFont.html
    M src/lib/infusion/src/framework/preferences/html/PrefsEditorTemplate-textSize.html
    M src/lib/infusion/src/framework/preferences/html/SeparatedPanelPrefsEditor.html
    M src/lib/infusion/src/framework/preferences/html/SeparatedPanelPrefsEditorFrame.html
    M src/lib/infusion/src/framework/preferences/images/default/separatedpanelbg.png
    M src/lib/infusion/src/framework/preferences/messages/contrast.json
    M src/lib/infusion/src/framework/preferences/messages/emphasizeLinks.json
    M src/lib/infusion/src/framework/preferences/messages/inputsLarger.json
    M src/lib/infusion/src/framework/preferences/messages/lineSpace.json
    M src/lib/infusion/src/framework/preferences/messages/linksControls.json
    M src/lib/infusion/src/framework/preferences/messages/prefsEditor.json
    M src/lib/infusion/src/framework/preferences/messages/speak.json
    M src/lib/infusion/src/framework/preferences/messages/tableOfContents.json
    M src/lib/infusion/src/framework/preferences/messages/textFont.json
    M src/lib/infusion/src/framework/preferences/messages/textSize.json
    M src/lib/infusion/src/lib/fonts/OpenSans-LICENSE.txt
    M src/lib/infusion/src/lib/fonts/OpenSans-Light.ttf
    M src/lib/infusion/src/lib/fonts/OpenSans-Regular.ttf
    M src/lib/infusion/src/lib/fonts/OpenSans-Semibold.ttf
    M src/lib/infusion/src/lib/fonts/fontsDependencies.json
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/images/animated-overlay.gif
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/images/ui-bg_flat_0_aaaaaa_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/images/ui-bg_flat_75_ffffff_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/images/ui-bg_glass_55_fbf9ee_1x400.png
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/images/ui-bg_glass_65_ffffff_1x400.png
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/images/ui-bg_glass_75_dadada_1x400.png
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/images/ui-bg_glass_75_e6e6e6_1x400.png
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/images/ui-bg_glass_95_fef1ec_1x400.png
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/images/ui-icons_222222_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/images/ui-icons_2e83ff_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/images/ui-icons_454545_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/images/ui-icons_888888_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/images/ui-icons_cd0a0a_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/jquery.ui.theme.css
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-bw/bw.css
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-bw/images/animated-overlay.gif
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-bw/images/ui-bg_flat_0_000000_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-bw/images/ui-bg_flat_0_ffffff_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-bw/images/ui-icons_000000_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-bw/images/ui-icons_ffffff_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-by/by.css
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-by/images/animated-overlay.gif
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-by/images/ui-bg_flat_0_000000_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-by/images/ui-bg_flat_0_ffff00_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-by/images/ui-icons_000000_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-by/images/ui-icons_ffff00_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/coal.css
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/animated-overlay.gif
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_flat_0_000000_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_flat_75_cccccc_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_highlight-soft_25_575757_1x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_highlight-soft_55_cccccc_1x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_highlight-soft_65_000000_1x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_highlight-soft_75_333333_1x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_highlight-soft_75_666666_1x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_inset-soft_95_fef1ec_1x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_222222_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_333333_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_a3a3a3_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_cccccc_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_cd0a0a_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_ffffff_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-dglg/dglg.css
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-dglg/images/animated-overlay.gif
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-dglg/images/ui-bg_flat_0_bdbdbb_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-dglg/images/ui-bg_flat_100_555_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-dglg/images/ui-bg_flat_100_bdbdbb_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-dglg/images/ui-icons_555_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-dglg/images/ui-icons_bdbdbb_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-hc/hc.css
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-hci/hci.css
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-lgdg/images/animated-overlay.gif
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-lgdg/images/ui-bg_flat_0_555_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-lgdg/images/ui-bg_flat_100_555_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-lgdg/images/ui-bg_flat_100_bdbdbb_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-lgdg/images/ui-icons_555_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-lgdg/images/ui-icons_bdbdbb_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-lgdg/lgdg.css
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/animated-overlay.gif
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_flat_0_000000_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_flat_0_2e83ff_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_flat_75_ffffff_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_glass_65_ffffff_1x400.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_glass_75_9dcaf6_1x400.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_glass_75_d9e8f7_1x400.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_highlight-soft_55_9dcaf6_1x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_inset-soft_95_fef1ec_1x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_000000_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_222222_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_2e83ff_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_454545_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_888888_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_cd0a0a_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/mist.css
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/images/animated-overlay.gif
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_flat_0_666666_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_flat_0_999999_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_flat_0_cccccc_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_flat_0_ebebeb_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_flat_0_ffffff_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_glass_75_666666_1x400.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_highlight-hard_100_ebebeb_1x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_highlight-soft_75_999999_1x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_inset-hard_100_ebebeb_1x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/images/ui-icons_000000_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/images/ui-icons_666666_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/images/ui-icons_ebebeb_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/images/ui-icons_ffffff_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/slate.css
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-wb/images/animated-overlay.gif
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-wb/images/ui-bg_flat_0_000000_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-wb/images/ui-bg_flat_0_ffffff_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-wb/images/ui-icons_000000_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-wb/images/ui-icons_ffffff_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-wb/wb.css
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-yb/images/animated-overlay.gif
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-yb/images/ui-bg_flat_0_000000_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-yb/images/ui-bg_flat_0_ffff00_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-yb/images/ui-icons_000000_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-yb/images/ui-icons_ffff00_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-yb/yb.css
    M src/lib/infusion/src/lib/normalize/css/normalize.css
    M tests/js/firstDiscoveryEditorTests.js

  Log Message:
  -----------
  FLOE-331: Updated the infusion lib and fixed the save of the state info of nav icons.


  Commit: f5b83b8a52d9701669c6f9930c30e2cbc10f7ddb
      https://github.com/fluid-project/first-discovery/commit/f5b83b8a52d9701669c6f9930c30e2cbc10f7ddb
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M src/js/navIcons.js

  Log Message:
  -----------
  FLOE-331: Fixed the initial state setting for the active icon.


  Commit: 374186b2a82cb6d20f26c53114d2e4f2923eb118
      https://github.com/fluid-project/first-discovery/commit/374186b2a82cb6d20f26c53114d2e4f2923eb118
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-07-10 (Fri, 10 Jul 2015)

  Changed paths:
    M src/js/firstDiscoveryEditor.js
    M src/js/navIcons.js
    M src/js/panels.js
    M src/lib/infusion/VERSION.md
    M src/lib/infusion/infusion-custom.js
    M src/schemas/schemas.js

  Log Message:
  -----------
  FLOE-331: Save the state of the sticky key panel into the central model.


  Commit: 87e5b1b0b6f90ba627ca91f46d2d254c077ef95f
      https://github.com/fluid-project/first-discovery/commit/87e5b1b0b6f90ba627ca91f46d2d254c077ef95f
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-07-14 (Tue, 14 Jul 2015)

  Changed paths:
    M demos/assessment/schemas/schemas.js
    M demos/voting/schemas/schemas.js
    M src/js/navIcons.js

  Log Message:
  -----------
  FLOE-331: Improved the navIcons component with the way of handling the icon state as well as adding the "terms" block into aux schemas of voting and assessment demos.


  Commit: 921166b65f17414aca549b8142cea744d1f9b6a9
      https://github.com/fluid-project/first-discovery/commit/921166b65f17414aca549b8142cea744d1f9b6a9
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M src/js/panels.js
    M src/schemas/schemas.js

  Log Message:
  -----------
  FLOE-331: Attach "gpii.firstDiscovery.panel.keyboard.prefEditorConnection" to its panel component "gpii.firstDiscovery.panel.keyboard" via the aux schema instead of directly adding it as a grade name in the defaults block. This fixes the panel test failure.


  Commit: eeb9bf78b2e6725302c6a43cdb0de222a9c0cc87
      https://github.com/fluid-project/first-discovery/commit/eeb9bf78b2e6725302c6a43cdb0de222a9c0cc87
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M demos/js/demos.js
    M src/css/style.css
    M src/js/enactors.js
    M src/js/keyboardInput.js
    M src/js/navButtons.js
    M src/js/panels.js
    M src/js/ttsHookup.js
    A src/messages/captions_fr-FR.json
    M src/messages/congratulations_fr-FR.json
    A src/messages/contrast_fr-FR.json
    M src/messages/firstDiscovery_fr-FR.json
    M src/messages/keyboard_fr-FR.json
    M src/messages/lang_en-US.json
    M src/messages/lang_es-MX.json
    M src/messages/lang_fr-FR.json
    A src/messages/onScreenKeyboard_fr-FR.json
    A src/messages/showSounds_fr-FR.json
    M src/messages/speakText_fr-FR.json
    A src/messages/speechRate_fr-FR.json
    M src/messages/textSize_fr-FR.json
    M src/messages/welcome_fr-FR.json
    M tests/js/firstDiscoveryEditorTests.js
    M tests/js/keyboardInputTests.js
    M tests/js/keyboardShortcutTests.js
    M tests/js/panelsTests.js
    M tests/js/testUtils.js
    M tests/js/ttsHookupTests.js

  Log Message:
  -----------
  Merge branch 'master' into FLOE-331


  Commit: 5c0bd7c6a6a4361fcccff9b7d0b467663e0afa28
      https://github.com/fluid-project/first-discovery/commit/5c0bd7c6a6a4361fcccff9b7d0b467663e0afa28
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    M demos/assessment/index.html
    M demos/assessment/schemas/schemas.js
    M demos/index.html
    M demos/js/demos.js
    M demos/voting/index.html
    M demos/voting/schemas/schemas.js
    M src/css/style.css
    M src/js/enactors.js
    M src/js/firstDiscoveryEditor.js
    M src/js/helpButton.js
    M src/js/keyboardInput.js
    M src/js/msgLookup.js
    M src/js/nav.js
    M src/js/navButtons.js
    M src/js/navIcons.js
    M src/js/panels.js
    M src/js/selfVoicing.js
    M src/js/stepCount.js
    M src/js/stickyKeysAdjuster.js
    M src/js/stickyKeysAssessment.js
    M src/js/tooltip.js
    M src/js/ttsHookup.js
    M src/lib/infusion/Infusion-LICENSE.txt
    M src/lib/infusion/VERSION.md
    M src/lib/infusion/infusion-custom.js
    M src/lib/infusion/src/components/tableOfContents/css/TableOfContents.css
    M src/lib/infusion/src/components/tableOfContents/html/TableOfContents.html
    A src/lib/infusion/src/components/textToSpeech/js/MockTTS.js
    M src/lib/infusion/src/framework/core/css/fluid.css
    A src/lib/infusion/src/framework/core/css/fluidDebugging.css
    A src/lib/infusion/src/framework/core/images/debug_tab.png
    A src/lib/infusion/src/framework/core/images/magnifying_glass.png
    M src/lib/infusion/src/framework/preferences/css/Enactors.css
    M src/lib/infusion/src/framework/preferences/css/FullNoPreviewPrefsEditor.css
    M src/lib/infusion/src/framework/preferences/css/FullPrefsEditor.css
    M src/lib/infusion/src/framework/preferences/css/FullPreviewPrefsEditor.css
    M src/lib/infusion/src/framework/preferences/css/PrefsEditor.css
    M src/lib/infusion/src/framework/preferences/css/SeparatedPanelPrefsEditor.css
    M src/lib/infusion/src/framework/preferences/css/SeparatedPanelPrefsEditorFrame.css
    M src/lib/infusion/src/framework/preferences/css/stylus/Enactors.styl
    M src/lib/infusion/src/framework/preferences/css/stylus/FullNoPreviewPrefsEditor.styl
    M src/lib/infusion/src/framework/preferences/css/stylus/FullPrefsEditor.styl
    M src/lib/infusion/src/framework/preferences/css/stylus/FullPreviewPrefsEditor.styl
    M src/lib/infusion/src/framework/preferences/css/stylus/PrefsEditor.styl
    M src/lib/infusion/src/framework/preferences/css/stylus/README.md
    M src/lib/infusion/src/framework/preferences/css/stylus/SeparatedPanelPrefsEditor.styl
    M src/lib/infusion/src/framework/preferences/css/stylus/SeparatedPanelPrefsEditorFrame.styl
    M src/lib/infusion/src/framework/preferences/css/stylus/utils/Helpers.styl
    M src/lib/infusion/src/framework/preferences/css/stylus/utils/Themes.styl
    M src/lib/infusion/src/framework/preferences/fonts/InfusionIcons-PrefsEditor.eot
    M src/lib/infusion/src/framework/preferences/fonts/InfusionIcons-PrefsEditor.ttf
    M src/lib/infusion/src/framework/preferences/html/FullNoPreviewPrefsEditor.html
    M src/lib/infusion/src/framework/preferences/html/FullPreviewPrefsEditor.html
    M src/lib/infusion/src/framework/preferences/html/PrefsEditorTemplate-contrast.html
    M src/lib/infusion/src/framework/preferences/html/PrefsEditorTemplate-emphasizeLinks.html
    M src/lib/infusion/src/framework/preferences/html/PrefsEditorTemplate-inputsLarger.html
    M src/lib/infusion/src/framework/preferences/html/PrefsEditorTemplate-layout.html
    M src/lib/infusion/src/framework/preferences/html/PrefsEditorTemplate-lineSpace.html
    M src/lib/infusion/src/framework/preferences/html/PrefsEditorTemplate-linksControls.html
    M src/lib/infusion/src/framework/preferences/html/PrefsEditorTemplate-speak.html
    M src/lib/infusion/src/framework/preferences/html/PrefsEditorTemplate-textFont.html
    M src/lib/infusion/src/framework/preferences/html/PrefsEditorTemplate-textSize.html
    M src/lib/infusion/src/framework/preferences/html/SeparatedPanelPrefsEditor.html
    M src/lib/infusion/src/framework/preferences/html/SeparatedPanelPrefsEditorFrame.html
    M src/lib/infusion/src/framework/preferences/images/default/separatedpanelbg.png
    M src/lib/infusion/src/framework/preferences/messages/contrast.json
    M src/lib/infusion/src/framework/preferences/messages/emphasizeLinks.json
    M src/lib/infusion/src/framework/preferences/messages/inputsLarger.json
    M src/lib/infusion/src/framework/preferences/messages/lineSpace.json
    M src/lib/infusion/src/framework/preferences/messages/linksControls.json
    M src/lib/infusion/src/framework/preferences/messages/prefsEditor.json
    M src/lib/infusion/src/framework/preferences/messages/speak.json
    M src/lib/infusion/src/framework/preferences/messages/tableOfContents.json
    M src/lib/infusion/src/framework/preferences/messages/textFont.json
    M src/lib/infusion/src/framework/preferences/messages/textSize.json
    M src/lib/infusion/src/lib/fonts/OpenSans-LICENSE.txt
    M src/lib/infusion/src/lib/fonts/OpenSans-Light.ttf
    M src/lib/infusion/src/lib/fonts/OpenSans-Regular.ttf
    M src/lib/infusion/src/lib/fonts/OpenSans-Semibold.ttf
    M src/lib/infusion/src/lib/fonts/fontsDependencies.json
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/images/animated-overlay.gif
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/images/ui-bg_flat_0_aaaaaa_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/images/ui-bg_flat_75_ffffff_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/images/ui-bg_glass_55_fbf9ee_1x400.png
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/images/ui-bg_glass_65_ffffff_1x400.png
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/images/ui-bg_glass_75_dadada_1x400.png
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/images/ui-bg_glass_75_e6e6e6_1x400.png
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/images/ui-bg_glass_95_fef1ec_1x400.png
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/images/ui-icons_222222_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/images/ui-icons_2e83ff_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/images/ui-icons_454545_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/images/ui-icons_888888_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/images/ui-icons_cd0a0a_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/default-theme/jquery.ui.theme.css
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-bw/bw.css
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-bw/images/animated-overlay.gif
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-bw/images/ui-bg_flat_0_000000_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-bw/images/ui-bg_flat_0_ffffff_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-bw/images/ui-icons_000000_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-bw/images/ui-icons_ffffff_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-by/by.css
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-by/images/animated-overlay.gif
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-by/images/ui-bg_flat_0_000000_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-by/images/ui-bg_flat_0_ffff00_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-by/images/ui-icons_000000_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-by/images/ui-icons_ffff00_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/coal.css
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/animated-overlay.gif
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_flat_0_000000_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_flat_75_cccccc_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_highlight-soft_25_575757_1x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_highlight-soft_55_cccccc_1x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_highlight-soft_65_000000_1x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_highlight-soft_75_333333_1x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_highlight-soft_75_666666_1x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_inset-soft_95_fef1ec_1x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_222222_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_333333_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_a3a3a3_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_cccccc_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_cd0a0a_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_ffffff_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-dglg/dglg.css
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-dglg/images/animated-overlay.gif
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-dglg/images/ui-bg_flat_0_bdbdbb_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-dglg/images/ui-bg_flat_100_555_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-dglg/images/ui-bg_flat_100_bdbdbb_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-dglg/images/ui-icons_555_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-dglg/images/ui-icons_bdbdbb_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-hc/hc.css
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-hci/hci.css
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-lgdg/images/animated-overlay.gif
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-lgdg/images/ui-bg_flat_0_555_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-lgdg/images/ui-bg_flat_100_555_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-lgdg/images/ui-bg_flat_100_bdbdbb_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-lgdg/images/ui-icons_555_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-lgdg/images/ui-icons_bdbdbb_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-lgdg/lgdg.css
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/animated-overlay.gif
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_flat_0_000000_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_flat_0_2e83ff_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_flat_75_ffffff_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_glass_65_ffffff_1x400.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_glass_75_9dcaf6_1x400.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_glass_75_d9e8f7_1x400.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_highlight-soft_55_9dcaf6_1x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_inset-soft_95_fef1ec_1x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_000000_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_222222_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_2e83ff_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_454545_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_888888_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_cd0a0a_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-mist/mist.css
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/images/animated-overlay.gif
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_flat_0_666666_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_flat_0_999999_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_flat_0_cccccc_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_flat_0_ebebeb_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_flat_0_ffffff_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_glass_75_666666_1x400.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_highlight-hard_100_ebebeb_1x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_highlight-soft_75_999999_1x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_inset-hard_100_ebebeb_1x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/images/ui-icons_000000_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/images/ui-icons_666666_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/images/ui-icons_ebebeb_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/images/ui-icons_ffffff_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-slate/slate.css
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-wb/images/animated-overlay.gif
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-wb/images/ui-bg_flat_0_000000_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-wb/images/ui-bg_flat_0_ffffff_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-wb/images/ui-icons_000000_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-wb/images/ui-icons_ffffff_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-wb/wb.css
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-yb/images/animated-overlay.gif
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-yb/images/ui-bg_flat_0_000000_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-yb/images/ui-bg_flat_0_ffff00_40x100.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-yb/images/ui-icons_000000_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-yb/images/ui-icons_ffff00_256x240.png
    M src/lib/infusion/src/lib/jquery/ui/css/fl-theme-yb/yb.css
    M src/lib/infusion/src/lib/normalize/css/normalize.css
    M src/schemas/schemas.js
    M tests/html/firstDiscoveryEditor-Tests.html
    M tests/html/selfVoicing-Tests.html
    M tests/html/ttsHookup-Tests.html
    M tests/js/enactorsTests.js
    M tests/js/firstDiscoveryEditorTests.js
    M tests/js/helpButtonTests.js
    M tests/js/keyboardInputTests.js
    M tests/js/msgLookupTests.js
    M tests/js/navTests.js
    M tests/js/panelsTests.js
    M tests/js/selfVoicingTests.js
    M tests/js/stepCountTests.js
    M tests/js/stickyKeysAdjusterTests.js
    M tests/js/stickyKeysAssessmentTests.js
    M tests/js/tooltipTests.js
    M tests/js/ttsHookupTests.js
    M tests/lib/infusion/lib/qunit/addons/composite/qunit-composite.js
    M tests/lib/infusion/test-core/jqUnit/js/jqUnit.js
    M tests/lib/infusion/test-core/utils/js/DebugFocus.js
    M tests/lib/infusion/test-core/utils/js/IoCTestUtils.js

  Log Message:
  -----------
  Merge branch 'FLOE-416' into FLOE-331 and resolve conflicts

# Conflicts:
#	demos/assessment/schemas/schemas.js
#	demos/voting/schemas/schemas.js
#	src/js/firstDiscoveryEditor.js
#	src/lib/infusion/VERSION.md
#	src/lib/infusion/infusion-custom.js
#	src/schemas/schemas.js
#	tests/js/firstDiscoveryEditorTests.js


  Commit: dbde124aa01021079e0b668b577bfb82165c3425
      https://github.com/fluid-project/first-discovery/commit/dbde124aa01021079e0b668b577bfb82165c3425
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-09-18 (Fri, 18 Sep 2015)

  Changed paths:
    M src/js/panels.js
    M src/schemas/schemas.js

  Log Message:
  -----------
  FLOE-331: Updated the new code to be in line with infusion 2.0.


  Commit: 608e1c39a2570683b7d4150ea9d6f7fed5be9dd8
      https://github.com/fluid-project/first-discovery/commit/608e1c39a2570683b7d4150ea9d6f7fed5be9dd8
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-09-18 (Fri, 18 Sep 2015)

  Changed paths:
    M src/lib/infusion/VERSION.md
    M src/lib/infusion/infusion-custom.js
    M src/lib/infusion/src/components/textToSpeech/js/MockTTS.js
    M tests/js/selfVoicingTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'justin/FLOE-416' into FLOE-331


  Commit: 0b74ee25a0aa1022a775d4580f4bc9faaf68705c
      https://github.com/fluid-project/first-discovery/commit/0b74ee25a0aa1022a775d4580f4bc9faaf68705c
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-09-18 (Fri, 18 Sep 2015)

  Changed paths:
    M src/js/ttsHookup.js

  Log Message:
  -----------
  FLOE-331: Prevent the TTS listener to execute at the initial state model info relay.


  Commit: 3310a057d9bb4e98b0f309c138e12a8fc23c12b8
      https://github.com/fluid-project/first-discovery/commit/3310a057d9bb4e98b0f309c138e12a8fc23c12b8
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-09-19 (Sat, 19 Sep 2015)

  Changed paths:
    M src/lib/infusion/VERSION.md
    M src/lib/infusion/infusion-custom.js

  Log Message:
  -----------
  FLOE-331: Upgrade the infusion library.


  Commit: 63004f2dee681f5f4cecad468fcd437b9e243206
      https://github.com/fluid-project/first-discovery/commit/63004f2dee681f5f4cecad468fcd437b9e243206
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-09-22 (Tue, 22 Sep 2015)

  Changed paths:
    M src/lib/infusion/Infusion-LICENSE.txt
    M src/lib/infusion/VERSION.md
    M src/lib/infusion/infusion-custom.js

  Log Message:
  -----------
  FLOE-331: Upgraded the infusion library.


  Commit: a9d60d7caee3f333b7a32a591e074e4905fb4c7a
      https://github.com/fluid-project/first-discovery/commit/a9d60d7caee3f333b7a32a591e074e4905fb4c7a
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-09-22 (Tue, 22 Sep 2015)

  Changed paths:
    M tests/html/firstDiscoveryEditor-Tests.html
    M tests/js/firstDiscoveryEditorTests.js

  Log Message:
  -----------
  FLOE-331: Adding unit tests for saving state information.


  Commit: 371984f285b6d897f295968853894f19a257d4b8
      https://github.com/fluid-project/first-discovery/commit/371984f285b6d897f295968853894f19a257d4b8
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-09-23 (Wed, 23 Sep 2015)

  Changed paths:
    M tests/js/firstDiscoveryEditorTests.js

  Log Message:
  -----------
  FLOE-331: Completed the integration test for saving state information.


  Commit: b7e987fab751acde4571eb478009ed2a48f89291
      https://github.com/fluid-project/first-discovery/commit/b7e987fab751acde4571eb478009ed2a48f89291
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-09-23 (Wed, 23 Sep 2015)

  Changed paths:
    M src/js/navIcons.js
    M tests/js/navIconsTests.js

  Log Message:
  -----------
  FLOE-331: Added tests for navIcons.js


  Commit: fe0c539038e2cad625486c97c5ed71c4b0555891
      https://github.com/fluid-project/first-discovery/commit/fe0c539038e2cad625486c97c5ed71c4b0555891
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-09-24 (Thu, 24 Sep 2015)

  Changed paths:
    M src/css/style.css
    M src/js/panels.js
    M src/js/stepCount.js
    M tests/js/panelsTests.js

  Log Message:
  -----------
  Merge branch 'master' into FLOE-331


  Commit: e0eaff511ad10839d30bbe7e26e6ddf96c48a86f
      https://github.com/fluid-project/first-discovery/commit/e0eaff511ad10839d30bbe7e26e6ddf96c48a86f
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-09-24 (Thu, 24 Sep 2015)

  Changed paths:
    M demos/assessment/schemas/schemas.js
    M demos/voting/schemas/schemas.js
    M src/js/firstDiscoveryEditor.js
    M src/js/navIcons.js
    M src/js/panels.js
    M src/js/ttsHookup.js
    M src/schemas/schemas.js

  Log Message:
  -----------
  FLOE-331: Clean up the code.


  Commit: 0aed73c59ec99e05edf8a830082359a2cbf3babf
      https://github.com/fluid-project/first-discovery/commit/0aed73c59ec99e05edf8a830082359a2cbf3babf
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-09-24 (Thu, 24 Sep 2015)

  Changed paths:
    M demos/assessment/schemas/schemas.js
    M demos/voting/schemas/schemas.js
    M src/js/navIcons.js
    M src/js/panels.js
    M src/schemas/schemas.js
    M tests/js/firstDiscoveryEditorTests.js

  Log Message:
  -----------
  FLOE-331: Code improvement.


  Commit: d197997466e56c6bc543ed5911e393a5213a1b00
      https://github.com/fluid-project/first-discovery/commit/d197997466e56c6bc543ed5911e393a5213a1b00
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    M src/js/navIcons.js

  Log Message:
  -----------
  FLOE-331: A function parameter name change.


  Commit: b364ff3392cfca7cc343885bea633385f946eaae
      https://github.com/fluid-project/first-discovery/commit/b364ff3392cfca7cc343885bea633385f946eaae
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    M src/js/panels.js
    M tests/html/firstDiscoveryEditor-Tests.html
    M tests/js/firstDiscoveryEditorTests.js

  Log Message:
  -----------
  FLOE-331: Destroyed the sticky key assessor component if the initial model already has the offerAssistance value. The set of this value means the assessment has been performed from the last visit to the FD tool and no longer needed for the new round.


  Commit: 4eab9e1ed2caf767876a0525b922565c897622c6
      https://github.com/fluid-project/first-discovery/commit/4eab9e1ed2caf767876a0525b922565c897622c6
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    M demos/assessment/schemas/schemas.js
    M demos/voting/schemas/schemas.js
    M src/js/firstDiscoveryEditor.js
    M src/js/nav.js
    M src/js/navIcons.js
    M src/js/panels.js
    M src/js/ttsHookup.js
    M src/lib/infusion/Infusion-LICENSE.txt
    M src/lib/infusion/VERSION.md
    M src/lib/infusion/infusion-custom.js
    M src/schemas/schemas.js
    M tests/html/firstDiscoveryEditor-Tests.html
    M tests/js/firstDiscoveryEditorTests.js
    M tests/js/navIconsTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'cindy/FLOE-331'

* cindy/FLOE-331:
  FLOE-331: Destroyed the sticky key assessor component if the initial model already has the offerAssistance value. The set of this value means the assessment has been performed from the last visit to the FD tool and no longer needed for the new round.
  FLOE-331: A function parameter name change.
  FLOE-331: Code improvement.
  FLOE-331: Clean up the code.
  FLOE-331: Added tests for navIcons.js
  FLOE-331: Completed the integration test for saving state information.
  FLOE-331: Adding unit tests for saving state information.
  FLOE-331: Upgraded the infusion library.
  FLOE-331: Upgrade the infusion library.
  FLOE-331: Prevent the TTS listener to execute at the initial state model info relay.
  FLOE-331: Updated the new code to be in line with infusion 2.0.
  FLOE-331: Attach "gpii.firstDiscovery.panel.keyboard.prefEditorConnection" to its panel component "gpii.firstDiscovery.panel.keyboard" via the aux schema instead of directly adding it as a grade name in the defaults block. This fixes the panel test failure.
  FLOE-331: Improved the navIcons component with the way of handling the icon state as well as adding the "terms" block into aux schemas of voting and assessment demos.
  FLOE-331: Save the state of the sticky key panel into the central model.
  FLOE-331: Fixed the initial state setting for the active icon.
  FLOE-331: Updated the infusion lib and fixed the save of the state info of nav icons.
  FLOE-331: Add model relay for saving sticky key panel states into the central model.
  FLOE-331: Saved these state info into the central model: the current panel number and the visited panel numbers. These states help to preserve navigation icon states (confirmed or active states) at page reload.


Compare: https://github.com/fluid-project/first-discovery/compare/74f6407b4aac...4eab9e1ed2ca


More information about the Commits mailing list