[Commits] [fluid-project/infusion] f3de9d: Merge pull request #6 from fluid-project/master

GitHub noreply at github.com
Wed Aug 31 12:39:16 UTC 2016


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: f3de9d530fb2df72d721928d11b8ae6d37bae821
      https://github.com/fluid-project/infusion/commit/f3de9d530fb2df72d721928d11b8ae6d37bae821
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2016-07-27 (Wed, 27 Jul 2016)

  Changed paths:
    M .eslintrc.json
    M Gruntfile.js
    M README.md
    M Vagrantfile
    M demos/prefsFramework/index.html
    M demos/uiOptions/index.html
    R examples/framework/preferences/conditionalAdjusters-singlePanel/index.html
    A examples/framework/preferences/conditionalAdjusters-singlePanel/jQueryUI.html
    M examples/framework/preferences/conditionalAdjusters-singlePanel/js/auxiliarySchema.js
    A examples/framework/preferences/conditionalAdjusters-singlePanel/nativeHTML.html
    R examples/framework/preferences/conditionalAdjusters/index.html
    A examples/framework/preferences/conditionalAdjusters/jQueryUI.html
    M examples/framework/preferences/conditionalAdjusters/js/auxiliarySchema.js
    A examples/framework/preferences/conditionalAdjusters/nativeHTML.html
    M examples/framework/preferences/minimalEditor/index.html
    A examples/framework/preferences/shared/html/SeparatedPanelPrefsEditorFrame-jQueryUI.html
    A examples/framework/preferences/shared/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html
    R examples/framework/preferences/shared/html/SeparatedPanelPrefsEditorFrame.html
    A examples/framework/preferences/shared/html/slider-template-jQueryUI.html
    A examples/framework/preferences/shared/html/slider-template-nativeHTML.html
    R examples/framework/preferences/shared/html/slider-template.html
    A examples/framework/preferences/shared/js/contextAwareAuxSchemas.js
    M examples/framework/preferences/usingGrades/index.html
    M provisioning/vars.yml
    M src/components/pager/js/PagedTable.js
    M src/components/textfieldSlider/js/TextfieldSlider.js
    M src/components/textfieldSlider/textfieldSliderDependencies.json
    M src/framework/core/frameworkDependencies.json
    A src/framework/core/js/ResourceLoader.js
    A src/framework/preferences/html/PrefsEditorTemplate-lineSpace-jQueryUI.html
    A src/framework/preferences/html/PrefsEditorTemplate-lineSpace-nativeHTML.html
    R src/framework/preferences/html/PrefsEditorTemplate-lineSpace.html
    A src/framework/preferences/html/PrefsEditorTemplate-textSize-jQueryUI.html
    A src/framework/preferences/html/PrefsEditorTemplate-textSize-nativeHTML.html
    R src/framework/preferences/html/PrefsEditorTemplate-textSize.html
    A src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-jQueryUI.html
    A src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html
    R src/framework/preferences/html/SeparatedPanelPrefsEditorFrame.html
    M src/framework/preferences/js/AuxBuilder.js
    M src/framework/preferences/js/Panels.js
    M src/framework/preferences/js/PrefsEditor.js
    M src/framework/preferences/js/SeparatedPanelPrefsEditor.js
    M src/framework/preferences/js/StarterGrades.js
    M src/framework/preferences/js/StarterSchemas.js
    M tests/all-tests.html
    M tests/component-tests/pager/html/PagedTable-test.html
    M tests/component-tests/pager/js/PagedTableTests.js
    M tests/component-tests/textfieldSlider/html/TextfieldSlider-test.html
    M tests/component-tests/textfieldSlider/js/TextfieldSliderTests.js
    M tests/component-tests/uiOptions/html/UIOptions-test.html
    M tests/framework-tests/core/all-tests.html
    A tests/framework-tests/core/data/testTemplate1.html
    A tests/framework-tests/core/data/testTemplate2.html
    A tests/framework-tests/core/html/ResourceLoader-test.html
    A tests/framework-tests/core/js/ResourceLoaderTests.js
    M tests/framework-tests/preferences/html/AuxBuilder-test.html
    M tests/framework-tests/preferences/html/Builder-test.html
    M tests/framework-tests/preferences/html/Enactors-test.html
    M tests/framework-tests/preferences/html/FullNoPreviewPrefsEditor-test.html
    M tests/framework-tests/preferences/html/FullPreviewPrefsEditor-test.html
    M tests/framework-tests/preferences/html/PageEnhancer-test.html
    M tests/framework-tests/preferences/html/Panels-test.html
    M tests/framework-tests/preferences/html/PrefsEditor-test.html
    M tests/framework-tests/preferences/html/SelfVoicingEnactor-test.html
    M tests/framework-tests/preferences/html/SelfVoicingPanel-test.html
    M tests/framework-tests/preferences/html/SeparatedPanelPrefsEditor-test.html
    A tests/framework-tests/preferences/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html
    R tests/framework-tests/preferences/html/SeparatedPanelPrefsEditorFrame.html
    M tests/framework-tests/preferences/html/UIEnhancer-test.html
    M tests/framework-tests/preferences/js/AuxBuilderTests.js
    M tests/framework-tests/preferences/js/BuilderTests.js
    A tests/framework-tests/preferences/js/CompositePanelTestsGrades.js
    M tests/framework-tests/preferences/js/FullNoPreviewPrefsEditorTests.js
    M tests/framework-tests/preferences/js/FullPreviewPrefsEditorTests.js
    M tests/framework-tests/preferences/js/IntegrationTestsCommon.js
    M tests/framework-tests/preferences/js/PanelsTests.js
    M tests/framework-tests/preferences/js/PrefsEditorTests.js
    M tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js
    M tests/framework-tests/preferences/js/URLUtilitiesTests.js
    M tests/framework-tests/preferences/testResources/html/checkboxTemplate.html
    M tests/lib/qunit/js/qunit.js
    A tests/manual-tests/framework/preferences/assortedContent/index-jQueryUI.html
    A tests/manual-tests/framework/preferences/assortedContent/index-nativeHTML.html
    R tests/manual-tests/framework/preferences/assortedContent/index.html
    M tests/manual-tests/framework/preferences/assortedContent/js/assortedContent.js
    A tests/manual-tests/framework/preferences/fullPage-schema/index-jQueryUI.html
    A tests/manual-tests/framework/preferences/fullPage-schema/index-nativeHTML.html
    R tests/manual-tests/framework/preferences/fullPage-schema/index.html
    A tests/manual-tests/framework/preferences/fullPage/index-jQueryUI.html
    A tests/manual-tests/framework/preferences/fullPage/index-nativeHTML.html
    R tests/manual-tests/framework/preferences/fullPage/index.html
    M tests/test-core/jqUnit/js/jqUnit-browser.js
    M tests/test-core/utils/js/IoCTestUtils.js

  Log Message:
  -----------
  Merge pull request #6 from fluid-project/master

