[Commits] [fluid-project/infusion] 822b0e: FLUID-5076: Replace the enactor namespace from "fl...

GitHub noreply at github.com
Wed Jul 3 11:02:07 EDT 2013


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: 822b0ef057b633f9c3859f80783a68c3ba24bfa5
      https://github.com/fluid-project/infusion/commit/822b0ef057b633f9c3859f80783a68c3ba24bfa5
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    R src/webapp/components/uiOptions/js/Enactor.js
    A src/webapp/components/uiOptions/js/Enactors.js
    M src/webapp/components/uiOptions/js/UIEnhancer.js
    M src/webapp/components/uiOptions/uiOptionsDependencies.json
    M src/webapp/demos/uiOptions/html/uiOptions.html
    M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
    M src/webapp/tests/component-tests/uiOptions/all-tests.html
    R src/webapp/tests/component-tests/uiOptions/html/Enactor-test.html
    A src/webapp/tests/component-tests/uiOptions/html/Enactors-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullNoPreviewUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullPreviewUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/PageEnhancer-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html
    R src/webapp/tests/component-tests/uiOptions/js/EnactorTests.js
    A src/webapp/tests/component-tests/uiOptions/js/EnactorsTests.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/html/SomeKindOfNews.html
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithPreview.html
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithoutPreview.html

  Log Message:
  -----------
  FLUID-5076: Replace the enactor namespace from "fluid.uiOptions.enactor" to "fluid.uiOptions.enactors".


  Commit: e9c8460c9806ce8934920864d20296564c92b6d7
      https://github.com/fluid-project/infusion/commit/e9c8460c9806ce8934920864d20296564c92b6d7
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    A src/webapp/components/uiOptions/js/Panels.js
    R src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/components/uiOptions/js/UIOptions.js
    M src/webapp/components/uiOptions/uiOptionsDependencies.json
    M src/webapp/demos/uiOptions/html/uiOptions.html
    M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
    M src/webapp/tests/component-tests/uiOptions/all-tests.html
    M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullNoPreviewUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullPreviewUIOptions-test.html
    A src/webapp/tests/component-tests/uiOptions/html/Panels-test.html
    R src/webapp/tests/component-tests/uiOptions/html/SettingsPanels-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html
    A src/webapp/tests/component-tests/uiOptions/js/PanelsTests.js
    R src/webapp/tests/component-tests/uiOptions/js/SettingsPanelsTests.js
    M src/webapp/tests/manual-tests/html/SomeKindOfNews.html
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithPreview.html
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithoutPreview.html

  Log Message:
  -----------
  FLUID-5076: Rename the settings panel namespace from "fluid.uiOptions.settingsPanel" to "fluid.uiOptions.panels".


  Commit: e9b624fd0cc6da051874f735153ad76b4cbb463f
      https://github.com/fluid-project/infusion/commit/e9b624fd0cc6da051874f735153ad76b4cbb463f
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    A src/webapp/components/uiOptions/html/UIOptionsTemplate-lineSpace.html
    R src/webapp/components/uiOptions/html/UIOptionsTemplate-lineSpacer.html
    A src/webapp/components/uiOptions/html/UIOptionsTemplate-textSize.html
    R src/webapp/components/uiOptions/html/UIOptionsTemplate-textSizer.html
    M src/webapp/components/uiOptions/js/Enactors.js
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/Panels.js
    M src/webapp/components/uiOptions/js/UIEnhancer.js
    M src/webapp/components/uiOptions/js/UIOptions.js
    M src/webapp/components/uiOptions/js/i18n.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/html/Enactors-test.html
    M src/webapp/tests/component-tests/uiOptions/html/Panels-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-test.html
    M src/webapp/tests/component-tests/uiOptions/js/EnactorsTests.js
    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/PanelsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js
    M src/webapp/tests/framework-tests/core/js/DataBindingTests.js
    M src/webapp/tests/manual-tests/js/someKindOfNews.js
    M src/webapp/tests/manual-tests/js/uiOptionsFullPage.js

  Log Message:
  -----------
  FLUID-5076: Synchronized names for "textSizer" and "lineSpace" as well as placing all panel component into namespace "fluid.uiOptions.panels". Also replaced all the occurrence of "settingsPanel" to "panel".


  Commit: 1de9ff4f7012e6fe2e9cce3b3d807b2513587d61
      https://github.com/fluid-project/infusion/commit/1de9ff4f7012e6fe2e9cce3b3d807b2513587d61
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/Panels.js
    M src/webapp/components/uiOptions/js/TextfieldSlider.js
    M src/webapp/tests/component-tests/uiOptions/js/PanelsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/TextfieldSliderTests.js

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

