[Commits] [fluid-project/infusion] a80b62: FLUID-5108: Created a test case to demonstrate FLU...

GitHub noreply at github.com
Thu Aug 22 16:49:06 EDT 2013


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

  Changed paths:
    M src/tests/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  FLUID-5108: Created a test case to demonstrate FLUID-5108.


  Commit: 28a16fab162a45587cc87dc37f7c69b8fe9e10bd
      https://github.com/fluid-project/infusion/commit/28a16fab162a45587cc87dc37f7c69b8fe9e10bd
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-08-02 (Fri, 02 Aug 2013)

  Changed paths:
    M src/tests/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  FLUID-5108: Use a better name for the source options to be passed down by IoCSS.


  Commit: 225a391e37a401175ca83233955930cde3ecf63b
      https://github.com/fluid-project/infusion/commit/225a391e37a401175ca83233955930cde3ecf63b
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-08-02 (Fri, 02 Aug 2013)

  Changed paths:
    M src/tests/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  FLUID-5108: Fixed the title on the test case for FLUID-5108.


  Commit: 8dbaa6291135efc95dc86313d4444fc6fe887b33
      https://github.com/fluid-project/infusion/commit/8dbaa6291135efc95dc86313d4444fc6fe887b33
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-08-02 (Fri, 02 Aug 2013)

  Changed paths:
    M src/tests/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  FLUID-5108: Modified the test case to remove the IoCSS material and also the subcomponent since it seems that the core of the failure just relates to supplying the dynamic grade with an overriding option.


  Commit: e37b0b4bd4cedd92676f44796465ff35717fa71c
      https://github.com/fluid-project/infusion/commit/e37b0b4bd4cedd92676f44796465ff35717fa71c
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-08-17 (Sat, 17 Aug 2013)

  Changed paths:
    M src/components/tableOfContents/js/TableOfContents.js
    M src/components/uiOptions/css/UIOptions.css
    M src/components/uiOptions/html/FullNoPreviewUIOptions.html
    A src/components/uiOptions/js/AuxBuilder.js
    A src/components/uiOptions/js/Builder.js
    M src/components/uiOptions/js/Enactors.js
    M src/components/uiOptions/js/FatPanelUIOptions.js
    M src/components/uiOptions/js/FullNoPreviewUIOptions.js
    M src/components/uiOptions/js/FullPreviewUIOptions.js
    M src/components/uiOptions/js/Panels.js
    A src/components/uiOptions/js/PrimaryBuilder.js
    M src/components/uiOptions/js/SlidingPanel.js
    A src/components/uiOptions/js/StarterGrades.js
    A src/components/uiOptions/js/StarterSchemas.js
    M src/components/uiOptions/js/TextfieldSlider.js
    M src/components/uiOptions/js/UIEnhancer.js
    M src/components/uiOptions/js/UIOptions.js
    R src/components/uiOptions/js/i18n.js
    A src/components/uiOptions/messages/contrast.json
    A src/components/uiOptions/messages/lineSpace.json
    A src/components/uiOptions/messages/links.json
    A src/components/uiOptions/messages/tableOfContents.json
    A src/components/uiOptions/messages/textFont.json
    A src/components/uiOptions/messages/textSize.json
    A src/components/uiOptions/messages/uiOptions.json
    M src/components/uiOptions/uiOptionsDependencies.json
    M src/demos/index.html
    R src/demos/uiOptions/css/uiOptions.css
    R src/demos/uiOptions/demo.html
    A src/demos/uiOptions/gradesDemo/css/uiOptions.css
    A src/demos/uiOptions/gradesDemo/demo.html
    A src/demos/uiOptions/gradesDemo/html/uiOptions.html
    A src/demos/uiOptions/gradesDemo/js/uiOptionsDemo.js
    R src/demos/uiOptions/html/uiOptions.html
    R src/demos/uiOptions/js/uiOptionsDemo.js
    A src/demos/uiOptions/schemaDemo/css/uiOptions.css
    A src/demos/uiOptions/schemaDemo/demo.html
    A src/demos/uiOptions/schemaDemo/html/uiOptions.html
    A src/demos/uiOptions/schemaDemo/js/uiOptionsDemo.js
    M src/framework/core/js/Fluid.js
    M src/framework/core/js/FluidIoC.js
    M src/framework/fss/css/fss-theme-bw.css
    M src/framework/fss/css/fss-theme-by.css
    M src/framework/fss/css/fss-theme-dglg.css
    M src/framework/fss/css/fss-theme-lgdg.css
    M src/framework/fss/css/fss-theme-wb.css
    M src/framework/fss/css/fss-theme-yb.css
    M src/framework/renderer/js/RendererUtilities.js
    M src/standalone-demos/table-of-contents/js/table-of-contents-example.js
    M src/tests/all-tests.html
    M src/tests/component-tests/tableOfContents/html/TableOfContents-test.html
    M src/tests/component-tests/tableOfContents/js/TableOfContentsTests.js
    M src/tests/component-tests/uiOptions/all-tests.html
    A src/tests/component-tests/uiOptions/html/AuxBuilder-test.html
    A src/tests/component-tests/uiOptions/html/Builder-test.html
    M src/tests/component-tests/uiOptions/html/Enactors-test.html
    M src/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    M src/tests/component-tests/uiOptions/html/FullNoPreviewUIOptions-test.html
    M src/tests/component-tests/uiOptions/html/FullPreviewUIOptions-test.html
    R src/tests/component-tests/uiOptions/html/I18n-test.html
    M src/tests/component-tests/uiOptions/html/PageEnhancer-test.html
    M src/tests/component-tests/uiOptions/html/Panels-test.html
    A src/tests/component-tests/uiOptions/html/PrimaryBuilder-test.html
    M src/tests/component-tests/uiOptions/html/SlidingPanel-test.html
    M src/tests/component-tests/uiOptions/html/UIEnhancer-test.html
    M src/tests/component-tests/uiOptions/html/UIOptions-test.html
    A src/tests/component-tests/uiOptions/js/AuxBuilderTests.js
    A src/tests/component-tests/uiOptions/js/BuilderTests.js
    M src/tests/component-tests/uiOptions/js/EnactorsTests.js
    M src/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/tests/component-tests/uiOptions/js/FullPreviewUIOptionsTests.js
    R src/tests/component-tests/uiOptions/js/I18nTests.js
    M src/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    M src/tests/component-tests/uiOptions/js/PageEnhancerTests.js
    M src/tests/component-tests/uiOptions/js/PanelsTests.js
    A src/tests/component-tests/uiOptions/js/PrimaryBuilderTests.js
    M src/tests/component-tests/uiOptions/js/SlidingPanelTests.js
    M src/tests/component-tests/uiOptions/js/UIEnhancerTests.js
    M src/tests/component-tests/uiOptions/js/UIOptionsTests.js
    M src/tests/framework-tests/core/js/FluidIoCTests.js
    M src/tests/framework-tests/renderer/html/RendererUtilities-test.html
    M src/tests/framework-tests/renderer/js/RendererUtilitiesTests.js
    M src/tests/manual-tests/html/SomeKindOfNews.html
    M src/tests/manual-tests/html/uiOptionsFullWithPreview.html
    A src/tests/manual-tests/html/uiOptionsFullWithPreviewSchema.html
    M src/tests/manual-tests/html/uiOptionsFullWithoutPreview.html
    A src/tests/manual-tests/html/uiOptionsFullWithoutPreviewSchema.html
    M src/tests/manual-tests/html/uiOptionsPreview.html
    M src/tests/manual-tests/js/someKindOfNews.js
    M src/tests/manual-tests/js/uiOptionsFullPage.js
    A src/tests/manual-tests/js/uiOptionsFullPageSchema.js

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


  Commit: 93402f8a9af3ae7617e15781e1b7cf91d84a9f15
      https://github.com/fluid-project/infusion/commit/93402f8a9af3ae7617e15781e1b7cf91d84a9f15
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-08-18 (Sun, 18 Aug 2013)

  Changed paths:
    M src/components/uiOptions/js/UIOptions.js
    M src/framework/core/js/Fluid.js
    M src/framework/core/js/FluidIoC.js
    M src/tests/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  FLUID-5085: Corrected grade merging algorithm, with small fix to UIOptions configuration "fluid.uiOptions.transformDefaultPanelsOptions" required by new grade priority rules.


  Commit: 3e8cb11105fa8edccad244b35d1ff425beff0b5b
      https://github.com/fluid-project/infusion/commit/3e8cb11105fa8edccad244b35d1ff425beff0b5b
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-08-22 (Thu, 22 Aug 2013)

  Changed paths:
    M src/components/uiOptions/js/Builder.js
    M src/components/uiOptions/js/FatPanelUIOptions.js
    M src/components/uiOptions/js/FullNoPreviewUIOptions.js
    M src/components/uiOptions/js/FullPreviewUIOptions.js
    M src/components/uiOptions/js/StarterGrades.js
    M src/components/uiOptions/js/UIOptions.js
    M src/components/uploader/js/UploaderCompatibility-Infusion1.2.js
    M src/components/uploader/js/UploaderCompatibility-Infusion1.3.js
    M src/framework/core/js/ModelTransformation.js
    M src/framework/core/js/ModelTransformationTransforms.js
    M src/tests/component-tests/uiOptions/html/Builder-test.html
    M src/tests/component-tests/uiOptions/js/BuilderTests.js
    M src/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/tests/component-tests/uiOptions/js/FullNoPreviewUIOptionsTests.js
    M src/tests/component-tests/uiOptions/js/FullPreviewUIOptionsTests.js
    M src/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    M src/tests/component-tests/uiOptions/js/UIOptionsTests.js
    M src/tests/framework-tests/core/js/ModelTransformationTests.js
    M src/tests/manual-tests/html/uiOptionsFullWithPreviewSchema.html
    M src/tests/manual-tests/js/someKindOfNews.js

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

