[Commits] [fluid-project/infusion] c53948: FLUID-5117: Created a test case for FLUID-5117 (ht...

GitHub noreply at github.com
Thu Sep 12 13:53:44 EDT 2013


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

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

  Log Message:
  -----------
  FLUID-5117: Created a test case for FLUID-5117 (http://issues.fluidproject.org/browse/FLUID-5117).


  Commit: 52bcc0b29d370477ddfaa3eb297c65afb4c143ed
      https://github.com/fluid-project/infusion/commit/52bcc0b29d370477ddfaa3eb297c65afb4c143ed
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-08-20 (Tue, 20 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 branch 'FLUID-5085' into FLUID-5117

Conflicts:
	src/tests/framework-tests/core/js/FluidIoCTests.js


  Commit: 815153da7715a465c5fb3572575c4b54627f4ab4
      https://github.com/fluid-project/infusion/commit/815153da7715a465c5fb3572575c4b54627f4ab4
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-08-28 (Wed, 28 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/FluidIoC.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/FluidIoCTests.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-5117


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

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

  Log Message:
  -----------
  FLUID-5117: "expander" left in expanded material fix


  Commit: d9f59f76fa3e8afeaf671e7be14eb1deeca0eb7d
      https://github.com/fluid-project/infusion/commit/d9f59f76fa3e8afeaf671e7be14eb1deeca0eb7d
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2013-09-12 (Thu, 12 Sep 2013)

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

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

* amb26/FLUID-5117:
  FLUID-5117: "expander" left in expanded material fix
  FLUID-5117: Created a test case for FLUID-5117 (http://issues.fluidproject.org/browse/FLUID-5117).


Compare: https://github.com/fluid-project/infusion/compare/6326aee7c837...d9f59f76fa3e


More information about the Commits mailing list