[Commits] [fluid-project/infusion] f70c15: FLUID-5100: started the grunt configuration.

GitHub noreply at github.com
Wed Feb 12 13:01:11 EST 2014


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: f70c155a053f08e59cf7f7538cd703de2c75095c
      https://github.com/fluid-project/infusion/commit/f70c155a053f08e59cf7f7538cd703de2c75095c
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    A Gruntfile.js
    M package.json

  Log Message:
  -----------
  FLUID-5100: started the grunt configuration.


  Commit: 596cd1f822ec0a8e6c3c7687a91d5958be348961
      https://github.com/fluid-project/infusion/commit/596cd1f822ec0a8e6c3c7687a91d5958be348961
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

  Changed paths:
    A Gruntfile.js
    M package.json

  Log Message:
  -----------
  Merge remote-tracking branch 'yura/FLUID-5100' into FLUID-5100


  Commit: ce92ba78b56566cab92fe9d5e369202ac18064df
      https://github.com/fluid-project/infusion/commit/ce92ba78b56566cab92fe9d5e369202ac18064df
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

  Changed paths:
    M .gitignore
    M Gruntfile.js
    M package.json

  Log Message:
  -----------
  FLUID-5100: grunt minify of src js

Implemented the grunt task to minify all of the js files within the components, framework, and lib directories. This is currently being stored in the build directory.


  Commit: 5957f0d7fc065cf4971871f10013bad2e2878602
      https://github.com/fluid-project/infusion/commit/5957f0d7fc065cf4971871f10013bad2e2878602
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    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/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/tests/all-tests.html
    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/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-5100


  Commit: c5185ff553b95606a125c5282eb2a0e5e909928f
      https://github.com/fluid-project/infusion/commit/c5185ff553b95606a125c5282eb2a0e5e909928f
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M src/components/uiOptions/css/UIOptions.css
    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

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


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

  Changed paths:
    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 'master' into FLUID-5100


  Commit: 5a8070bf92620b17a6818037d4a288351ccafd3b
      https://github.com/fluid-project/infusion/commit/5a8070bf92620b17a6818037d4a288351ccafd3b
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M Gruntfile.js
    M package.json

  Log Message:
  -----------
  FLUID-5120: Added the concatenation of javascript files.


  Commit: edc92aa1894852189706a681ca81ccef88e033c8
      https://github.com/fluid-project/infusion/commit/edc92aa1894852189706a681ca81ccef88e033c8
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-08-23 (Fri, 23 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/Fluid.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-5120


  Commit: 18112de08a61e46e5f0124be4ece6cde41e11daa
      https://github.com/fluid-project/infusion/commit/18112de08a61e46e5f0124be4ece6cde41e11daa
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-08-29 (Thu, 29 Aug 2013)

  Changed paths:
    M Gruntfile.js
    M package.json

  Log Message:
  -----------
  FLUID-5120: implemented packaging of infusion.

Will package up the concatenated and individual files into a zip package for either source or minified builds.


  Commit: 211ff3abe19ddeb31424bc239375ca31a7339dcb
      https://github.com/fluid-project/infusion/commit/211ff3abe19ddeb31424bc239375ca31a7339dcb
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-01-30 (Thu, 30 Jan 2014)

  Changed paths:
    M .gitignore
    M build-scripts/build.properties
    M build-scripts/build.xml
    A build-scripts/prefsFramework/js/BrowserStylesheetHandler.js
    A build-scripts/prefsFramework/js/CSSGenerator.js
    A build-scripts/prefsFramework/js/RhinoStylesheetHandler.js
    A build-scripts/prefsFramework/js/StylesheetImportant.js
    R build-scripts/uiOptions/js/BrowserStylesheetHandler.js
    R build-scripts/uiOptions/js/CSSGenerator.js
    R build-scripts/uiOptions/js/RhinoStylesheetHandler.js
    R build-scripts/uiOptions/js/StylesheetImportant.js
    M src/components/inlineEdit/js/InlineEdit.js
    M src/components/pager/js/Pager.js
    M src/components/reorderer/js/ModuleLayout.js
    M src/components/reorderer/js/Reorderer.js
    A src/components/slidingPanel/js/SlidingPanel.js
    A src/components/slidingPanel/slidingPanelDependencies.json
    A src/components/textfieldSlider/js/TextfieldSlider.js
    A src/components/textfieldSlider/textfieldSliderDependencies.json
    R src/components/uiOptions/css/FatPanelUIOptions.css
    R src/components/uiOptions/css/FatPanelUIOptionsFrame.css
    R src/components/uiOptions/css/FullNoPreviewUIOptions.css
    R src/components/uiOptions/css/FullPreviewUIOptions.css
    R src/components/uiOptions/css/FullUIOptions.css
    R src/components/uiOptions/css/UIOptions.css
    R src/components/uiOptions/css/ie8.css
    R src/components/uiOptions/fonts/InfusionIcons-UIOptions.eot
    R src/components/uiOptions/fonts/InfusionIcons-UIOptions.ttf
    R src/components/uiOptions/html/FatPanelUIOptions.html
    R src/components/uiOptions/html/FatPanelUIOptionsFrame.html
    R src/components/uiOptions/html/FullNoPreviewUIOptions.html
    R src/components/uiOptions/html/FullPreviewUIOptions.html
    R src/components/uiOptions/html/UIOptionsTemplate-contrast.html
    R src/components/uiOptions/html/UIOptionsTemplate-layout.html
    R src/components/uiOptions/html/UIOptionsTemplate-lineSpace.html
    R src/components/uiOptions/html/UIOptionsTemplate-links.html
    R src/components/uiOptions/html/UIOptionsTemplate-textFont.html
    R src/components/uiOptions/html/UIOptionsTemplate-textSize.html
    R src/components/uiOptions/images/default/fatpanelbg.png
    R src/components/uiOptions/js/AuxBuilder.js
    R src/components/uiOptions/js/Builder.js
    R src/components/uiOptions/js/Enactors.js
    R src/components/uiOptions/js/FatPanelUIOptions.js
    R src/components/uiOptions/js/FullNoPreviewUIOptions.js
    R src/components/uiOptions/js/FullPreviewUIOptions.js
    R src/components/uiOptions/js/ModelRelay.js
    R src/components/uiOptions/js/Panels.js
    R src/components/uiOptions/js/PrimaryBuilder.js
    R src/components/uiOptions/js/SlidingPanel.js
    R src/components/uiOptions/js/StarterGrades.js
    R src/components/uiOptions/js/StarterSchemas.js
    R src/components/uiOptions/js/Store.js
    R src/components/uiOptions/js/TextfieldSlider.js
    R src/components/uiOptions/js/UIEnhancer.js
    M src/components/uiOptions/js/UIOptions.js
    R src/components/uiOptions/js/URLUtilities.js
    R src/components/uiOptions/messages/contrast.json
    R src/components/uiOptions/messages/lineSpace.json
    R src/components/uiOptions/messages/links.json
    R src/components/uiOptions/messages/tableOfContents.json
    R src/components/uiOptions/messages/textFont.json
    R src/components/uiOptions/messages/textSize.json
    R src/components/uiOptions/messages/uiOptions.json
    M src/components/uiOptions/uiOptionsDependencies.json
    M src/components/uploader/js/FileQueue.js
    M src/demos/index.html
    M src/demos/keyboard-a11y/js/five-star.js
    M src/demos/portal/css/portal.css
    M src/demos/portal/js/demoAssets.js
    A src/demos/uiOptions/css/ie8.css
    A src/demos/uiOptions/css/uiOptions.css
    A src/demos/uiOptions/demo.html
    R src/demos/uiOptions/gradesDemo/css/uiOptions.css
    R src/demos/uiOptions/gradesDemo/demo.html
    R src/demos/uiOptions/gradesDemo/html/uiOptions.html
    R src/demos/uiOptions/gradesDemo/js/uiOptionsDemo.js
    A src/demos/uiOptions/html/uiOptions.html
    R src/demos/uiOptions/schemaDemo/css/uiOptions.css
    R src/demos/uiOptions/schemaDemo/demo.html
    R src/demos/uiOptions/schemaDemo/html/uiOptions.html
    R src/demos/uiOptions/schemaDemo/js/uiOptionsDemo.js
    M src/framework/core/js/DataBinding.js
    M src/framework/core/js/Fluid.js
    M src/framework/core/js/FluidIoC.js
    M src/framework/core/js/ModelTransformation.js
    M src/framework/core/js/ModelTransformationTransforms.js
    A src/framework/preferences/css/FullNoPreviewPrefsEditor.css
    A src/framework/preferences/css/FullPrefsEditor.css
    A src/framework/preferences/css/FullPreviewPrefsEditor.css
    A src/framework/preferences/css/PrefsEditor.css
    A src/framework/preferences/css/SeparatedPanelPrefsEditor.css
    A src/framework/preferences/css/SeparatedPanelPrefsEditorFrame.css
    A src/framework/preferences/css/ie8.css
    A src/framework/preferences/fonts/InfusionIcons-PrefsEditor.eot
    A src/framework/preferences/fonts/InfusionIcons-PrefsEditor.ttf
    A src/framework/preferences/html/FullNoPreviewPrefsEditor.html
    A src/framework/preferences/html/FullPreviewPrefsEditor.html
    A src/framework/preferences/html/PrefsEditorTemplate-contrast.html
    A src/framework/preferences/html/PrefsEditorTemplate-emphasizeLinks.html
    A src/framework/preferences/html/PrefsEditorTemplate-inputsLarger.html
    A src/framework/preferences/html/PrefsEditorTemplate-layout.html
    A src/framework/preferences/html/PrefsEditorTemplate-lineSpace.html
    A src/framework/preferences/html/PrefsEditorTemplate-linksControls.html
    A src/framework/preferences/html/PrefsEditorTemplate-textFont.html
    A src/framework/preferences/html/PrefsEditorTemplate-textSize.html
    A src/framework/preferences/html/SeparatedPanelPrefsEditor.html
    A src/framework/preferences/html/SeparatedPanelPrefsEditorFrame.html
    A src/framework/preferences/images/default/separatedpanelbg.png
    A src/framework/preferences/js/AuxBuilder.js
    A src/framework/preferences/js/Builder.js
    A src/framework/preferences/js/Enactors.js
    A src/framework/preferences/js/FullNoPreviewPrefsEditor.js
    A src/framework/preferences/js/FullPreviewPrefsEditor.js
    A src/framework/preferences/js/ModelRelay.js
    A src/framework/preferences/js/Panels.js
    A src/framework/preferences/js/PrefsEditor.js
    A src/framework/preferences/js/PrimaryBuilder.js
    A src/framework/preferences/js/SeparatedPanelPrefsEditor.js
    A src/framework/preferences/js/StarterGrades.js
    A src/framework/preferences/js/StarterSchemas.js
    A src/framework/preferences/js/Store.js
    A src/framework/preferences/js/UIEnhancer.js
    A src/framework/preferences/js/URLUtilities.js
    A src/framework/preferences/messages/contrast.json
    A src/framework/preferences/messages/emphasizeLinks.json
    A src/framework/preferences/messages/inputsLarger.json
    A src/framework/preferences/messages/lineSpace.json
    A src/framework/preferences/messages/linksControls.json
    A src/framework/preferences/messages/prefsEditor.json
    A src/framework/preferences/messages/tableOfContents.json
    A src/framework/preferences/messages/textFont.json
    A src/framework/preferences/messages/textSize.json
    A src/framework/preferences/preferencesDependencies.json
    A src/instructionalDemos/framework/preferences/conditionalAdjusters1/conditional.html
    A src/instructionalDemos/framework/preferences/conditionalAdjusters1/html/prefsEditor.html
    A src/instructionalDemos/framework/preferences/conditionalAdjusters1/js/auxiliarySchema.js
    A src/instructionalDemos/framework/preferences/conditionalAdjusters1/js/conditional.js
    A src/instructionalDemos/framework/preferences/conditionalAdjusters1/js/panels.js
    A src/instructionalDemos/framework/preferences/conditionalAdjusters2/conditional.html
    A src/instructionalDemos/framework/preferences/conditionalAdjusters2/html/prefsEditor.html
    A src/instructionalDemos/framework/preferences/conditionalAdjusters2/js/auxiliarySchema.js
    A src/instructionalDemos/framework/preferences/conditionalAdjusters2/js/conditional.js
    A src/instructionalDemos/framework/preferences/conditionalAdjusters2/js/panels.js
    A src/instructionalDemos/framework/preferences/shared/css/demo.css
    A src/instructionalDemos/framework/preferences/shared/html/README.txt
    A src/instructionalDemos/framework/preferences/shared/html/SeparatedPanelPrefsEditorFrame.html
    A src/instructionalDemos/framework/preferences/shared/html/incSize-template.html
    A src/instructionalDemos/framework/preferences/shared/html/increasing.html
    A src/instructionalDemos/framework/preferences/shared/html/prefsEditor.html
    A src/instructionalDemos/framework/preferences/shared/html/radioButton-template.html
    A src/instructionalDemos/framework/preferences/shared/html/slider-template.html
    A src/instructionalDemos/framework/preferences/shared/html/speak-template.html
    A src/instructionalDemos/framework/preferences/shared/html/speakIncrease.html
    A src/instructionalDemos/framework/preferences/shared/html/speaking.html
    A src/instructionalDemos/framework/preferences/shared/js/enactors.js
    A src/instructionalDemos/framework/preferences/shared/js/panels.js
    A src/instructionalDemos/framework/preferences/shared/js/primarySchema.js
    A src/instructionalDemos/framework/preferences/shared/js/utilities.js
    A src/instructionalDemos/framework/preferences/shared/messages/README.txt
    A src/instructionalDemos/framework/preferences/shared/messages/increasing.json
    A src/instructionalDemos/framework/preferences/shared/messages/prefsEditor.json
    A src/instructionalDemos/framework/preferences/shared/messages/speakIncrease.json
    A src/instructionalDemos/framework/preferences/shared/messages/speaking.json
    M src/tests/all-tests.html
    M src/tests/component-tests/inlineEdit/js/InlineEditTests.js
    A src/tests/component-tests/slidingPanel/html/SlidingPanel-test.html
    A src/tests/component-tests/slidingPanel/js/SlidingPanelTests.js
    A src/tests/component-tests/textfieldSlider/html/TextfieldSlider-test.html
    A src/tests/component-tests/textfieldSlider/js/TextfieldSliderTests.js
    R src/tests/component-tests/uiOptions/all-tests.html
    R src/tests/component-tests/uiOptions/css/test-theme.css
    R src/tests/component-tests/uiOptions/html/AuxBuilder-test.html
    R src/tests/component-tests/uiOptions/html/Builder-test.html
    R src/tests/component-tests/uiOptions/html/CSSGenerator-test.html
    R src/tests/component-tests/uiOptions/html/Enactors-test.html
    R src/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    R src/tests/component-tests/uiOptions/html/FatPanelUIOptionsFrame.html
    R src/tests/component-tests/uiOptions/html/FullNoPreviewUIOptions-test.html
    R src/tests/component-tests/uiOptions/html/FullPreviewUIOptions-test.html
    R src/tests/component-tests/uiOptions/html/ModelRelay-test.html
    R src/tests/component-tests/uiOptions/html/PageEnhancer-test.html
    R src/tests/component-tests/uiOptions/html/Panels-test.html
    R src/tests/component-tests/uiOptions/html/PrimaryBuilder-test.html
    R src/tests/component-tests/uiOptions/html/SlidingPanel-test.html
    R src/tests/component-tests/uiOptions/html/Store-test.html
    R src/tests/component-tests/uiOptions/html/TestPreviewTemplate.html
    R src/tests/component-tests/uiOptions/html/TextfieldSlider-test.html
    R src/tests/component-tests/uiOptions/html/UIEnhancer-test.html
    R src/tests/component-tests/uiOptions/html/UIOptions-test.html
    R src/tests/component-tests/uiOptions/html/URLUtilities-test.html
    R src/tests/component-tests/uiOptions/js/AuxBuilderTests.js
    R src/tests/component-tests/uiOptions/js/BuilderTests.js
    R src/tests/component-tests/uiOptions/js/CSSGeneratorTests.js
    R src/tests/component-tests/uiOptions/js/EnactorsTests.js
    R src/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    R src/tests/component-tests/uiOptions/js/FullNoPreviewUIOptionsTests.js
    R src/tests/component-tests/uiOptions/js/FullPreviewUIOptionsTests.js
    R src/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    R src/tests/component-tests/uiOptions/js/ModelRelayTests.js
    R src/tests/component-tests/uiOptions/js/PageEnhancerTests.js
    R src/tests/component-tests/uiOptions/js/PanelsTests.js
    R src/tests/component-tests/uiOptions/js/PrimaryBuilderTests.js
    R src/tests/component-tests/uiOptions/js/SlidingPanelTests.js
    R src/tests/component-tests/uiOptions/js/StoreTests.js
    R src/tests/component-tests/uiOptions/js/TextfieldSliderTests.js
    R src/tests/component-tests/uiOptions/js/UIEnhancerTests.js
    R src/tests/component-tests/uiOptions/js/UIOptionsTests.js
    R src/tests/component-tests/uiOptions/js/URLUtilitiesTests.js
    M src/tests/component-tests/uploader/js/FileQueueTests.js
    M src/tests/framework-tests/core/js/DataBindingTests.js
    M src/tests/framework-tests/core/js/FluidIoCTests.js
    M src/tests/framework-tests/core/js/FluidJSTests.js
    M src/tests/framework-tests/core/js/ModelTransformationTests.js
    A src/tests/framework-tests/preferences/all-tests.html
    A src/tests/framework-tests/preferences/css/test-theme.css
    A src/tests/framework-tests/preferences/html/AuxBuilder-test.html
    A src/tests/framework-tests/preferences/html/Builder-test.html
    A src/tests/framework-tests/preferences/html/CSSGenerator-test.html
    A src/tests/framework-tests/preferences/html/Enactors-test.html
    A src/tests/framework-tests/preferences/html/FullNoPreviewPrefsEditor-test.html
    A src/tests/framework-tests/preferences/html/FullPreviewPrefsEditor-test.html
    A src/tests/framework-tests/preferences/html/ModelRelay-test.html
    A src/tests/framework-tests/preferences/html/PageEnhancer-test.html
    A src/tests/framework-tests/preferences/html/Panels-test.html
    A src/tests/framework-tests/preferences/html/PrefsEditor-test.html
    A src/tests/framework-tests/preferences/html/PrimaryBuilder-test.html
    A src/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditor-test.html
    A src/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditorFrame.html
    A src/tests/framework-tests/preferences/html/Store-test.html
    A src/tests/framework-tests/preferences/html/TestPreviewTemplate.html
    A src/tests/framework-tests/preferences/html/UIEnhancer-test.html
    A src/tests/framework-tests/preferences/html/URLUtilities-test.html
    A src/tests/framework-tests/preferences/js/AuxBuilderTests.js
    A src/tests/framework-tests/preferences/js/BuilderTests.js
    A src/tests/framework-tests/preferences/js/CSSGeneratorTests.js
    A src/tests/framework-tests/preferences/js/EnactorsTests.js
    A src/tests/framework-tests/preferences/js/FullNoPreviewPrefsEditorTests.js
    A src/tests/framework-tests/preferences/js/FullPreviewPrefsEditorTests.js
    A src/tests/framework-tests/preferences/js/IntegrationTestsCommon.js
    A src/tests/framework-tests/preferences/js/ModelRelayTests.js
    A src/tests/framework-tests/preferences/js/PageEnhancerTests.js
    A src/tests/framework-tests/preferences/js/PanelsTests.js
    A src/tests/framework-tests/preferences/js/PrefsEditorTests.js
    A src/tests/framework-tests/preferences/js/PrimaryBuilderTests.js
    A src/tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js
    A src/tests/framework-tests/preferences/js/StoreTests.js
    A src/tests/framework-tests/preferences/js/UIEnhancerTests.js
    A src/tests/framework-tests/preferences/js/URLUtilitiesTests.js
    A src/tests/framework-tests/preferences/testResources/html/checkboxTemplate.html
    A src/tests/framework-tests/preferences/testResources/html/compositePrefsEditorTemplate.html
    A src/tests/framework-tests/preferences/testResources/html/increaseTemplate.html
    M src/tests/framework-tests/renderer/html/RendererUtilities-test.html
    M src/tests/framework-tests/renderer/js/RendererUtilitiesTests.js
    M src/tests/manual-tests/ReadMe.txt
    A src/tests/manual-tests/css/PrefsEditorFullPage.css
    R src/tests/manual-tests/css/UIOptionsFullPage.css
    M src/tests/manual-tests/html/SomeKindOfNews.html
    A src/tests/manual-tests/html/performance-test-2.html
    M src/tests/manual-tests/html/performance-test.html
    A src/tests/manual-tests/html/prefsEditorFullNoPreview.html
    A src/tests/manual-tests/html/prefsEditorFullNoPreviewSchema.html
    A src/tests/manual-tests/html/prefsEditorFullWithPreview.html
    A src/tests/manual-tests/html/prefsEditorFullWithPreviewSchema.html
    A src/tests/manual-tests/html/prefsEditorPreview.html
    A src/tests/manual-tests/html/prefsEditorSeparatedPanel.html
    A src/tests/manual-tests/html/prefsEditorSeparatedPanelSchema.html
    R src/tests/manual-tests/html/uiOptionsFullWithPreview.html
    R src/tests/manual-tests/html/uiOptionsFullWithPreviewSchema.html
    R src/tests/manual-tests/html/uiOptionsFullWithoutPreview.html
    R src/tests/manual-tests/html/uiOptionsFullWithoutPreviewSchema.html
    R src/tests/manual-tests/html/uiOptionsPreview.html
    A src/tests/manual-tests/js/performance-test-2.js
    M src/tests/manual-tests/js/performance-test.js
    A src/tests/manual-tests/js/prefsEditorFullPage.js
    A src/tests/manual-tests/js/prefsEditorFullPageSchema.js
    A src/tests/manual-tests/js/prefsEditorSeparatedPanel.js
    A src/tests/manual-tests/js/prefsEditorSeparatedPanelSchema.js
    M src/tests/manual-tests/js/someKindOfNews.js
    R src/tests/manual-tests/js/uiOptionsFullPage.js
    R src/tests/manual-tests/js/uiOptionsFullPageSchema.js
    M src/tests/test-core/testTests/js/TestingTests.js
    M src/tests/test-core/utils/js/IoCTestUtils.js

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

Conflicts:
	.gitignore


  Commit: 78ea7d9eb468ae8690425b3e2879a35f7390e1b4
      https://github.com/fluid-project/infusion/commit/78ea7d9eb468ae8690425b3e2879a35f7390e1b4
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-02 (Sun, 02 Feb 2014)

  Changed paths:
    M .gitignore
    A src/framework/preferences/css/fss/README.md
    A src/framework/preferences/css/fss/fss-text-prefsEditor.css
    A src/framework/preferences/css/fss/fss-theme-bw-prefsEditor.css
    A src/framework/preferences/css/fss/fss-theme-by-prefsEditor.css
    A src/framework/preferences/css/fss/fss-theme-coal-prefsEditor.css
    A src/framework/preferences/css/fss/fss-theme-dglg-prefsEditor.css
    A src/framework/preferences/css/fss/fss-theme-lgdg-prefsEditor.css
    A src/framework/preferences/css/fss/fss-theme-mist-prefsEditor.css
    A src/framework/preferences/css/fss/fss-theme-rust-prefsEditor.css
    A src/framework/preferences/css/fss/fss-theme-slate-prefsEditor.css
    A src/framework/preferences/css/fss/fss-theme-wb-prefsEditor.css
    A src/framework/preferences/css/fss/fss-theme-yb-prefsEditor.css

  Log Message:
  -----------
  FLUID-5120: Committing Generated stylesheets

Committing the generated stylesheets used by the preferences framework. Eventually these files will be generated through a css preprocessor once Infusion has switched to using one. In the meantime these will be maintained statically. The accompanying README.md file contains the information about the previous transformations that we will need to reimplement with the css preprocessor.


  Commit: 80fa7ea65d4524031b060f455e3226af46f6813b
      https://github.com/fluid-project/infusion/commit/80fa7ea65d4524031b060f455e3226af46f6813b
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-02 (Sun, 02 Feb 2014)

  Changed paths:
    M ReleaseNotes.txt
    M build-scripts/build.properties
    A jquery/ui/css/fl-theme-dglg/images/animated-overlay.gif b/src/lib/jquery/ui/css/fl-theme-dglg/images/animated-overlay.gif
    R jquery/ui/css/fl-theme-dglg/images/animated-overlay.gif b/src/lib/jquery/ui/css/fl-theme-dglg/images/animated-overlay.gif
    R jquery/ui/css/fl-theme-dglg/images/ui-icons_555_256x240.png b/src/lib/jquery/ui/css/fl-theme-dglg/images/ui-icons_555_256x240.png
    A jquery/ui/css/fl-theme-dglg/images/ui-icons_555_256x240.png b/src/lib/jquery/ui/css/fl-theme-dglg/images/ui-icons_555_256x240.png
    A jquery/ui/css/fl-theme-dglg/images/ui-icons_bdbdbb_256x240.png b/src/lib/jquery/ui/css/fl-theme-dglg/images/ui-icons_bdbdbb_256x240.png
    R jquery/ui/css/fl-theme-dglg/images/ui-icons_bdbdbb_256x240.png b/src/lib/jquery/ui/css/fl-theme-dglg/images/ui-icons_bdbdbb_256x240.png
    R jquery/ui/css/fl-theme-lgdg/images/animated-overlay.gif b/src/lib/jquery/ui/css/fl-theme-lgdg/images/animated-overlay.gif
    A jquery/ui/css/fl-theme-lgdg/images/animated-overlay.gif b/src/lib/jquery/ui/css/fl-theme-lgdg/images/animated-overlay.gif
    R jquery/ui/css/fl-theme-lgdg/images/ui-icons_555_256x240.png b/src/lib/jquery/ui/css/fl-theme-lgdg/images/ui-icons_555_256x240.png
    A jquery/ui/css/fl-theme-lgdg/images/ui-icons_555_256x240.png b/src/lib/jquery/ui/css/fl-theme-lgdg/images/ui-icons_555_256x240.png
    A jquery/ui/css/fl-theme-lgdg/images/ui-icons_bdbdbb_256x240.png b/src/lib/jquery/ui/css/fl-theme-lgdg/images/ui-icons_bdbdbb_256x240.png
    R jquery/ui/css/fl-theme-lgdg/images/ui-icons_bdbdbb_256x240.png b/src/lib/jquery/ui/css/fl-theme-lgdg/images/ui-icons_bdbdbb_256x240.png
    M src/components/inlineEdit/inlineEditDependencies.json
    M src/components/pager/js/PagedTable.js
    M src/components/pager/js/Pager.js
    M src/components/pager/pagerDependencies.json
    M src/components/reorderer/js/Reorderer.js
    M src/components/tabs/js/Tabs.js
    M src/components/tabs/tabsDependencies.json
    M src/components/tooltip/js/Tooltip.js
    M src/components/tooltip/tooltipDependencies.json
    M src/components/uploader/js/HTML5UploaderSupport.js
    M src/demos/fss/clearfix/html/clearfix.html
    M src/demos/fss/linearize/html/linearize.html
    M src/demos/inlineEdit/rich/html/inlineEdit.html
    M src/demos/inlineEdit/simple/html/inlineEdit.html
    M src/demos/pager/html/pager.html
    M src/demos/progress/html/progress.html
    M src/demos/renderer/html/renderer.html
    M src/demos/reorderer/layoutReorderer/css/layoutReorderer.css
    M src/framework/core/js/Fluid.js
    M src/framework/core/js/FluidDocument.js
    M src/framework/core/js/FluidIoC.js
    M src/framework/core/js/FluidRequests.js
    M src/framework/core/js/FluidView.js
    A src/framework/preferences/js/UIEnhancer.js
    R src/framework/preferences/js/UIEnhancer.js
    M src/integration-demos/sakai/html/pager-site-setting.html
    M src/lib/jquery/core/js/jquery.js
    R src/lib/jquery/plugins/ariaTabs/jQueryAriaTabsPluginDependencies.json
    R src/lib/jquery/plugins/ariaTabs/js/ui.ariaTabs.js
    R src/lib/jquery/plugins/bgiframe/jQuerybgiframePluginDependencies.json
    R src/lib/jquery/plugins/bgiframe/js/jquery.bgiframe.js
    R src/lib/jquery/plugins/tooltip/README
    R src/lib/jquery/plugins/tooltip/css/jquery.tooltip.css
    R src/lib/jquery/plugins/tooltip/jQueryTooltipPluginDependencies.json
    R src/lib/jquery/plugins/tooltip/js/jquery.ui.tooltip.js
    A src/lib/jquery/ui/css/default-theme/images/animated-overlay.gif
    M src/lib/jquery/ui/css/default-theme/images/ui-bg_flat_0_aaaaaa_40x100.png
    M src/lib/jquery/ui/css/default-theme/images/ui-bg_flat_75_ffffff_40x100.png
    M src/lib/jquery/ui/css/default-theme/images/ui-bg_glass_55_fbf9ee_1x400.png
    M src/lib/jquery/ui/css/default-theme/images/ui-bg_glass_65_ffffff_1x400.png
    M src/lib/jquery/ui/css/default-theme/images/ui-bg_glass_75_dadada_1x400.png
    M src/lib/jquery/ui/css/default-theme/images/ui-bg_glass_75_e6e6e6_1x400.png
    A src/lib/jquery/ui/css/default-theme/images/ui-bg_glass_95_fef1ec_1x400.png
    M src/lib/jquery/ui/css/default-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png
    R src/lib/jquery/ui/css/default-theme/images/ui-bg_inset-soft_95_fef1ec_1x100.png
    M src/lib/jquery/ui/css/default-theme/images/ui-icons_222222_256x240.png
    M src/lib/jquery/ui/css/default-theme/images/ui-icons_2e83ff_256x240.png
    M src/lib/jquery/ui/css/default-theme/images/ui-icons_454545_256x240.png
    M src/lib/jquery/ui/css/default-theme/images/ui-icons_888888_256x240.png
    M src/lib/jquery/ui/css/default-theme/images/ui-icons_cd0a0a_256x240.png
    M src/lib/jquery/ui/css/default-theme/jquery.ui.theme.css
    M src/lib/jquery/ui/css/fl-theme-bw/bw.css
    A src/lib/jquery/ui/css/fl-theme-bw/images/animated-overlay.gif
    M src/lib/jquery/ui/css/fl-theme-bw/images/ui-bg_flat_0_000000_40x100.png
    M src/lib/jquery/ui/css/fl-theme-bw/images/ui-bg_flat_0_ffffff_40x100.png
    M src/lib/jquery/ui/css/fl-theme-bw/images/ui-icons_000000_256x240.png
    M src/lib/jquery/ui/css/fl-theme-bw/images/ui-icons_ffffff_256x240.png
    M src/lib/jquery/ui/css/fl-theme-by/by.css
    A src/lib/jquery/ui/css/fl-theme-by/images/animated-overlay.gif
    M src/lib/jquery/ui/css/fl-theme-by/images/ui-bg_flat_0_000000_40x100.png
    M src/lib/jquery/ui/css/fl-theme-by/images/ui-bg_flat_0_ffff00_40x100.png
    M src/lib/jquery/ui/css/fl-theme-by/images/ui-icons_000000_256x240.png
    M src/lib/jquery/ui/css/fl-theme-by/images/ui-icons_ffff00_256x240.png
    M src/lib/jquery/ui/css/fl-theme-coal/coal.css
    A src/lib/jquery/ui/css/fl-theme-coal/images/animated-overlay.gif
    M src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_flat_0_000000_40x100.png
    M src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_flat_75_cccccc_40x100.png
    M src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_highlight-soft_25_575757_1x100.png
    M src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_highlight-soft_55_cccccc_1x100.png
    M src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_highlight-soft_65_000000_1x100.png
    M src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_highlight-soft_75_333333_1x100.png
    M src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_highlight-soft_75_666666_1x100.png
    M src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_inset-soft_95_fef1ec_1x100.png
    M src/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_222222_256x240.png
    M src/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_333333_256x240.png
    M src/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_a3a3a3_256x240.png
    M src/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_cccccc_256x240.png
    M src/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_cd0a0a_256x240.png
    M src/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_ffffff_256x240.png
    M src/lib/jquery/ui/css/fl-theme-dglg/dglg.css
    M src/lib/jquery/ui/css/fl-theme-dglg/images/ui-bg_flat_0_bdbdbb_40x100.png
    M src/lib/jquery/ui/css/fl-theme-dglg/images/ui-bg_flat_100_555_40x100.png
    M src/lib/jquery/ui/css/fl-theme-dglg/images/ui-bg_flat_100_bdbdbb_40x100.png
    M src/lib/jquery/ui/css/fl-theme-lgdg/images/ui-bg_flat_0_555_40x100.png
    M src/lib/jquery/ui/css/fl-theme-lgdg/images/ui-bg_flat_100_555_40x100.png
    M src/lib/jquery/ui/css/fl-theme-lgdg/images/ui-bg_flat_100_bdbdbb_40x100.png
    M src/lib/jquery/ui/css/fl-theme-lgdg/lgdg.css
    A src/lib/jquery/ui/css/fl-theme-mist/images/animated-overlay.gif
    M src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_flat_0_000000_40x100.png
    M src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_flat_0_2e83ff_40x100.png
    M src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_flat_75_ffffff_40x100.png
    M src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_glass_65_ffffff_1x400.png
    M src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_glass_75_9dcaf6_1x400.png
    M src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_glass_75_d9e8f7_1x400.png
    M src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_highlight-soft_55_9dcaf6_1x100.png
    M src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_inset-soft_95_fef1ec_1x100.png
    M src/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_000000_256x240.png
    M src/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_222222_256x240.png
    M src/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_2e83ff_256x240.png
    M src/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_454545_256x240.png
    M src/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_888888_256x240.png
    M src/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_cd0a0a_256x240.png
    M src/lib/jquery/ui/css/fl-theme-mist/mist.css
    A src/lib/jquery/ui/css/fl-theme-slate/images/animated-overlay.gif
    M src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_flat_0_666666_40x100.png
    M src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_flat_0_999999_40x100.png
    M src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_flat_0_cccccc_40x100.png
    M src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_flat_0_ebebeb_40x100.png
    M src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_flat_0_ffffff_40x100.png
    M src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_glass_75_666666_1x400.png
    M src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_highlight-hard_100_ebebeb_1x100.png
    M src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_highlight-soft_75_999999_1x100.png
    M src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_inset-hard_100_ebebeb_1x100.png
    M src/lib/jquery/ui/css/fl-theme-slate/images/ui-icons_000000_256x240.png
    M src/lib/jquery/ui/css/fl-theme-slate/images/ui-icons_666666_256x240.png
    M src/lib/jquery/ui/css/fl-theme-slate/images/ui-icons_ebebeb_256x240.png
    M src/lib/jquery/ui/css/fl-theme-slate/images/ui-icons_ffffff_256x240.png
    M src/lib/jquery/ui/css/fl-theme-slate/slate.css
    A src/lib/jquery/ui/css/fl-theme-wb/images/animated-overlay.gif
    M src/lib/jquery/ui/css/fl-theme-wb/images/ui-bg_flat_0_000000_40x100.png
    M src/lib/jquery/ui/css/fl-theme-wb/images/ui-bg_flat_0_ffffff_40x100.png
    M src/lib/jquery/ui/css/fl-theme-wb/images/ui-icons_000000_256x240.png
    M src/lib/jquery/ui/css/fl-theme-wb/images/ui-icons_ffffff_256x240.png
    M src/lib/jquery/ui/css/fl-theme-wb/wb.css
    A src/lib/jquery/ui/css/fl-theme-yb/images/animated-overlay.gif
    M src/lib/jquery/ui/css/fl-theme-yb/images/ui-bg_flat_0_000000_40x100.png
    M src/lib/jquery/ui/css/fl-theme-yb/images/ui-bg_flat_0_ffff00_40x100.png
    M src/lib/jquery/ui/css/fl-theme-yb/images/ui-icons_000000_256x240.png
    M src/lib/jquery/ui/css/fl-theme-yb/images/ui-icons_ffff00_256x240.png
    M src/lib/jquery/ui/css/fl-theme-yb/yb.css
    R src/lib/jquery/ui/css/jquery.ui.theme.css
    M src/lib/jquery/ui/jQueryUIWidgetsDependencies.json
    A src/lib/jquery/ui/js/jquery.ui.button.js
    M src/lib/jquery/ui/js/jquery.ui.core.js
    M src/lib/jquery/ui/js/jquery.ui.dialog.js
    M src/lib/jquery/ui/js/jquery.ui.draggable.js
    M src/lib/jquery/ui/js/jquery.ui.mouse.js
    M src/lib/jquery/ui/js/jquery.ui.position.js
    A src/lib/jquery/ui/js/jquery.ui.resizable.js
    M src/lib/jquery/ui/js/jquery.ui.slider.js
    M src/lib/jquery/ui/js/jquery.ui.tabs.js
    A src/lib/jquery/ui/js/jquery.ui.tooltip.js
    M src/lib/jquery/ui/js/jquery.ui.widget.js
    R src/lib/jquery/ui/js/ui-FLUID-readme.txt
    M src/standalone-demos/renderer/html/data-bound-menu.html
    M src/standalone-demos/renderer/html/id-based-inventory.html
    M src/standalone-demos/renderer/html/programmatic-tree-menu.html
    M src/standalone-demos/renderer/html/selector-based-inventory.html
    M src/tests/all-tests.html
    M src/tests/component-tests/inlineEdit/html/InlineEdit-test.html
    M src/tests/component-tests/inlineEdit/js/InlineEditTests.js
    M src/tests/component-tests/pager/html/PagedTable-test.html
    M src/tests/component-tests/pager/html/Pager-test.html
    M src/tests/component-tests/pager/js/PagedTableTests.js
    M src/tests/component-tests/reorderer/js/LayoutReordererTests.js
    M src/tests/component-tests/tabs/html/Tabs-test.html
    M src/tests/component-tests/tabs/js/TabsTests.js
    M src/tests/component-tests/tooltip/html/Tooltip-test.html
    M src/tests/component-tests/tooltip/js/TooltipTests.js
    M src/tests/component-tests/uploader/html/HTML5UploaderSupport-test.html
    M src/tests/component-tests/uploader/js/HTML5UploaderSupportTests.js
    M src/tests/framework-tests/core/html/Caching-test.html
    M src/tests/framework-tests/core/html/FluidIoCView-test.html
    M src/tests/framework-tests/core/html/keyboard-a11y-test.html
    M src/tests/framework-tests/core/js/CachingTests.js
    M src/tests/framework-tests/core/js/FluidIoCTests.js
    M src/tests/framework-tests/core/js/keyboard-a11y-tests.js
    M src/tests/framework-tests/preferences/all-tests.html
    M src/tests/framework-tests/preferences/html/Builder-test.html
    M src/tests/framework-tests/preferences/html/Enactors-test.html
    M src/tests/framework-tests/preferences/html/FullNoPreviewPrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/FullPreviewPrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/Panels-test.html
    M src/tests/framework-tests/preferences/html/PrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/UIEnhancer-test.html
    M src/tests/framework-tests/preferences/js/PanelsTests.js
    M src/tests/framework-tests/renderer/html/Renderer-test.html
    M src/tests/framework-tests/renderer/html/RendererUtilities-test.html
    M src/tests/lib/mockjax/js/jquery.mockjax.js
    R src/tests/lib/qunit/VERSION
    M src/tests/lib/qunit/addons/composite/README.md
    R src/tests/lib/qunit/addons/composite/index.html
    M src/tests/lib/qunit/addons/composite/qunit-composite.css
    M src/tests/lib/qunit/addons/composite/qunit-composite.js
    M src/tests/lib/qunit/css/qunit.css
    M src/tests/lib/qunit/js/qunit.js
    M src/tests/manual-tests/html/dropdown.html
    M src/tests/manual-tests/html/prefsEditorFullNoPreview.html
    M src/tests/manual-tests/html/prefsEditorFullNoPreviewSchema.html
    M src/tests/manual-tests/html/prefsEditorFullWithPreview.html
    M src/tests/manual-tests/html/prefsEditorFullWithPreviewSchema.html
    M src/tests/manual-tests/html/renderer-component-types.html
    M src/tests/test-core/testTests/html/Testing-test.html
    M src/tests/test-core/testTests/js/TestingTests.js
    M src/tests/test-core/utils/js/IoCTestUtils.js

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


  Commit: 70f9233d23fdec50b2fa17f9dab425757067dee2
      https://github.com/fluid-project/infusion/commit/70f9233d23fdec50b2fa17f9dab425757067dee2
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M package.json

  Log Message:
  -----------
  FLUID-5120: Added grunt-modulefiles plugin


  Commit: 078350ec184f8c415a8e5bed1d20710fbeee9b00
      https://github.com/fluid-project/infusion/commit/078350ec184f8c415a8e5bed1d20710fbeee9b00
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M Gruntfile.js
    M src/components/inlineEdit/inlineEditDependencies.json
    M src/components/pager/pagerDependencies.json
    M src/components/progress/progressDependencies.json
    M src/components/reorderer/reordererDependencies.json
    M src/components/slidingPanel/slidingPanelDependencies.json
    M src/components/tableOfContents/tableOfContentsDependencies.json
    M src/components/tabs/tabsDependencies.json
    M src/components/textfieldSlider/textfieldSliderDependencies.json
    M src/components/tooltip/tooltipDependencies.json
    M src/components/uiOptions/uiOptionsDependencies.json
    M src/components/undo/undoDependencies.json
    M src/components/uploader/uploaderDependencies.json
    M src/framework/core/frameworkDependencies.json
    M src/framework/enhancement/enhancementDependencies.json
    M src/framework/fss/fssDependencies.json
    M src/framework/preferences/preferencesDependencies.json
    M src/lib/fastXmlPull/fastXmlPullDependencies.json
    M src/lib/jquery/core/jQueryDependencies.json
    M src/lib/jquery/plugins/scrollTo/jQueryScrollToPluginDependencies.json
    M src/lib/jquery/plugins/touchPunch/jQueryTouchPunchPluginDependencies.json
    M src/lib/jquery/ui/jQueryUICoreDependencies.json
    M src/lib/jquery/ui/jQueryUIWidgetsDependencies.json
    M src/lib/json/jsonDependencies.json
    M src/lib/swfobject/swfobjectDependencies.json
    M src/lib/swfupload/swfuploadDependencies.json

  Log Message:
  -----------
  FLUID-5120: Using modulefiles plugin

Using the modulefiles plugin to create the InfusionAll builds. Had to update the files in each dependencyFile to have a relative path from the dependency file.


  Commit: e2745af2745c2c3b6e03a1985224f85ba280f1db
      https://github.com/fluid-project/infusion/commit/e2745af2745c2c3b6e03a1985224f85ba280f1db
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M package.json

  Log Message:
  -----------
  FLUID-5120: Upgrading grunt-modulefiles plugin

Updated plugin to get access to the new feature that returns the listing of directory dependencies.


  Commit: a7be80496a126c42ed757e0636028e64d6e13ffa
      https://github.com/fluid-project/infusion/commit/a7be80496a126c42ed757e0636028e64d6e13ffa
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M Gruntfile.js
    M package.json

  Log Message:
  -----------
  FLUID-5120: Updated modulefiles plugin

Updated the modulefiles plugin to correct a bug it had with it's lodash dependency.
Also updated the gruntfile for the change in output files location.


  Commit: 83e135cca46a53f1db858d0f4f9b05c8eff28ad6
      https://github.com/fluid-project/infusion/commit/83e135cca46a53f1db858d0f4f9b05c8eff28ad6
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-05 (Wed, 05 Feb 2014)

  Changed paths:
    M package.json

  Log Message:
  -----------
  FLUID-5120: Updated modulefiles plugin

More bug fixes to modulefiles plugin


  Commit: bb88ca47ba785df5a653c05c1bc6de41d92737ae
      https://github.com/fluid-project/infusion/commit/bb88ca47ba785df5a653c05c1bc6de41d92737ae
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-05 (Wed, 05 Feb 2014)

  Changed paths:
    M Gruntfile.js

  Log Message:
  -----------
  FLUID-5120: start of custom build

Start work on creating a custom build. The all build doesn't work at the moment due to assumptions in secondary targets that haven't been removed from running. Also need to think of the command line api to have.


  Commit: 263bea4af78bebd732f5922e7f4e17ba6527b467
      https://github.com/fluid-project/infusion/commit/263bea4af78bebd732f5922e7f4e17ba6527b467
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-05 (Wed, 05 Feb 2014)

  Changed paths:
    M Gruntfile.js

  Log Message:
  -----------
  FLUID-5120: grunt builds available

Grunt builds should be working for all, custom, source, minified cases. Documentation and cleanup to follow.


  Commit: ff5fdcfcb558757f597e0d24323e38a7948cf3f7
      https://github.com/fluid-project/infusion/commit/ff5fdcfcb558757f597e0d24323e38a7948cf3f7
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-05 (Wed, 05 Feb 2014)

  Changed paths:
    M Gruntfile.js

  Log Message:
  -----------
  FLUID-5120: using " instead of '

Addressed consistency issues between using " and '.


  Commit: c8cbb228390e2b58d0d3ac0277a5adb3639dbf01
      https://github.com/fluid-project/infusion/commit/c8cbb228390e2b58d0d3ac0277a5adb3639dbf01
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-05 (Wed, 05 Feb 2014)

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

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


  Commit: 3c3874bf448b430840a539e5726fc2d4a98463b2
      https://github.com/fluid-project/infusion/commit/3c3874bf448b430840a539e5726fc2d4a98463b2
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-05 (Wed, 05 Feb 2014)

  Changed paths:
    A README.md
    R README.txt

  Log Message:
  -----------
  FLUID-5120: Updated README

Updated README to include build instructions.


  Commit: 1ef89c2e189f25b5eb9b958940255779341a3e5f
      https://github.com/fluid-project/infusion/commit/1ef89c2e189f25b5eb9b958940255779341a3e5f
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-05 (Wed, 05 Feb 2014)

  Changed paths:
    M README.md

  Log Message:
  -----------
  FLUID-5120: formatting changes to README


  Commit: 469010cdc372237afb64f091d37d0bc90f980829
      https://github.com/fluid-project/infusion/commit/469010cdc372237afb64f091d37d0bc90f980829
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-05 (Wed, 05 Feb 2014)

  Changed paths:
    M README.md

  Log Message:
  -----------
  FLUID-5120: Updated README

Added a missing type for the --name option.


  Commit: 35f6b6699da85ca5ae2720013e2d6a3f52f31336
      https://github.com/fluid-project/infusion/commit/35f6b6699da85ca5ae2720013e2d6a3f52f31336
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-05 (Wed, 05 Feb 2014)

  Changed paths:
    R build-scripts/build-README.txt
    R build-scripts/build-core.js
    R build-scripts/build.properties
    R build-scripts/build.xml
    R build-scripts/buildutils.xml
    R build-scripts/dependency.js
    R build-scripts/importantInjection.json
    R build-scripts/lib/jscssp/LICENSE.txt
    R build-scripts/lib/jscssp/js/jscssp.js
    R build-scripts/lib/jslint4java-1.1+rhino.jar
    R build-scripts/lib/rhino/LICENSE.txt
    R build-scripts/lib/rhino/bsf.jar
    R build-scripts/lib/rhino/commons-logging-1.1.1.jar
    R build-scripts/lib/rhino/js.jar
    R build-scripts/lib/yuicompressor-2.3.3.jar
    R build-scripts/prefsFramework/js/BrowserStylesheetHandler.js
    R build-scripts/prefsFramework/js/CSSGenerator.js
    R build-scripts/prefsFramework/js/RhinoStylesheetHandler.js
    R build-scripts/prefsFramework/js/StylesheetImportant.js

  Log Message:
  -----------
  FLUID-5120: Removed old ant based build scripts


  Commit: 2a13d8d28bff7711b393f45c4f55f4d2195b5c59
      https://github.com/fluid-project/infusion/commit/2a13d8d28bff7711b393f45c4f55f4d2195b5c59
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M Gruntfile.js

  Log Message:
  -----------
  FLUID-5120: removed console logs


  Commit: f25860e3b256646259fde6715b0b9ff53845b2a5
      https://github.com/fluid-project/infusion/commit/f25860e3b256646259fde6715b0b9ff53845b2a5
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M src/framework/core/js/ModelTransformationTransforms.js
    M src/lib/fastXmlPull/js/fastXmlPull.js
    M src/tests/component-tests/reorderer/js/ImageReordererTestConstants.js
    M src/tests/component-tests/reorderer/js/ImageReordererTests.js
    M src/tests/component-tests/reorderer/js/LayoutReordererTests.js
    M src/tests/component-tests/uploader/js/FileQueueViewTests.js
    M src/tests/framework-tests/renderer/html/Renderer-test.html
    M src/tests/framework-tests/renderer/js/RendererTests.js
    M src/tests/test-core/jqUnit/js/jqUnit-browser.js

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


  Commit: 75e54ec85c7944d9a0a3525c9fe5997312310b08
      https://github.com/fluid-project/infusion/commit/75e54ec85c7944d9a0a3525c9fe5997312310b08
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M package.json

  Log Message:
  -----------
  FLUID-5120: removed scripts from package.json


  Commit: b23bea294253623d34c4334d3023ad210367d1a8
      https://github.com/fluid-project/infusion/commit/b23bea294253623d34c4334d3023ad210367d1a8
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M src/framework/preferences/css/fss/README.md

  Log Message:
  -----------
  FLUID-5120: Updated README for prefs css files


  Commit: 1e36c2988ab31bfbac443985a2ac83a780143fb5
      https://github.com/fluid-project/infusion/commit/1e36c2988ab31bfbac443985a2ac83a780143fb5
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M Gruntfile.js

  Log Message:
  -----------
  FLUID-5120: Simplified all target for uglify.

Combined file patterns into a single file object.


  Commit: 5871672756cb83fe90b719aa8a8ebd52eceb26e4
      https://github.com/fluid-project/infusion/commit/5871672756cb83fe90b719aa8a8ebd52eceb26e4
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M Gruntfile.js

  Log Message:
  -----------
  FLUID-5120: removed commented out task


  Commit: 86d451b69d162f91da86655b79326c4d1d5dcb3b
      https://github.com/fluid-project/infusion/commit/86d451b69d162f91da86655b79326c4d1d5dcb3b
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M Gruntfile.js

  Log Message:
  -----------
  FLUID-5120: Added comments


  Commit: 0bf97e28d6321fa1112899f21e3f00f3feee273b
      https://github.com/fluid-project/infusion/commit/0bf97e28d6321fa1112899f21e3f00f3feee273b
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M README.md

  Log Message:
  -----------
  FLUID-5120: Edit the README

Worked with anastasiac to edit the README file.


  Commit: 8c90bca075ce57a9ce9d71942cea78b5b38f39ff
      https://github.com/fluid-project/infusion/commit/8c90bca075ce57a9ce9d71942cea78b5b38f39ff
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M Gruntfile.js
    M README.md

  Log Message:
  -----------
  FLUID-5120: Renamed the builds

Renamed to infusion-all and infusion-custom


  Commit: 1f2f6bb15db0656fa58e30003519abc2c02849d8
      https://github.com/fluid-project/infusion/commit/1f2f6bb15db0656fa58e30003519abc2c02849d8
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M package.json

  Log Message:
  -----------
  FLUID-5120: Updated modulefiles plugin

Updated to the 0.2.0 release of the grunt-modulefiles plugin


  Commit: e85ade9a50adf91567b885fadbb582272a5b9821
      https://github.com/fluid-project/infusion/commit/e85ade9a50adf91567b885fadbb582272a5b9821
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-10 (Mon, 10 Feb 2014)

  Changed paths:
    M src/components/inlineEdit/js/InlineEdit.js
    M src/components/pager/js/Pager.js
    M src/components/pager/js/Table.js
    M src/components/reorderer/js/Reorderer.js
    M src/components/textfieldSlider/js/TextfieldSlider.js
    M src/components/tooltip/js/Tooltip.js
    M src/components/uploader/html/Uploader.html
    M src/demos/fss/clearfix/html/clearfix.html
    M src/demos/fss/linearize/html/linearize.html
    M src/demos/fss/linearize/js/linearizeDemo.js
    M src/demos/fss/mobile/html/mobile.html
    M src/demos/fss/mobile/html/nav/basic.html
    M src/demos/fss/mobile/html/nav/icon.html
    M src/demos/fss/mobile/html/nav/thumb.html
    M src/demos/fss/mobile/html/tabs/basic.html
    M src/demos/inlineEdit/rich/html/inlineEdit.html
    M src/demos/inlineEdit/simple/html/inlineEdit.html
    M src/demos/keyboard-a11y/html/keyboard.html
    M src/demos/pager/html/pager.html
    M src/demos/progress/html/progress.html
    M src/demos/reorderer/gridReorderer/html/gridReorderer.html
    M src/demos/reorderer/imageReorderer/html/imageReorderer.html
    M src/demos/reorderer/listReorderer/html/listReorderer.html
    M src/demos/uiOptions/html/uiOptions.html
    M src/demos/uploader/html/uploader.html
    M src/framework/core/frameworkDependencies.json
    M src/framework/core/js/DataBinding.js
    M src/framework/core/js/Fluid.js
    M src/framework/core/js/FluidDocument.js
    M src/framework/core/js/FluidIoC.js
    M src/framework/core/js/FluidView.js
    M src/framework/core/js/ModelTransformation.js
    M src/framework/core/js/ModelTransformationTransforms.js
    M src/framework/core/js/jquery.standalone.js
    M src/framework/renderer/js/RendererUtilities.js
    M src/instructionalDemos/framework/preferences/conditionalAdjusters1/conditional.html
    M src/instructionalDemos/framework/preferences/conditionalAdjusters2/conditional.html
    M src/integration-demos/sakai/html/pager-site-setting.html
    M src/module/includes.json
    M src/standalone-demos/pager/html/pager.html
    M src/standalone-demos/pager/js/pager-example.js
    M src/standalone-demos/reorderer/html/table-tr.html
    M src/standalone-demos/table-of-contents/html/TableOfContents.html
    M src/tests/all-tests.html
    M src/tests/component-tests/inlineEdit/js/InlineEditTests.js
    M src/tests/component-tests/pager/html/PagedTable-test.html
    M src/tests/component-tests/pager/html/Pager-test.html
    M src/tests/component-tests/pager/js/PagerTests.js
    M src/tests/component-tests/progress/html/Progress-test.html
    M src/tests/component-tests/reorderer/html/AriaLabeller-test.html
    M src/tests/component-tests/reorderer/html/ImageReorderer-test.html
    M src/tests/component-tests/reorderer/html/LayoutReorderer-test.html
    M src/tests/component-tests/reorderer/html/NestedReorderer-test.html
    M src/tests/component-tests/reorderer/html/ReorderList-test.html
    M src/tests/component-tests/reorderer/html/Scheduler-test.html
    M src/tests/component-tests/reorderer/js/AriaLabellerTests.js
    M src/tests/component-tests/reorderer/js/ImageReordererTestConstants.js
    M src/tests/component-tests/reorderer/js/ImageReordererTests.js
    M src/tests/component-tests/reorderer/js/LayoutReordererTests.js
    R src/tests/component-tests/reorderer/js/NestedReorderTests.js
    A src/tests/component-tests/reorderer/js/NestedReordererTests.js
    M src/tests/component-tests/reorderer/js/ReorderGridTests.js
    M src/tests/component-tests/reorderer/js/ReorderListTests.js
    M src/tests/component-tests/reorderer/js/ReordererTestUtils.js
    M src/tests/component-tests/slidingPanel/html/SlidingPanel-test.html
    M src/tests/component-tests/tableOfContents/html/TableOfContents-test.html
    M src/tests/component-tests/tabs/html/Tabs-test.html
    M src/tests/component-tests/textfieldSlider/html/TextfieldSlider-test.html
    M src/tests/component-tests/tooltip/html/Tooltip-test.html
    M src/tests/component-tests/tooltip/js/TooltipTests.js
    M src/tests/component-tests/uploader/html/DemoUploadManager-test.html
    M src/tests/component-tests/uploader/html/ErrorPanel-test.html
    M src/tests/component-tests/uploader/html/FileQueue-test.html
    M src/tests/component-tests/uploader/html/FileQueueView-test.html
    M src/tests/component-tests/uploader/html/HTML5UploaderSupport-test.html
    M src/tests/component-tests/uploader/html/SWFUploadManager-test.html
    M src/tests/component-tests/uploader/html/Uploader-test.html
    M src/tests/component-tests/uploader/html/UploaderCompatibility-test.html
    M src/tests/component-tests/uploader/js/FileQueueViewTests.js
    M src/tests/framework-tests/core/html/Caching-test.html
    M src/tests/framework-tests/core/html/DataBinding-test.html
    M src/tests/framework-tests/core/html/FluidIoC-test.html
    M src/tests/framework-tests/core/html/FluidIoCStandalone-test.html
    M src/tests/framework-tests/core/html/FluidIoCView-test.html
    M src/tests/framework-tests/core/html/FluidView-test.html
    M src/tests/framework-tests/core/html/ModelTransformation-test.html
    M src/tests/framework-tests/core/js/DataBindingTests.js
    M src/tests/framework-tests/core/js/FluidIoCTests.js
    M src/tests/framework-tests/core/js/FluidIoCViewTests.js
    M src/tests/framework-tests/core/js/FluidJSTests.js
    M src/tests/framework-tests/core/js/FluidViewTests.js
    M src/tests/framework-tests/core/js/ModelTransformationTests.js
    M src/tests/framework-tests/core/js/keyboard-a11y-tests.js
    M src/tests/framework-tests/enhancement/html/ProgressiveEnhancement-test.html
    M src/tests/framework-tests/preferences/html/AuxBuilder-test.html
    M src/tests/framework-tests/preferences/html/Builder-test.html
    M src/tests/framework-tests/preferences/html/Enactors-test.html
    M src/tests/framework-tests/preferences/html/FullNoPreviewPrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/FullPreviewPrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/ModelRelay-test.html
    M src/tests/framework-tests/preferences/html/PageEnhancer-test.html
    M src/tests/framework-tests/preferences/html/Panels-test.html
    M src/tests/framework-tests/preferences/html/PrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/PrimaryBuilder-test.html
    M src/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/Store-test.html
    M src/tests/framework-tests/preferences/html/UIEnhancer-test.html
    M src/tests/framework-tests/preferences/html/URLUtilities-test.html
    M src/tests/framework-tests/renderer/html/RendererUtilities-test.html
    M src/tests/manual-tests/html/SomeKindOfNews.html
    M src/tests/manual-tests/html/dropdown.html
    M src/tests/manual-tests/html/dynamic-reorderer.html
    M src/tests/manual-tests/html/performance-test-2.html
    M src/tests/manual-tests/html/prefsEditorFullNoPreview.html
    M src/tests/manual-tests/html/prefsEditorFullNoPreviewSchema.html
    M src/tests/manual-tests/html/prefsEditorFullWithPreview.html
    M src/tests/manual-tests/html/prefsEditorFullWithPreviewSchema.html
    M src/tests/manual-tests/html/prefsEditorSeparatedPanel.html
    M src/tests/manual-tests/html/prefsEditorSeparatedPanelSchema.html
    M src/tests/manual-tests/html/simple-progress.html
    M src/tests/manual-tests/html/versioning.html
    M src/tests/test-core/jqUnit/js/jqUnit-browser.js
    M src/tests/test-core/testTests/html/Testing-test.html

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

Conflicts:
	src/framework/core/frameworkDependencies.json


  Commit: 03e560908a95e69d47aa4830aaf32a863ff5cc04
      https://github.com/fluid-project/infusion/commit/03e560908a95e69d47aa4830aaf32a863ff5cc04
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-10 (Mon, 10 Feb 2014)

  Changed paths:
    M src/tests/all-tests.html
    M src/tests/framework-tests/preferences/all-tests.html
    R src/tests/framework-tests/preferences/html/CSSGenerator-test.html
    R src/tests/framework-tests/preferences/js/CSSGeneratorTests.js

  Log Message:
  -----------
  FLUID-5120: removed old CSSGenrator test.


  Commit: 51a22b1d79358cd19fdf4dea3abf1eebe0042351
      https://github.com/fluid-project/infusion/commit/51a22b1d79358cd19fdf4dea3abf1eebe0042351
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-11 (Tue, 11 Feb 2014)

  Changed paths:
    M src/components/reorderer/js/Reorderer.js
    M src/framework/preferences/js/AuxBuilder.js
    M src/tests/component-tests/reorderer/html/GeometricManager-test.html
    M src/tests/framework-tests/preferences/js/AuxBuilderTests.js

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


  Commit: 469edd25f0c5ef8477f720570edf11f84d69152d
      https://github.com/fluid-project/infusion/commit/469edd25f0c5ef8477f720570edf11f84d69152d
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-11 (Tue, 11 Feb 2014)

  Changed paths:
    M src/components/inlineEdit/inlineEditDependencies.json
    M src/components/pager/pagerDependencies.json
    M src/components/progress/progressDependencies.json
    M src/components/slidingPanel/slidingPanelDependencies.json
    M src/components/tableOfContents/tableOfContentsDependencies.json
    M src/components/tabs/tabsDependencies.json
    M src/components/textfieldSlider/textfieldSliderDependencies.json
    M src/components/tooltip/tooltipDependencies.json
    M src/components/uiOptions/uiOptionsDependencies.json
    M src/components/undo/undoDependencies.json
    M src/framework/core/frameworkDependencies.json
    M src/framework/enhancement/enhancementDependencies.json
    M src/framework/renderer/rendererDependencies.json
    M src/lib/fastXmlPull/fastXmlPullDependencies.json
    M src/lib/jquery/core/jQueryDependencies.json
    M src/lib/jquery/ui/jQueryUICoreDependencies.json
    M src/lib/json/jsonDependencies.json
    M src/lib/swfobject/swfobjectDependencies.json
    M src/lib/swfupload/swfuploadDependencies.json

  Log Message:
  -----------
  FLUID-5120: Corrected renderer dependencies.

Had missed updating the renderer dependencies file. Also formatted all the dependencies files to be structured the same.


  Commit: 9d256b1577d2cfd9a9d44ac1e4883552d4a57c9a
      https://github.com/fluid-project/infusion/commit/9d256b1577d2cfd9a9d44ac1e4883552d4a57c9a
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-11 (Tue, 11 Feb 2014)

  Changed paths:
    M src/tests/framework-tests/preferences/js/BuilderTests.js

  Log Message:
  -----------
  FLUID-5120: Fixed a bug in BuilderTests

The builder tests had been passing by chance because the file containing the implementation for the default prefsEditor type wasn't included. When this was included, the test would break as it wasn't setup to run the SeparatedPanelPrefsEditor. This was resolved by explicitly using the Full No Preview editor, and correcting the template paths.


  Commit: bdf1d6ccb816d800f2273b3f0291b92644b1454c
      https://github.com/fluid-project/infusion/commit/bdf1d6ccb816d800f2273b3f0291b92644b1454c
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-11 (Tue, 11 Feb 2014)

  Changed paths:
    M src/framework/core/js/Fluid.js

  Log Message:
  -----------
  FLUID-5120: Fixed regexp escaping bug

The escaping issue was causing the minified build to fail when trying to execute the regexp.


  Commit: a37ded40b17554328e6935c8f66b26db1cb7fab6
      https://github.com/fluid-project/infusion/commit/a37ded40b17554328e6935c8f66b26db1cb7fab6
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-11 (Tue, 11 Feb 2014)

  Changed paths:
    R src/tests/3rd-party-tests/jscssp/html/jscsspTests.html
    R src/tests/3rd-party-tests/jscssp/js/jscsspTests.js

  Log Message:
  -----------
  FLUID-5120: removed 3rd party tests

The 3rd party tests were only for jscssp which is no longer in the repo.


  Commit: 0373bf68871a3671dc61d2a1495e26803384c161
      https://github.com/fluid-project/infusion/commit/0373bf68871a3671dc61d2a1495e26803384c161
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-11 (Tue, 11 Feb 2014)

  Changed paths:
    M src/tests/component-tests/reorderer/html/GeometricManager-test.html
    M src/tests/component-tests/reorderer/html/LayoutReorderer-test.html
    M src/tests/component-tests/reorderer/html/NestedReorderer-test.html
    M src/tests/component-tests/reorderer/html/ReorderList-test.html
    M src/tests/framework-tests/core/html/keyboard-a11y-test.html

  Log Message:
  -----------
  FLUID-5120: Removed unused includes

Removed unused inclusions into the test files. These made the tests look like they were throwing errors.


  Commit: b33b1eb131677b9b3c854c3abd1b90d2c7bec2a2
      https://github.com/fluid-project/infusion/commit/b33b1eb131677b9b3c854c3abd1b90d2c7bec2a2
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-11 (Tue, 11 Feb 2014)

  Changed paths:
    M src/components/pager/js/Pager.js
    M src/framework/core/js/ModelTransformation.js
    M src/framework/core/js/ModelTransformationTransforms.js
    M src/tests/component-tests/pager/html/PagedTable-test.html
    M src/tests/component-tests/pager/js/PagedTableTests.js
    M src/tests/component-tests/tooltip/js/TooltipTests.js
    M src/tests/test-core/jqUnit/js/jqUnit-browser.js

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


  Commit: fd64d1c83ffcebd6d1a208478d500647bb94eff3
      https://github.com/fluid-project/infusion/commit/fd64d1c83ffcebd6d1a208478d500647bb94eff3
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2014-02-11 (Tue, 11 Feb 2014)

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

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


  Commit: ab2c0bf8cf0e4d22e7cd6979eaad132fb54b3fbb
      https://github.com/fluid-project/infusion/commit/ab2c0bf8cf0e4d22e7cd6979eaad132fb54b3fbb
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2014-02-11 (Tue, 11 Feb 2014)

  Changed paths:
    M .gitignore
    A Gruntfile.js
    A README.md
    R README.txt
    R build-scripts/build-README.txt
    R build-scripts/build-core.js
    R build-scripts/build.properties
    R build-scripts/build.xml
    R build-scripts/buildutils.xml
    R build-scripts/dependency.js
    R build-scripts/importantInjection.json
    R build-scripts/lib/jscssp/LICENSE.txt
    R build-scripts/lib/jscssp/js/jscssp.js
    R build-scripts/lib/jslint4java-1.1+rhino.jar
    R build-scripts/lib/rhino/LICENSE.txt
    R build-scripts/lib/rhino/bsf.jar
    R build-scripts/lib/rhino/commons-logging-1.1.1.jar
    R build-scripts/lib/rhino/js.jar
    R build-scripts/lib/yuicompressor-2.3.3.jar
    R build-scripts/prefsFramework/js/BrowserStylesheetHandler.js
    R build-scripts/prefsFramework/js/CSSGenerator.js
    R build-scripts/prefsFramework/js/RhinoStylesheetHandler.js
    R build-scripts/prefsFramework/js/StylesheetImportant.js
    M package.json
    M src/components/inlineEdit/inlineEditDependencies.json
    M src/components/pager/pagerDependencies.json
    M src/components/progress/progressDependencies.json
    M src/components/reorderer/reordererDependencies.json
    M src/components/slidingPanel/slidingPanelDependencies.json
    M src/components/tableOfContents/tableOfContentsDependencies.json
    M src/components/tabs/tabsDependencies.json
    M src/components/textfieldSlider/textfieldSliderDependencies.json
    M src/components/tooltip/tooltipDependencies.json
    M src/components/uiOptions/uiOptionsDependencies.json
    M src/components/undo/undoDependencies.json
    M src/components/uploader/uploaderDependencies.json
    M src/framework/core/frameworkDependencies.json
    M src/framework/core/js/Fluid.js
    M src/framework/enhancement/enhancementDependencies.json
    M src/framework/fss/fssDependencies.json
    A src/framework/preferences/css/fss/README.md
    A src/framework/preferences/css/fss/fss-text-prefsEditor.css
    A src/framework/preferences/css/fss/fss-theme-bw-prefsEditor.css
    A src/framework/preferences/css/fss/fss-theme-by-prefsEditor.css
    A src/framework/preferences/css/fss/fss-theme-coal-prefsEditor.css
    A src/framework/preferences/css/fss/fss-theme-dglg-prefsEditor.css
    A src/framework/preferences/css/fss/fss-theme-lgdg-prefsEditor.css
    A src/framework/preferences/css/fss/fss-theme-mist-prefsEditor.css
    A src/framework/preferences/css/fss/fss-theme-rust-prefsEditor.css
    A src/framework/preferences/css/fss/fss-theme-slate-prefsEditor.css
    A src/framework/preferences/css/fss/fss-theme-wb-prefsEditor.css
    A src/framework/preferences/css/fss/fss-theme-yb-prefsEditor.css
    M src/framework/preferences/preferencesDependencies.json
    M src/framework/renderer/rendererDependencies.json
    M src/lib/fastXmlPull/fastXmlPullDependencies.json
    M src/lib/jquery/core/jQueryDependencies.json
    M src/lib/jquery/plugins/scrollTo/jQueryScrollToPluginDependencies.json
    M src/lib/jquery/plugins/touchPunch/jQueryTouchPunchPluginDependencies.json
    M src/lib/jquery/ui/jQueryUICoreDependencies.json
    M src/lib/jquery/ui/jQueryUIWidgetsDependencies.json
    M src/lib/json/jsonDependencies.json
    M src/lib/swfobject/swfobjectDependencies.json
    M src/lib/swfupload/swfuploadDependencies.json
    R src/tests/3rd-party-tests/jscssp/html/jscsspTests.html
    R src/tests/3rd-party-tests/jscssp/js/jscsspTests.js
    M src/tests/all-tests.html
    M src/tests/component-tests/reorderer/html/GeometricManager-test.html
    M src/tests/component-tests/reorderer/html/LayoutReorderer-test.html
    M src/tests/component-tests/reorderer/html/NestedReorderer-test.html
    M src/tests/component-tests/reorderer/html/ReorderList-test.html
    M src/tests/framework-tests/core/html/keyboard-a11y-test.html
    M src/tests/framework-tests/preferences/all-tests.html
    R src/tests/framework-tests/preferences/html/CSSGenerator-test.html
    M src/tests/framework-tests/preferences/js/BuilderTests.js
    R src/tests/framework-tests/preferences/js/CSSGeneratorTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'jobara/FLUID-5120'

* jobara/FLUID-5120:
  FLUID-5120: Removed unused includes
  FLUID-5120: removed 3rd party tests
  FLUID-5120: Fixed regexp escaping bug
  FLUID-5120: Fixed a bug in BuilderTests
  FLUID-5120: Corrected renderer dependencies.
  FLUID-5120: removed old CSSGenrator test.
  FLUID-5120: Updated modulefiles plugin
  FLUID-5120: Renamed the builds
  FLUID-5120: Edit the README
  FLUID-5120: Added comments
  FLUID-5120: removed commented out task
  FLUID-5120: Simplified all target for uglify.
  FLUID-5120: Updated README for prefs css files
  FLUID-5120: removed scripts from package.json
  FLUID-5120: removed console logs
  FLUID-5120: Removed old ant based build scripts
  FLUID-5120: Updated README
  FLUID-5120: formatting changes to README
  FLUID-5120: Updated README
  FLUID-5120: using " instead of '
  FLUID-5120: grunt builds available
  FLUID-5120: start of custom build
  FLUID-5120: Updated modulefiles plugin
  FLUID-5120: Updated modulefiles plugin
  FLUID-5120: Upgrading grunt-modulefiles plugin
  FLUID-5120: Using modulefiles plugin
  FLUID-5120: Added grunt-modulefiles plugin
  FLUID-5120: Committing Generated stylesheets
  FLUID-5120: implemented packaging of infusion.
  FLUID-5120: Added the concatenation of javascript files.
  FLUID-5100: grunt minify of src js
  FLUID-5100: started the grunt configuration.


Compare: https://github.com/fluid-project/infusion/compare/3dc558430926...ab2c0bf8cf0e


More information about the Commits mailing list