Conflicts:
	src/webapp/components/uiOptions/js/Panels.js


  Commit: 0e4cc4356b7604b9f4500abc85eba96c8c0a94ae
      https://github.com/fluid-project/infusion/commit/0e4cc4356b7604b9f4500abc85eba96c8c0a94ae
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/UIOptions.css
    M src/webapp/components/uploader/css/Uploader.css
    A src/webapp/components/uploader/fonts/InfusionIcons-Uploader.eot
    A src/webapp/components/uploader/fonts/InfusionIcons-Uploader.ttf
    M src/webapp/components/uploader/html/Uploader.html
    M src/webapp/components/uploader/js/DemoUploadManager.js
    M src/webapp/components/uploader/js/FileQueueView.js

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


  Commit: 89719d9d893151178aeff2bd0ad42ca0f92c6878
      https://github.com/fluid-project/infusion/commit/89719d9d893151178aeff2bd0ad42ca0f92c6878
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    A src/webapp/components/uiOptions/html/UIOptionsTemplate-lineSpace.html
    R src/webapp/components/uiOptions/html/UIOptionsTemplate-lineSpacer.html
    A src/webapp/components/uiOptions/html/UIOptionsTemplate-textSize.html
    R src/webapp/components/uiOptions/html/UIOptionsTemplate-textSizer.html
    R src/webapp/components/uiOptions/js/Enactor.js
    A src/webapp/components/uiOptions/js/Enactors.js
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    A src/webapp/components/uiOptions/js/Panels.js
    R 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/components/uiOptions/js/i18n.js
    M src/webapp/components/uiOptions/uiOptionsDependencies.json
    M src/webapp/demos/uiOptions/html/uiOptions.html
    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/all-tests.html
    R src/webapp/tests/component-tests/uiOptions/html/Enactor-test.html
    A src/webapp/tests/component-tests/uiOptions/html/Enactors-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullNoPreviewUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullPreviewUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/PageEnhancer-test.html
    A src/webapp/tests/component-tests/uiOptions/html/Panels-test.html
    R src/webapp/tests/component-tests/uiOptions/html/SettingsPanels-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html
    R src/webapp/tests/component-tests/uiOptions/js/EnactorTests.js
    A src/webapp/tests/component-tests/uiOptions/js/EnactorsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    A src/webapp/tests/component-tests/uiOptions/js/PanelsTests.js
    R src/webapp/tests/component-tests/uiOptions/js/SettingsPanelsTests.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/framework-tests/core/js/DataBindingTests.js
    M src/webapp/tests/manual-tests/html/SomeKindOfNews.html
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithPreview.html
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithoutPreview.html
    M src/webapp/tests/manual-tests/js/someKindOfNews.js
    M src/webapp/tests/manual-tests/js/uiOptionsFullPage.js

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

* cindyli/FLUID-5076:
  FLUID-5076: Synchronized names for "textSizer" and "lineSpace" as well as placing all panel component into namespace "fluid.uiOptions.panels". Also replaced all the occurrence of "settingsPanel" to "panel".
  FLUID-5076: Rename the settings panel namespace from "fluid.uiOptions.settingsPanel" to "fluid.uiOptions.panels".
  FLUID-5076: Replace the enactor namespace from "fluid.uiOptions.enactor" to "fluid.uiOptions.enactors".


Compare: https://github.com/fluid-project/infusion/compare/5cd0ac50dd9a...89719d9d8931


More information about the Commits mailing list