[Commits] [fluid-project/infusion] ff4bf1: FLUID-5289: Move all demos (except FSS) up a level...

GitHub noreply at github.com
Mon Apr 21 10:20:56 EDT 2014


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: ff4bf19ca0312948e3c71897ca33bf290e7a211c
      https://github.com/fluid-project/infusion/commit/ff4bf19ca0312948e3c71897ca33bf290e7a211c
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2014-04-07 (Mon, 07 Apr 2014)

  Changed paths:
    R src/demos/index.html
    R src/demos/inlineEdit/rich/demo.html
    R src/demos/inlineEdit/rich/html/inlineEdit.html
    A src/demos/inlineEdit/rich/index.html
    R src/demos/inlineEdit/simple/demo.html
    R src/demos/inlineEdit/simple/html/inlineEdit.html
    A src/demos/inlineEdit/simple/index.html
    R src/demos/keyboard-a11y/demo.html
    R src/demos/keyboard-a11y/html/keyboard.html
    A src/demos/keyboard-a11y/index.html
    M src/demos/keyboard-a11y/js/five-star.js
    R src/demos/pager/demo.html
    R src/demos/pager/html/pager.html
    A src/demos/pager/index.html
    M src/demos/pager/js/pagerDemo.js
    R src/demos/progress/demo.html
    R src/demos/progress/html/progress.html
    A src/demos/progress/index.html
    R src/demos/renderer/demo.html
    R src/demos/renderer/html/renderer.html
    A src/demos/renderer/index.html
    R src/demos/reorderer/gridReorderer/demo.html
    R src/demos/reorderer/gridReorderer/html/gridReorderer.html
    A src/demos/reorderer/gridReorderer/index.html
    R src/demos/reorderer/imageReorderer/demo.html
    R src/demos/reorderer/imageReorderer/html/imageReorderer.html
    A src/demos/reorderer/imageReorderer/index.html
    R src/demos/reorderer/layoutReorderer/demo.html
    R src/demos/reorderer/layoutReorderer/html/layoutReorderer.html
    A src/demos/reorderer/layoutReorderer/index.html
    R src/demos/reorderer/listReorderer/demo.html
    R src/demos/reorderer/listReorderer/html/listReorderer.html
    A src/demos/reorderer/listReorderer/index.html
    R src/demos/uiOptions/demo.html
    R src/demos/uiOptions/html/uiOptions.html
    A src/demos/uiOptions/index.html
    R src/demos/uploader/demo.html
    R src/demos/uploader/html/uploader.html
    A src/demos/uploader/index.html
    M src/demos/uploader/js/uploaderDemo.js
    M src/framework/preferences/js/StarterSchemas.js

  Log Message:
  -----------
  FLUID-5289: Move all demos (except FSS) up a level, freed from the portal.


  Commit: fcec19f6835eafc58a619882e9b33b8b3143fb39
      https://github.com/fluid-project/infusion/commit/fcec19f6835eafc58a619882e9b33b8b3143fb39
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    R src/demos/fss/base/demo.html
    R src/demos/fss/base/html/base.html
    R src/demos/fss/base/html/withBase.html
    R src/demos/fss/base/html/withoutBase.html
    A src/demos/fss/base/index.html
    A src/demos/fss/base/withBase.html
    A src/demos/fss/base/withoutBase.html
    R src/demos/fss/clearfix/demo.html
    R src/demos/fss/clearfix/html/clearfix.html
    A src/demos/fss/clearfix/index.html
    R src/demos/fss/contextual/demo.html
    R src/demos/fss/contextual/html/context.html
    A src/demos/fss/contextual/index.html
    R src/demos/fss/layout/demo.html
    R src/demos/fss/layout/html/layout.html
    A src/demos/fss/layout/index.html
    R src/demos/fss/linearize/demo.html
    R src/demos/fss/linearize/html/linearize.html
    A src/demos/fss/linearize/index.html
    A src/demos/fss/mobile/buttons/basic.html
    A src/demos/fss/mobile/content/basic.html
    R src/demos/fss/mobile/demo.html
    R src/demos/fss/mobile/html/buttons/basic.html
    R src/demos/fss/mobile/html/content/basic.html
    R src/demos/fss/mobile/html/mobile.html
    R src/demos/fss/mobile/html/nav/basic.html
    R src/demos/fss/mobile/html/nav/icon.html
    R src/demos/fss/mobile/html/nav/thumb.html
    R src/demos/fss/mobile/html/tabs/basic.html
    A src/demos/fss/mobile/index.html
    A src/demos/fss/mobile/nav/basic.html
    A src/demos/fss/mobile/nav/icon.html
    A src/demos/fss/mobile/nav/thumb.html
    A src/demos/fss/mobile/tabs/basic.html
    R src/demos/fss/reset/demo.html
    R src/demos/fss/reset/html/reset.html
    R src/demos/fss/reset/html/withReset.html
    R src/demos/fss/reset/html/withoutReset.html
    A src/demos/fss/reset/index.html
    A src/demos/fss/reset/withReset.html
    A src/demos/fss/reset/withoutReset.html
    R src/demos/fss/text/demo.html
    R src/demos/fss/text/html/text.html
    A src/demos/fss/text/index.html
    R src/demos/fss/themes/demo.html
    R src/demos/fss/themes/html/themes.html
    A src/demos/fss/themes/index.html

  Log Message:
  -----------
  FLUID-5298: Cleaning up the FSS demos


  Commit: 3a5a55ac1ea4d52e6b8ea24e5829ba3609f2ac3b
      https://github.com/fluid-project/infusion/commit/3a5a55ac1ea4d52e6b8ea24e5829ba3609f2ac3b
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    R src/demos/portal/css/ajaxError.css
    R src/demos/portal/css/demo.css
    R src/demos/portal/css/portal.css
    R src/demos/portal/html/sameOriginPolicyWarning.html
    R src/demos/portal/images/comingSoon.png
    R src/demos/portal/images/fss.png
    R src/demos/portal/images/inlineEdit-dropdown.png
    R src/demos/portal/images/inlineEdit-rich.png
    R src/demos/portal/images/inlineEdit-simple.png
    R src/demos/portal/images/pager.png
    R src/demos/portal/images/progress.png
    R src/demos/portal/images/renderer.png
    R src/demos/portal/images/reorderer-grid.png
    R src/demos/portal/images/reorderer-image.png
    R src/demos/portal/images/reorderer-layout.png
    R src/demos/portal/images/reorderer-list.png
    R src/demos/portal/images/uiOptions.png
    R src/demos/portal/images/uploader.png
    R src/demos/portal/js/demoAssets.js

  Log Message:
  -----------
  FLUID-5289: Removing the now-unused portal code


  Commit: b94e4b71e0668e3d5ffd41dac79f8df3ad3429c8
      https://github.com/fluid-project/infusion/commit/b94e4b71e0668e3d5ffd41dac79f8df3ad3429c8
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2014-04-11 (Fri, 11 Apr 2014)

  Changed paths:
    M src/framework/core/js/Fluid.js
    M src/framework/preferences/css/ie8.css
    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

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into FLUID-5289


  Commit: c356c87362af883045d70b476634c2d96ab5de0b
      https://github.com/fluid-project/infusion/commit/c356c87362af883045d70b476634c2d96ab5de0b
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2014-04-11 (Fri, 11 Apr 2014)

  Changed paths:
    M README.md
    A src/components/overviewPanel/css/OverviewPanel.css
    A src/components/overviewPanel/fonts/fluid-star.eot
    A src/components/overviewPanel/fonts/fluid-star.ttf
    A src/components/overviewPanel/fonts/icons.eot
    A src/components/overviewPanel/fonts/icons.ttf
    A src/components/overviewPanel/html/overviewPanel.html
    A src/components/overviewPanel/html/overviewPanelTemplate.html
    A src/components/overviewPanel/js/OverviewPanel.js
    A src/components/overviewPanel/overviewPanelDependencies.json
    A src/tests/component-tests/overviewPanel/html/OverviewPanel-test.html
    A src/tests/component-tests/overviewPanel/js/OverviewPanelTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'simon/FLUID-5276' into FLUID-5289


  Commit: 5961abca8729c038afc293655c09e5be3a933b83
      https://github.com/fluid-project/infusion/commit/5961abca8729c038afc293655c09e5be3a933b83
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    M src/demos/fss/base/index.html
    A src/demos/fss/base/messages/messages.json
    M src/demos/fss/clearfix/index.html
    A src/demos/fss/clearfix/messages/messages.json
    M src/demos/fss/contextual/index.html
    A src/demos/fss/contextual/messages/messages.json
    M src/demos/fss/layout/index.html
    A src/demos/fss/layout/messages/messages.json
    M src/demos/fss/linearize/index.html
    A src/demos/fss/linearize/messages/messages.json
    M src/demos/fss/mobile/index.html
    A src/demos/fss/mobile/messages/messages.json
    M src/demos/fss/reset/index.html
    A src/demos/fss/reset/messages/messages.json
    M src/demos/fss/text/index.html
    A src/demos/fss/text/messages/messages.json
    M src/demos/fss/themes/index.html
    A src/demos/fss/themes/messages/messages.json
    M src/demos/inlineEdit/rich/index.html
    A src/demos/inlineEdit/rich/messages/messages.json
    M src/demos/inlineEdit/simple/index.html
    M src/demos/inlineEdit/simple/js/inlineEditDemo.js
    A src/demos/inlineEdit/simple/messages/messages.json
    M src/demos/keyboard-a11y/index.html
    A src/demos/keyboard-a11y/messages/messages.json
    R src/demos/lib/chili/chili-LICENSE.txt
    R src/demos/lib/chili/cplusplus.js
    R src/demos/lib/chili/csharp.js
    R src/demos/lib/chili/css.js
    R src/demos/lib/chili/delphi.js
    R src/demos/lib/chili/html.js
    R src/demos/lib/chili/java.js
    R src/demos/lib/chili/jquery.chili-2.2.js
    R src/demos/lib/chili/js.js
    R src/demos/lib/chili/lotusscript.js
    R src/demos/lib/chili/mysql.js
    R src/demos/lib/chili/php-f.js
    R src/demos/lib/chili/php.js
    R src/demos/lib/chili/recipes.js
    R src/demos/lib/chili/start-here.html
    M src/demos/pager/index.html
    A src/demos/pager/messages/messages.json
    M src/demos/progress/index.html
    M src/demos/progress/js/progressDemo.js
    A src/demos/progress/messages/messages.json
    M src/demos/renderer/index.html
    A src/demos/renderer/messages/messages.json
    M src/demos/reorderer/gridReorderer/index.html
    A src/demos/reorderer/gridReorderer/messages/messages.json
    M src/demos/reorderer/imageReorderer/index.html
    A src/demos/reorderer/imageReorderer/messages/messages.json
    M src/demos/reorderer/layoutReorderer/index.html
    A src/demos/reorderer/layoutReorderer/messages/messages.json
    M src/demos/reorderer/listReorderer/index.html
    A src/demos/reorderer/listReorderer/messages/messages.json
    A src/demos/shared/js/overviewWrapper.js
    M src/demos/uiOptions/index.html
    A src/demos/uiOptions/messages/messages.json
    A src/demos/uploader/css/uploader.css
    M src/demos/uploader/index.html
    A src/demos/uploader/messages/messages.json

  Log Message:
  -----------
  FLUID-5289: Add basic overlay panel to the demos. Still need proper text


  Commit: a187a518b42a6a232f3002bb8a003c4e18e8e67a
      https://github.com/fluid-project/infusion/commit/a187a518b42a6a232f3002bb8a003c4e18e8e67a
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    A .jshintignore
    A .jshintrc
    M Gruntfile.js
    M package.json
    M src/components/inlineEdit/js/InlineEdit.js
    M src/components/inlineEdit/js/InlineEditIntegrations.js
    M src/components/pager/js/PagedTable.js
    M src/components/pager/js/Pager.js
    M src/components/pager/js/Table.js
    M src/components/progress/js/Progress.js
    M src/components/reorderer/js/GeometricManager.js
    M src/components/reorderer/js/ImageReorderer.js
    M src/components/reorderer/js/LayoutReorderer.js
    M src/components/reorderer/js/ModuleLayout.js
    M src/components/reorderer/js/Reorderer.js
    M src/components/reorderer/js/ReordererDOMUtilities.js
    M src/components/slidingPanel/js/SlidingPanel.js
    M src/components/tableOfContents/js/TableOfContents.js
    M src/components/tabs/js/Tabs.js
    M src/components/textfieldSlider/js/TextfieldSlider.js
    M src/components/tooltip/js/Tooltip.js
    M src/components/uiOptions/js/UIOptions.js
    M src/components/undo/js/Undo.js
    M src/components/uploader/js/DemoUploadManager.js
    M src/components/uploader/js/ErrorPanel.js
    M src/components/uploader/js/FileQueue.js
    M src/components/uploader/js/FileQueueView.js
    M src/components/uploader/js/Flash9UploaderSupport.js
    M src/components/uploader/js/FlashUploaderSupport.js
    M src/components/uploader/js/HTML5UploaderSupport.js
    M src/components/uploader/js/MimeTypeExtensions.js
    M src/components/uploader/js/Uploader.js
    M src/components/uploader/js/UploaderCompatibility-Infusion1.2.js
    M src/components/uploader/js/UploaderCompatibility-Infusion1.3.js
    M src/demos/fss/clearfix/js/clearfixDemo.js
    M src/demos/fss/linearize/js/linearizeDemo.js
    M src/demos/fss/mobile/buttons/basic.html
    M src/demos/fss/mobile/content/basic.html
    M src/demos/fss/mobile/index.html
    M src/demos/fss/mobile/js/mobileDemo.js
    M src/demos/fss/mobile/nav/basic.html
    M src/demos/fss/mobile/nav/icon.html
    M src/demos/fss/mobile/nav/thumb.html
    M src/demos/fss/mobile/tabs/basic.html
    M src/demos/inlineEdit/rich/js/inlineEditDemo.js
    M src/demos/inlineEdit/simple/js/inlineEditDemo.js
    M src/demos/keyboard-a11y/js/five-star.js
    M src/demos/keyboard-a11y/js/keyboardDemo.js
    M src/demos/pager/js/pagerDemo.js
    M src/demos/progress/index.html
    M src/demos/progress/js/progressDemo.js
    M src/demos/renderer/js/rendererDemo.js
    M src/demos/reorderer/gridReorderer/js/gridReordererDemo.js
    M src/demos/reorderer/imageReorderer/js/imageReordererDemo.js
    M src/demos/reorderer/layoutReorderer/js/layoutReordererDemo.js
    M src/demos/reorderer/listReorderer/js/listReordererDemo.js
    M src/demos/uploader/js/uploaderDemo.js
    M src/framework/core/js/DataBinding.js
    M src/framework/core/js/Fluid.js
    M src/framework/core/js/FluidDOMUtilities.js
    M src/framework/core/js/FluidDebugging.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
    M src/framework/core/js/JavaProperties.js
    M src/framework/core/js/ModelTransformation.js
    M src/framework/core/js/ModelTransformationTransforms.js
    M src/framework/core/js/jquery.keyboard-a11y.js
    M src/framework/core/js/jquery.standalone.js
    M src/framework/enhancement/js/ProgressiveEnhancement.js
    M src/framework/preferences/js/AuxBuilder.js
    M src/framework/preferences/js/Builder.js
    M src/framework/preferences/js/Enactors.js
    M src/framework/preferences/js/FullNoPreviewPrefsEditor.js
    M src/framework/preferences/js/FullPreviewPrefsEditor.js
    M src/framework/preferences/js/ModelRelay.js
    M src/framework/preferences/js/Panels.js
    M src/framework/preferences/js/PrefsEditor.js
    M src/framework/preferences/js/PrimaryBuilder.js
    M src/framework/preferences/js/SeparatedPanelPrefsEditor.js
    M src/framework/preferences/js/StarterGrades.js
    M src/framework/preferences/js/StarterSchemas.js
    M src/framework/preferences/js/Store.js
    M src/framework/preferences/js/UIEnhancer.js
    M src/framework/preferences/js/URLUtilities.js
    M src/framework/renderer/js/RendererUtilities.js
    M src/framework/renderer/js/fluidParser.js
    M src/framework/renderer/js/fluidRenderer.js
    M src/instructionalDemos/framework/preferences/conditionalAdjusters1/js/auxiliarySchema.js
    M src/instructionalDemos/framework/preferences/conditionalAdjusters1/js/conditional.js
    M src/instructionalDemos/framework/preferences/conditionalAdjusters1/js/panels.js
    M src/instructionalDemos/framework/preferences/conditionalAdjusters2/js/auxiliarySchema.js
    M src/instructionalDemos/framework/preferences/conditionalAdjusters2/js/conditional.js
    M src/instructionalDemos/framework/preferences/conditionalAdjusters2/js/panels.js
    M src/instructionalDemos/framework/preferences/shared/js/enactors.js
    M src/instructionalDemos/framework/preferences/shared/js/panels.js
    M src/instructionalDemos/framework/preferences/shared/js/primarySchema.js
    M src/instructionalDemos/framework/preferences/shared/js/utilities.js
    M src/integration-demos/sakai/js/site_setting_members.js
    M src/lib/fastXmlPull/js/fastXmlPull.js
    M src/module/fluid.js
    M src/standalone-demos/pager/html/pager.html
    M src/standalone-demos/pager/js/pager-example.js
    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/standalone-demos/renderer/js/data-bound-menu.js
    M src/standalone-demos/renderer/js/id-based-inventory.js
    M src/standalone-demos/renderer/js/programmatic-tree-menu.js
    M src/standalone-demos/renderer/js/selector-based-inventory.js
    M src/standalone-demos/reorderer/html/table-tr.html
    R src/standalone-demos/reorderer/js/improved-form-image-reorderer.js
    R src/standalone-demos/reorderer/js/todo-list.js
    M src/standalone-demos/table-of-contents/js/table-of-contents-example.js
    M src/tests/component-tests/inlineEdit/js/InlineEditTests.js
    M src/tests/component-tests/pager/js/PagedTableTests.js
    M src/tests/component-tests/pager/js/PagerTests.js
    M src/tests/component-tests/progress/js/ProgressTests.js
    M src/tests/component-tests/reorderer/html/ImageReorderer-test.html
    M src/tests/component-tests/reorderer/js/AriaLabellerTests.js
    M src/tests/component-tests/reorderer/js/GeometricManagerTests.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/reorderer/js/ModuleLayoutTestConstants.js
    M src/tests/component-tests/reorderer/js/ModuleLayoutTests.js
    M 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/reorderer/js/Scheduler.js
    M src/tests/component-tests/reorderer/js/SchedulerTests.js
    M src/tests/component-tests/slidingPanel/js/SlidingPanelTests.js
    M src/tests/component-tests/tableOfContents/js/TableOfContentsTests.js
    M src/tests/component-tests/tabs/js/TabsTests.js
    M src/tests/component-tests/textfieldSlider/js/TextfieldSliderTests.js
    M src/tests/component-tests/tooltip/js/TooltipTests.js
    M src/tests/component-tests/uploader/html/UploaderCompatibility-test.html
    M src/tests/component-tests/uploader/js/DemoUploadManagerTests.js
    M src/tests/component-tests/uploader/js/ErrorPanelTests.js
    M src/tests/component-tests/uploader/js/FileQueueTests.js
    M src/tests/component-tests/uploader/js/FileQueueViewTests.js
    M src/tests/component-tests/uploader/js/HTML5UploaderSupportTests.js
    M src/tests/component-tests/uploader/js/SWFUploadManagerTests.js
    M src/tests/component-tests/uploader/js/UploaderCompatibilityTests.js
    M src/tests/component-tests/uploader/js/UploaderTestUtilities.js
    M src/tests/component-tests/uploader/js/UploaderTests.js

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