merge upstream master


  Commit: fca22cdef6e8bee14807154a2c98612337dfdde6
      https://github.com/fluid-project/infusion/commit/fca22cdef6e8bee14807154a2c98612337dfdde6
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2016-08-17 (Wed, 17 Aug 2016)

  Changed paths:
    M src/framework/core/js/ModelTransformation.js
    M src/framework/core/js/ModelTransformationTransforms.js
    M src/framework/preferences/js/Panels.js
    M src/framework/preferences/messages/lineSpace.json
    M src/framework/preferences/messages/textSize.json
    M tests/component-tests/tooltip/html/Tooltip-test.html
    M tests/component-tests/tooltip/js/TooltipTests.js
    M tests/framework-tests/core/js/DataBindingTests.js
    M tests/framework-tests/core/js/ModelTransformationTests.js
    M tests/framework-tests/preferences/data/lineSpace_en.json
    M tests/framework-tests/preferences/data/textSize_en.json
    M tests/framework-tests/preferences/js/PanelsTests.js
    M tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js

  Log Message:
  -----------
  Merge pull request #7 from fluid-project/master

merge upstream master


  Commit: 543b95dceaa6866f40cbe71d7a7a41b800de7fc2
      https://github.com/fluid-project/infusion/commit/543b95dceaa6866f40cbe71d7a7a41b800de7fc2
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2016-08-30 (Tue, 30 Aug 2016)

  Changed paths:
    M demos/prefsFramework/html/SeparatedPanelPrefsEditor.html
    M demos/prefsFramework/html/SeparatedPanelPrefsEditorWithTTS.html
    M demos/prefsFramework/html/SimplifyPanelTemplate.html
    M examples/framework/preferences/conditionalAdjusters-singlePanel/html/prefsEditor.html
    M examples/framework/preferences/conditionalAdjusters/html/prefsEditor.html
    M examples/framework/preferences/shared/html/increasing.html
    M examples/framework/preferences/shared/html/prefsEditor.html
    M examples/framework/preferences/shared/html/speakIncrease.html
    M examples/framework/preferences/shared/html/speaking.html
    M package.json
    M src/framework/preferences/css/stylus/Enactors.styl
    M src/framework/preferences/css/stylus/FullPreviewPrefsEditor.styl
    M src/framework/preferences/css/stylus/PrefsEditor.styl
    M src/framework/preferences/css/stylus/SeparatedPanelPrefsEditor.styl
    M src/framework/preferences/css/stylus/SeparatedPanelPrefsEditorFrame.styl
    M src/framework/preferences/css/stylus/utils/Helpers.styl
    M src/framework/preferences/css/stylus/utils/Themes.styl
    M src/framework/preferences/html/FullNoPreviewPrefsEditor.html
    M src/framework/preferences/html/FullPreviewPrefsEditor.html
    M src/framework/preferences/html/PrefsEditorTemplate-contrast.html
    M src/framework/preferences/html/PrefsEditorTemplate-emphasizeLinks.html
    M src/framework/preferences/html/PrefsEditorTemplate-inputsLarger.html
    M src/framework/preferences/html/PrefsEditorTemplate-layout.html
    M src/framework/preferences/html/PrefsEditorTemplate-linksControls.html
    M src/framework/preferences/html/PrefsEditorTemplate-speak.html
    M src/framework/preferences/html/SeparatedPanelPrefsEditor.html
    M src/framework/preferences/js/StarterGrades.js
    M src/framework/preferences/js/StarterSchemas.js
    M tests/framework-tests/core/js/ModelTransformationTests.js
    M tests/framework-tests/preferences/html/PageEnhancer-test.html
    M tests/framework-tests/preferences/html/SeparatedPanelPrefsEditor-test.html
    M tests/framework-tests/preferences/js/AuxBuilderTests.js
    M tests/framework-tests/preferences/js/PageEnhancerTests.js
    M tests/framework-tests/preferences/js/PanelsTests.js

  Log Message:
  -----------
  Merge pull request #8 from fluid-project/master

merge upstream master


  Commit: df09711eade4be8daa7b7c3117c4273d54be452e
      https://github.com/fluid-project/infusion/commit/df09711eade4be8daa7b7c3117c4273d54be452e
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2016-08-30 (Tue, 30 Aug 2016)

  Changed paths:
    M .eslintrc.json
    M src/framework/preferences/js/Panels.js
    M tests/framework-tests/core/js/FluidViewTests.js

  Log Message:
  -----------
  NOJIRA: add keyword-spacing rule to linter, correct two files for that linting rule.


  Commit: 99765614ca5679580024e8b673189ed419468a0c
      https://github.com/fluid-project/infusion/commit/99765614ca5679580024e8b673189ed419468a0c
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2016-08-31 (Wed, 31 Aug 2016)

  Changed paths:
    M .eslintrc.json
    M src/framework/preferences/js/Panels.js
    M tests/framework-tests/core/js/FluidViewTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'alan/keyword-spacing'

* alan/keyword-spacing:
  NOJIRA: add keyword-spacing rule to linter, correct two files for that linting rule.


Compare: https://github.com/fluid-project/infusion/compare/d82e14339fe9...99765614ca56


More information about the Commits mailing list