[Commits] [fluid-project/infusion] 34b284: FLUID-5069: Clean up UIO code by removing legacy l...

GitHub noreply at github.com
Fri Jun 28 16:42:24 EDT 2013


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: 34b28408bd3feab08057886ffae08cff2ebc2167
      https://github.com/fluid-project/infusion/commit/34b28408bd3feab08057886ffae08cff2ebc2167
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FullUIOptions.css
    M src/webapp/components/uiOptions/js/Enactor.js
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/components/uiOptions/js/UIEnhancer.js
    M src/webapp/components/uiOptions/js/UIOptions.js
    M src/webapp/tests/component-tests/uiOptions/html/Enactor-test.html
    M src/webapp/tests/component-tests/uiOptions/js/EnactorTests.js
    M src/webapp/tests/component-tests/uiOptions/js/PageEnhancerTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js

  Log Message:
  -----------
  FLUID-5069: Clean up UIO code by removing legacy layout preference and an enactor for IE6 colour inversion.


  Commit: 7e66e19faae97b4800f5922485c5324e8787bb2a
      https://github.com/fluid-project/infusion/commit/7e66e19faae97b4800f5922485c5324e8787bb2a
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

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

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


  Commit: 3b70255c9155c19d7869d26ed96a23e437655baf
      https://github.com/fluid-project/infusion/commit/3b70255c9155c19d7869d26ed96a23e437655baf
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M ReleaseNotes.txt
    M src/webapp/components/uiOptions/js/UIOptions.js
    M src/webapp/framework/core/js/FluidIoC.js
    R src/webapp/integration-demos/uportal/css/portal.css
    R src/webapp/integration-demos/uportal/html/portal.html
    R src/webapp/integration-demos/uportal/images/application.png
    R src/webapp/integration-demos/uportal/images/application_add.png
    R src/webapp/integration-demos/uportal/images/application_edit.png
    R src/webapp/integration-demos/uportal/images/color_swatch.png
    R src/webapp/integration-demos/uportal/images/cross.png
    R src/webapp/integration-demos/uportal/images/headerbar.png
    R src/webapp/integration-demos/uportal/images/help.png
    R src/webapp/integration-demos/uportal/images/house.png
    R src/webapp/integration-demos/uportal/images/layout_content.png
    R src/webapp/integration-demos/uportal/images/locked.png
    R src/webapp/integration-demos/uportal/images/map.png
    R src/webapp/integration-demos/uportal/images/page_column_back.png
    R src/webapp/integration-demos/uportal/images/portal_logo.png
    R src/webapp/integration-demos/uportal/images/portlet_corner_bottomleft.png
    R src/webapp/integration-demos/uportal/images/portlet_corner_bottomright.png
    R src/webapp/integration-demos/uportal/images/portlet_corner_topleft.png
    R src/webapp/integration-demos/uportal/images/portlet_corner_topright.png
    R src/webapp/integration-demos/uportal/images/tab1.jpg
    R src/webapp/integration-demos/uportal/images/tab_add.png
    R src/webapp/integration-demos/uportal/images/top_light_fade.png
    R src/webapp/integration-demos/uportal/images/user.png
    R src/webapp/integration-demos/uportal/images/weather.png
    R src/webapp/integration-demos/uportal/images/zoom.png
    R src/webapp/integration-demos/uportal/js/portal.js
    A src/webapp/tests/component-tests/reorderer/html/NestedReorderer-test.html
    A src/webapp/tests/component-tests/reorderer/js/NestedReorderTests.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
    M src/webapp/tests/manual-tests/html/SomeKindOfNews.html

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


  Commit: 8bfdb635e4e24098c2e093d2aef8f08769a03f43
      https://github.com/fluid-project/infusion/commit/8bfdb635e4e24098c2e093d2aef8f08769a03f43
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/FullNoPreviewUIOptions.js
    M src/webapp/components/uiOptions/js/FullPreviewUIOptions.js
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/components/uiOptions/js/UIEnhancer.js
    M src/webapp/components/uiOptions/js/UIOptions.js
    M src/webapp/demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js
    M src/webapp/tests/manual-tests/js/someKindOfNews.js
    M src/webapp/tests/manual-tests/js/uiOptionsFullPage.js

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

Conflicts:
	src/webapp/components/uiOptions/js/SettingsPanels.js
	src/webapp/components/uiOptions/js/UIEnhancer.js
	src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js


  Commit: 0d45cc62ca5443e9c47778cecf5bbac8c9eb24a2
      https://github.com/fluid-project/infusion/commit/0d45cc62ca5443e9c47778cecf5bbac8c9eb24a2
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

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

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


  Commit: dbb3e4fbc56cb2645ef7d33ddce15afcb71b59be
      https://github.com/fluid-project/infusion/commit/dbb3e4fbc56cb2645ef7d33ddce15afcb71b59be
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FullUIOptions.css
    M src/webapp/components/uiOptions/js/Enactor.js
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/components/uiOptions/js/UIEnhancer.js
    M src/webapp/components/uiOptions/js/UIOptions.js
    M src/webapp/tests/component-tests/uiOptions/html/Enactor-test.html
    M src/webapp/tests/component-tests/uiOptions/js/EnactorTests.js
    M src/webapp/tests/component-tests/uiOptions/js/PageEnhancerTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js

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

* cindyli/FLUID-5069:
  FLUID-5069: Clean up UIO code by removing legacy layout preference and an enactor for IE6 colour inversion.


Compare: https://github.com/fluid-project/infusion/compare/8f13b8e66ab9...dbb3e4fbc56c


More information about the Commits mailing list