Conflicts:
	src/components/uiOptions/js/UIOptions.js


  Commit: 40de4e23f46ea83e6e81d964e6b030f4fc6a5c16
      https://github.com/fluid-project/infusion/commit/40de4e23f46ea83e6e81d964e6b030f4fc6a5c16
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2013-08-22 (Thu, 22 Aug 2013)

  Changed paths:
    M src/components/uiOptions/js/UIOptions.js
    M src/framework/core/js/Fluid.js
    M src/framework/core/js/FluidIoC.js
    M src/tests/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'amb26/FLUID-5085'

* amb26/FLUID-5085:
  FLUID-5085: Corrected grade merging algorithm, with small fix to UIOptions configuration "fluid.uiOptions.transformDefaultPanelsOptions" required by new grade priority rules.
  FLUID-5108: Modified the test case to remove the IoCSS material and also the subcomponent since it seems that the core of the failure just relates to supplying the dynamic grade with an overriding option.
  FLUID-5108: Fixed the title on the test case for FLUID-5108.
  FLUID-5108: Use a better name for the source options to be passed down by IoCSS.
  FLUID-5108: Created a test case to demonstrate FLUID-5108.


Compare: https://github.com/fluid-project/infusion/compare/50b253a3e004...40de4e23f46e


More information about the Commits mailing list