Conflicts:
	src/demos/fss/mobile/buttons/basic.html
	src/demos/fss/mobile/content/basic.html
	src/demos/fss/mobile/index.html
	src/demos/fss/mobile/nav/basic.html
	src/demos/fss/mobile/nav/icon.html
	src/demos/fss/mobile/nav/thumb.html
	src/demos/fss/mobile/tabs/basic.html
	src/demos/portal/js/demoAssets.js
	src/demos/progress/index.html
	src/demos/uploader/js/uploaderDemo.js


  Commit: 4b5fe603feece1e0feaf38d1d9c3189b62b5fe8b
      https://github.com/fluid-project/infusion/commit/4b5fe603feece1e0feaf38d1d9c3189b62b5fe8b
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    M src/demos/fss/mobile/buttons/basic.html
    M src/demos/fss/mobile/nav/icon.html
    M src/demos/fss/mobile/nav/thumb.html
    M src/demos/fss/mobile/tabs/basic.html

  Log Message:
  -----------
  FLUID-5289: Fixes to mobile demo files


  Commit: 9ba7a67326226ce5be9f7c4dc908fd92ff045b9a
      https://github.com/fluid-project/infusion/commit/9ba7a67326226ce5be9f7c4dc908fd92ff045b9a
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    M src/demos/inlineEdit/rich/messages/messages.json
    M src/demos/inlineEdit/simple/messages/messages.json
    M src/demos/keyboard-a11y/messages/messages.json
    M src/demos/pager/messages/messages.json
    M src/demos/progress/index.html
    M src/demos/progress/messages/messages.json
    M src/demos/renderer/messages/messages.json
    M src/demos/reorderer/gridReorderer/messages/messages.json
    M src/demos/reorderer/imageReorderer/messages/messages.json
    M src/demos/reorderer/layoutReorderer/messages/messages.json
    M src/demos/reorderer/listReorderer/messages/messages.json

  Log Message:
  -----------
  FLUID-5289: First pass at text for the demo overview panels


  Commit: fd41bdd5703b4d80aebf753c8b8fcd0fef035c7a
      https://github.com/fluid-project/infusion/commit/fd41bdd5703b4d80aebf753c8b8fcd0fef035c7a
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    M src/components/overviewPanel/css/OverviewPanel.css
    M src/demos/inlineEdit/rich/messages/messages.json
    M src/demos/inlineEdit/simple/messages/messages.json
    M src/demos/keyboard-a11y/messages/messages.json
    M src/demos/pager/messages/messages.json
    M src/demos/progress/messages/messages.json
    M src/demos/renderer/messages/messages.json
    M src/demos/reorderer/gridReorderer/messages/messages.json
    M src/demos/reorderer/layoutReorderer/messages/messages.json
    A src/demos/shared/html/overviewPanelTemplate-noDesign.html

  Log Message:
  -----------
  FLUID_5289: Test links in panels, remove Design link where there is no design; Fix overlay component CSS to ensure overlay is actually on top of everything.


  Commit: 4ec51c58bfcbccfe7417410143d1af593f21f460
      https://github.com/fluid-project/infusion/commit/4ec51c58bfcbccfe7417410143d1af593f21f460
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2014-04-15 (Tue, 15 Apr 2014)

  Changed paths:
    M src/demos/fss/base/messages/messages.json
    M src/demos/fss/clearfix/css/clearfix.css
    M src/demos/fss/clearfix/messages/messages.json
    M src/demos/fss/contextual/css/context.css
    M src/demos/fss/contextual/index.html
    M src/demos/fss/contextual/messages/messages.json
    M src/demos/fss/layout/messages/messages.json
    M src/demos/fss/linearize/messages/messages.json
    M src/demos/fss/mobile/buttons/basic.html
    M src/demos/fss/mobile/content/basic.html
    M src/demos/fss/mobile/index.html
    M src/demos/fss/mobile/js/mobileDemo.js
    M src/demos/fss/mobile/messages/messages.json
    M src/demos/fss/mobile/nav/basic.html
    M src/demos/fss/mobile/nav/icon.html
    M src/demos/fss/mobile/nav/thumb.html
    M src/demos/fss/mobile/tabs/basic.html
    M src/demos/fss/reset/messages/messages.json
    M src/demos/fss/text/messages/messages.json
    M src/demos/fss/themes/messages/messages.json

  Log Message:
  -----------
  FLUID-5289: Update the FSS overlay panel texts.


  Commit: 1747008eb5aba78678b9c6bbe1e4da4078c5eff8
      https://github.com/fluid-project/infusion/commit/1747008eb5aba78678b9c6bbe1e4da4078c5eff8
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2014-04-15 (Tue, 15 Apr 2014)

  Changed paths:
    A src/demos/fss/base/messages/config.json
    R src/demos/fss/base/messages/messages.json
    A src/demos/fss/clearfix/messages/config.json
    R src/demos/fss/clearfix/messages/messages.json
    A src/demos/fss/contextual/messages/config.json
    R src/demos/fss/contextual/messages/messages.json
    A src/demos/fss/layout/messages/config.json
    R src/demos/fss/layout/messages/messages.json
    A src/demos/fss/linearize/messages/config.json
    R src/demos/fss/linearize/messages/messages.json
    A src/demos/fss/mobile/messages/config.json
    R src/demos/fss/mobile/messages/messages.json
    A src/demos/fss/reset/messages/config.json
    R src/demos/fss/reset/messages/messages.json
    A src/demos/fss/text/messages/config.json
    R src/demos/fss/text/messages/messages.json
    A src/demos/fss/themes/messages/config.json
    R src/demos/fss/themes/messages/messages.json
    A src/demos/inlineEdit/rich/messages/config.json
    R src/demos/inlineEdit/rich/messages/messages.json
    A src/demos/inlineEdit/simple/messages/config.json
    R src/demos/inlineEdit/simple/messages/messages.json
    A src/demos/keyboard-a11y/messages/config.json
    R src/demos/keyboard-a11y/messages/messages.json
    A src/demos/pager/messages/config.json
    R src/demos/pager/messages/messages.json
    A src/demos/progress/messages/config.json
    R src/demos/progress/messages/messages.json
    A src/demos/renderer/messages/config.json
    R src/demos/renderer/messages/messages.json
    A src/demos/reorderer/gridReorderer/messages/config.json
    R src/demos/reorderer/gridReorderer/messages/messages.json
    A src/demos/reorderer/imageReorderer/messages/config.json
    R src/demos/reorderer/imageReorderer/messages/messages.json
    A src/demos/reorderer/layoutReorderer/messages/config.json
    R src/demos/reorderer/layoutReorderer/messages/messages.json
    A src/demos/reorderer/listReorderer/messages/config.json
    R src/demos/reorderer/listReorderer/messages/messages.json
    M src/demos/shared/js/overviewWrapper.js
    A src/demos/uiOptions/messages/config.json
    R src/demos/uiOptions/messages/messages.json
    A src/demos/uploader/messages/config.json
    R src/demos/uploader/messages/messages.json

  Log Message:
  -----------
  FLUID-5289: Rename demo JSON files to config.json


  Commit: 3c4562778be2a74af264ae7f26218263c46377b0
      https://github.com/fluid-project/infusion/commit/3c4562778be2a74af264ae7f26218263c46377b0
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2014-04-15 (Tue, 15 Apr 2014)

  Changed paths:
    A src/demos/fss/base/json/config.json
    R src/demos/fss/base/messages/config.json
    A src/demos/fss/clearfix/json/config.json
    R src/demos/fss/clearfix/messages/config.json
    A src/demos/fss/contextual/json/config.json
    R src/demos/fss/contextual/messages/config.json
    A src/demos/fss/layout/json/config.json
    R src/demos/fss/layout/messages/config.json
    A src/demos/fss/linearize/json/config.json
    R src/demos/fss/linearize/messages/config.json
    A src/demos/fss/mobile/json/config.json
    R src/demos/fss/mobile/messages/config.json
    A src/demos/fss/reset/json/config.json
    R src/demos/fss/reset/messages/config.json
    A src/demos/fss/text/json/config.json
    R src/demos/fss/text/messages/config.json
    A src/demos/fss/themes/json/config.json
    R src/demos/fss/themes/messages/config.json
    A src/demos/inlineEdit/rich/json/config.json
    R src/demos/inlineEdit/rich/messages/config.json
    A src/demos/inlineEdit/simple/json/config.json
    R src/demos/inlineEdit/simple/messages/config.json
    A src/demos/keyboard-a11y/json/config.json
    R src/demos/keyboard-a11y/messages/config.json
    A src/demos/pager/json/config.json
    R src/demos/pager/messages/config.json
    A src/demos/progress/json/config.json
    R src/demos/progress/messages/config.json
    A src/demos/renderer/json/config.json
    R src/demos/renderer/messages/config.json
    A src/demos/reorderer/gridReorderer/json/config.json
    R src/demos/reorderer/gridReorderer/messages/config.json
    A src/demos/reorderer/imageReorderer/json/config.json
    R src/demos/reorderer/imageReorderer/messages/config.json
    A src/demos/reorderer/layoutReorderer/json/config.json
    R src/demos/reorderer/layoutReorderer/messages/config.json
    A src/demos/reorderer/listReorderer/json/config.json
    R src/demos/reorderer/listReorderer/messages/config.json
    M src/demos/shared/js/overviewWrapper.js
    A src/demos/uiOptions/json/config.json
    R src/demos/uiOptions/messages/config.json
    A src/demos/uploader/json/config.json
    R src/demos/uploader/messages/config.json

  Log Message:
  -----------
  FLUID-5289: Rename folder containing config JSON files to 'json'


  Commit: 5c0f08db587deaad637c70bcb5b5fac072e11dda
      https://github.com/fluid-project/infusion/commit/5c0f08db587deaad637c70bcb5b5fac072e11dda
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2014-04-16 (Wed, 16 Apr 2014)

  Changed paths:
    A src/demos/overviewPanel/index.html

  Log Message:
  -----------
  FLUID-5289: Staring to move Simon's overview panel test file into a proper demo


  Commit: 9c3d91c925b81e5745c394f7b5653e02cb78e92c
      https://github.com/fluid-project/infusion/commit/9c3d91c925b81e5745c394f7b5653e02cb78e92c
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2014-04-16 (Wed, 16 Apr 2014)

  Changed paths:
    M src/tests/component-tests/overviewPanel/js/OverviewPanelTests.js

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


  Commit: 7c51be56d481c26c5f9f8aa712f5baf60547824e
      https://github.com/fluid-project/infusion/commit/7c51be56d481c26c5f9f8aa712f5baf60547824e
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2014-04-16 (Wed, 16 Apr 2014)

  Changed paths:
    M src/demos/fss/mobile/js/mobileDemo.js
    M src/demos/shared/js/overviewWrapper.js

  Log Message:
  -----------
  FLUID-5289: Linting


  Commit: de4a34612004043b5ca34040af84671a2e3717c5
      https://github.com/fluid-project/infusion/commit/de4a34612004043b5ca34040af84671a2e3717c5
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2014-04-16 (Wed, 16 Apr 2014)

  Changed paths:
    R src/components/overviewPanel/html/overviewPanel.html

  Log Message:
  -----------
  FLUID-5289: Remove the overview panel test file; it's been replaced by an actual demo


  Commit: dd5f2528ab22dce6398571e7e0b0ecf2055929ec
      https://github.com/fluid-project/infusion/commit/dd5f2528ab22dce6398571e7e0b0ecf2055929ec
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2014-04-16 (Wed, 16 Apr 2014)

  Changed paths:
    M src/demos/overviewPanel/index.html

  Log Message:
  -----------
  FLUID-5289: Fixed spelling mistake in the overview panel demo


  Commit: d3d774a78bdef489fdb229624996a2f34309ff45
      https://github.com/fluid-project/infusion/commit/d3d774a78bdef489fdb229624996a2f34309ff45
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2014-04-17 (Thu, 17 Apr 2014)

  Changed paths:
    M src/components/overviewPanel/css/OverviewPanel.css
    R src/components/overviewPanel/fonts/fluid-star.eot
    A src/components/overviewPanel/fonts/fluid-star.eot
    A src/components/overviewPanel/fonts/fluid-star.ttf
    R src/components/overviewPanel/fonts/fluid-star.ttf
    A src/components/overviewPanel/fonts/icons.eot
    R src/components/overviewPanel/fonts/icons.eot
    R src/components/overviewPanel/fonts/icons.ttf
    A src/components/overviewPanel/fonts/icons.ttf

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


  Commit: 3094a0773fe3c43be08ea8cbc2ed246de8ac40a9
      https://github.com/fluid-project/infusion/commit/3094a0773fe3c43be08ea8cbc2ed246de8ac40a9
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2014-04-17 (Thu, 17 Apr 2014)

  Changed paths:
    M ReleaseNotes.txt
    M src/components/overviewPanel/js/OverviewPanel.js
    M src/demos/fss/base/json/config.json
    M src/demos/fss/clearfix/json/config.json
    M src/demos/fss/contextual/json/config.json
    M src/demos/fss/layout/json/config.json
    M src/demos/fss/linearize/json/config.json
    M src/demos/fss/mobile/json/config.json
    M src/demos/inlineEdit/rich/json/config.json
    M src/demos/inlineEdit/simple/json/config.json
    M src/demos/keyboard-a11y/json/config.json
    M src/demos/overviewPanel/index.html
    M src/demos/pager/json/config.json
    M src/demos/progress/json/config.json
    M src/demos/renderer/json/config.json
    M src/demos/reorderer/gridReorderer/json/config.json
    M src/demos/reorderer/imageReorderer/json/config.json
    M src/demos/reorderer/layoutReorderer/json/config.json
    M src/demos/reorderer/listReorderer/json/config.json
    M src/demos/uiOptions/json/config.json
    M src/demos/uploader/json/config.json

  Log Message:
  -----------
  FLUID-5289: Move consistent text into component defaults, clean up other small things.


  Commit: b60003afbfd219e6adda04b25e386d42d512ec6d
      https://github.com/fluid-project/infusion/commit/b60003afbfd219e6adda04b25e386d42d512ec6d
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2014-04-19 (Sat, 19 Apr 2014)

  Changed paths:
    M src/demos/inlineEdit/rich/css/InlineEdit.css
    M src/demos/inlineEdit/rich/index.html
    M src/demos/inlineEdit/simple/css/InlineEdit.css
    M src/demos/inlineEdit/simple/index.html
    M src/demos/keyboard-a11y/css/keyboard.css
    M src/demos/overviewPanel/index.html
    M src/demos/pager/json/config.json
    M src/demos/progress/json/config.json
    M src/demos/renderer/index.html
    M src/demos/renderer/js/rendererDemo.js
    M src/demos/renderer/json/config.json
    M src/demos/reorderer/gridReorderer/css/gridReorderer.css
    M src/demos/reorderer/gridReorderer/index.html
    M src/demos/reorderer/gridReorderer/json/config.json
    M src/demos/reorderer/imageReorderer/css/imageReorderer.css
    M src/demos/reorderer/imageReorderer/index.html
    M src/demos/reorderer/layoutReorderer/css/layoutReorderer.css

  Log Message:
  -----------
  FLUID-5289: Fixes to text, styling


  Commit: e2b741777c002d9f80d6ddfafdaf8705a5ffbc83
      https://github.com/fluid-project/infusion/commit/e2b741777c002d9f80d6ddfafdaf8705a5ffbc83
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2014-04-21 (Mon, 21 Apr 2014)

  Changed paths:
    M ReleaseNotes.txt
    M src/components/overviewPanel/css/OverviewPanel.css
    R src/components/overviewPanel/html/overviewPanel.html
    M src/components/overviewPanel/js/OverviewPanel.js
    R src/demos/fss/base/demo.html
    R src/demos/fss/base/html/base.html
    R src/demos/fss/base/html/withBase.html
    R src/demos/fss/base/html/withoutBase.html
    A src/demos/fss/base/index.html
    A src/demos/fss/base/json/config.json
    A src/demos/fss/base/withBase.html
    A src/demos/fss/base/withoutBase.html
    M src/demos/fss/clearfix/css/clearfix.css
    R src/demos/fss/clearfix/demo.html
    R src/demos/fss/clearfix/html/clearfix.html
    A src/demos/fss/clearfix/index.html
    A src/demos/fss/clearfix/json/config.json
    M src/demos/fss/contextual/css/context.css
    R src/demos/fss/contextual/demo.html
    R src/demos/fss/contextual/html/context.html
    A src/demos/fss/contextual/index.html
    A src/demos/fss/contextual/json/config.json
    R src/demos/fss/layout/demo.html
    R src/demos/fss/layout/html/layout.html
    A src/demos/fss/layout/index.html
    A src/demos/fss/layout/json/config.json
    R src/demos/fss/linearize/demo.html
    R src/demos/fss/linearize/html/linearize.html
    A src/demos/fss/linearize/index.html
    A src/demos/fss/linearize/json/config.json
    A src/demos/fss/mobile/buttons/basic.html
    A src/demos/fss/mobile/content/basic.html
    R src/demos/fss/mobile/demo.html
    R src/demos/fss/mobile/html/buttons/basic.html
    R src/demos/fss/mobile/html/content/basic.html
    R src/demos/fss/mobile/html/mobile.html
    R src/demos/fss/mobile/html/nav/basic.html
    R src/demos/fss/mobile/html/nav/icon.html
    R src/demos/fss/mobile/html/nav/thumb.html
    R src/demos/fss/mobile/html/tabs/basic.html
    A src/demos/fss/mobile/index.html
    M src/demos/fss/mobile/js/mobileDemo.js
    A src/demos/fss/mobile/json/config.json
    A src/demos/fss/mobile/nav/basic.html
    A src/demos/fss/mobile/nav/icon.html
    A src/demos/fss/mobile/nav/thumb.html
    A src/demos/fss/mobile/tabs/basic.html
    R src/demos/fss/reset/demo.html
    R src/demos/fss/reset/html/reset.html
    R src/demos/fss/reset/html/withReset.html
    R src/demos/fss/reset/html/withoutReset.html
    A src/demos/fss/reset/index.html
    A src/demos/fss/reset/json/config.json
    A src/demos/fss/reset/withReset.html
    A src/demos/fss/reset/withoutReset.html
    R src/demos/fss/text/demo.html
    R src/demos/fss/text/html/text.html
    A src/demos/fss/text/index.html
    A src/demos/fss/text/json/config.json
    R src/demos/fss/themes/demo.html
    R src/demos/fss/themes/html/themes.html
    A src/demos/fss/themes/index.html
    A src/demos/fss/themes/json/config.json
    R src/demos/index.html
    M src/demos/inlineEdit/rich/css/InlineEdit.css
    R src/demos/inlineEdit/rich/demo.html
    R src/demos/inlineEdit/rich/html/inlineEdit.html
    A src/demos/inlineEdit/rich/index.html
    A src/demos/inlineEdit/rich/json/config.json
    M src/demos/inlineEdit/simple/css/InlineEdit.css
    R src/demos/inlineEdit/simple/demo.html
    R src/demos/inlineEdit/simple/html/inlineEdit.html
    A src/demos/inlineEdit/simple/index.html
    M src/demos/inlineEdit/simple/js/inlineEditDemo.js
    A src/demos/inlineEdit/simple/json/config.json
    M src/demos/keyboard-a11y/css/keyboard.css
    R src/demos/keyboard-a11y/demo.html
    R src/demos/keyboard-a11y/html/keyboard.html
    A src/demos/keyboard-a11y/index.html
    M src/demos/keyboard-a11y/js/five-star.js
    A src/demos/keyboard-a11y/json/config.json
    R src/demos/lib/chili/chili-LICENSE.txt
    R src/demos/lib/chili/cplusplus.js
    R src/demos/lib/chili/csharp.js
    R src/demos/lib/chili/css.js
    R src/demos/lib/chili/delphi.js
    R src/demos/lib/chili/html.js
    R src/demos/lib/chili/java.js
    R src/demos/lib/chili/jquery.chili-2.2.js
    R src/demos/lib/chili/js.js
    R src/demos/lib/chili/lotusscript.js
    R src/demos/lib/chili/mysql.js
    R src/demos/lib/chili/php-f.js
    R src/demos/lib/chili/php.js
    R src/demos/lib/chili/recipes.js
    R src/demos/lib/chili/start-here.html
    A src/demos/overviewPanel/index.html
    R src/demos/pager/demo.html
    R src/demos/pager/html/pager.html
    A src/demos/pager/index.html
    M src/demos/pager/js/pagerDemo.js
    A src/demos/pager/json/config.json
    R src/demos/portal/css/ajaxError.css
    R src/demos/portal/css/demo.css
    R src/demos/portal/css/portal.css
    R src/demos/portal/html/sameOriginPolicyWarning.html
    R src/demos/portal/images/comingSoon.png
    R src/demos/portal/images/fss.png
    R src/demos/portal/images/inlineEdit-dropdown.png
    R src/demos/portal/images/inlineEdit-rich.png
    R src/demos/portal/images/inlineEdit-simple.png
    R src/demos/portal/images/pager.png
    R src/demos/portal/images/progress.png
    R src/demos/portal/images/renderer.png
    R src/demos/portal/images/reorderer-grid.png
    R src/demos/portal/images/reorderer-image.png
    R src/demos/portal/images/reorderer-layout.png
    R src/demos/portal/images/reorderer-list.png
    R src/demos/portal/images/uiOptions.png
    R src/demos/portal/images/uploader.png
    R src/demos/portal/js/demoAssets.js
    R src/demos/progress/demo.html
    R src/demos/progress/html/progress.html
    A src/demos/progress/index.html
    M src/demos/progress/js/progressDemo.js
    A src/demos/progress/json/config.json
    R src/demos/renderer/demo.html
    R src/demos/renderer/html/renderer.html
    A src/demos/renderer/index.html
    M src/demos/renderer/js/rendererDemo.js
    A src/demos/renderer/json/config.json
    M src/demos/reorderer/gridReorderer/css/gridReorderer.css
    R src/demos/reorderer/gridReorderer/demo.html
    R src/demos/reorderer/gridReorderer/html/gridReorderer.html
    A src/demos/reorderer/gridReorderer/index.html
    A src/demos/reorderer/gridReorderer/json/config.json
    M src/demos/reorderer/imageReorderer/css/imageReorderer.css
    R src/demos/reorderer/imageReorderer/demo.html
    R src/demos/reorderer/imageReorderer/html/imageReorderer.html
    A src/demos/reorderer/imageReorderer/index.html
    A src/demos/reorderer/imageReorderer/json/config.json
    M src/demos/reorderer/layoutReorderer/css/layoutReorderer.css
    R src/demos/reorderer/layoutReorderer/demo.html
    R src/demos/reorderer/layoutReorderer/html/layoutReorderer.html
    A src/demos/reorderer/layoutReorderer/index.html
    A src/demos/reorderer/layoutReorderer/json/config.json
    R src/demos/reorderer/listReorderer/demo.html
    R src/demos/reorderer/listReorderer/html/listReorderer.html
    A src/demos/reorderer/listReorderer/index.html
    A src/demos/reorderer/listReorderer/json/config.json
    A src/demos/shared/html/overviewPanelTemplate-noDesign.html
    A src/demos/shared/js/overviewWrapper.js
    R src/demos/uiOptions/demo.html
    R src/demos/uiOptions/html/uiOptions.html
    A src/demos/uiOptions/index.html
    A src/demos/uiOptions/json/config.json
    A src/demos/uploader/css/uploader.css
    R src/demos/uploader/demo.html
    R src/demos/uploader/html/uploader.html
    A src/demos/uploader/index.html
    M src/demos/uploader/js/uploaderDemo.js
    A src/demos/uploader/json/config.json
    M src/framework/preferences/js/StarterSchemas.js

  Log Message:
  -----------
  Merge remote-tracking branch 'acheetham/FLUID-5289'

* acheetham/FLUID-5289:
  FLUID-5289: Fixes to text, styling
  FLUID-5289: Move consistent text into component defaults, clean up other small things.
  FLUID-5289: Fixed spelling mistake in the overview panel demo
  FLUID-5289: Remove the overview panel test file; it's been replaced by an actual demo
  FLUID-5289: Linting
  FLUID-5289: Staring to move Simon's overview panel test file into a proper demo
  FLUID-5289: Rename folder containing config JSON files to 'json'
  FLUID-5289: Rename demo JSON files to config.json
  FLUID-5289: Update the FSS overlay panel texts.
  FLUID_5289: Test links in panels, remove Design link where there is no design; Fix overlay component CSS to ensure overlay is actually on top of everything.
  FLUID-5289: First pass at text for the demo overview panels
  FLUID-5289: Fixes to mobile demo files
  FLUID-5289: Add basic overlay panel to the demos. Still need proper text
  FLUID-5289: Removing the now-unused portal code
  FLUID-5298: Cleaning up the FSS demos
  FLUID-5289: Move all demos (except FSS) up a level, freed from the portal.


Compare: https://github.com/fluid-project/infusion/compare/e511c9fc7eff...e2b741777c00


More information about the Commits mailing list