[Commits] [fluid-project/infusion] 6adc92: Merge branch 'master' into FLUID-4186

noreply at github.com noreply at github.com
Fri Apr 29 18:03:39 UTC 2011


Branch: refs/heads/master
Home:   https://github.com/fluid-project/infusion

Commit: 6adc9212970c3dc43e24ad4056a61d4720f4cc5e
    https://github.com/fluid-project/infusion/commit/6adc9212970c3dc43e24ad4056a61d4720f4cc5e
Author: Justin Obara <obarajustin at gmail.com>
Date:   2011-04-29 (Fri, 29 Apr 2011)

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

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


Commit: b4fcfdf8996a146f90701fba6bb00d9b237f2420
    https://github.com/fluid-project/infusion/commit/b4fcfdf8996a146f90701fba6bb00d9b237f2420
Author: Justin Obara <obarajustin at gmail.com>
Date:   2011-04-29 (Fri, 29 Apr 2011)

Changed paths:
  M ReleaseNotes.txt
  M src/webapp/components/uploader/html/Uploader.html
  A src/webapp/demos/fss/base/css/base.css
  A src/webapp/demos/fss/base/demo.html
  A src/webapp/demos/fss/base/html/base.html
  A src/webapp/demos/fss/base/html/withBase.html
  A src/webapp/demos/fss/base/html/withoutBase.html
  A src/webapp/demos/fss/contextual/css/context.css
  A src/webapp/demos/fss/contextual/demo.html
  A src/webapp/demos/fss/contextual/html/context.html
  M src/webapp/demos/fss/layout/demo.html
  M src/webapp/demos/fss/layout/html/layout.html
  M src/webapp/demos/fss/mobile/demo.html
  M src/webapp/demos/fss/reset/demo.html
  M src/webapp/demos/fss/reset/html/reset.html
  M src/webapp/demos/fss/reset/html/withReset.html
  M src/webapp/demos/fss/text/demo.html
  M src/webapp/demos/fss/text/html/text.html
  M src/webapp/demos/fss/themes/demo.html
  M src/webapp/demos/fss/themes/html/themes.html
  M src/webapp/demos/index.html
  M src/webapp/demos/inlineEdit/rich/demo.html
  M src/webapp/demos/inlineEdit/rich/html/inlineEdit.html
  M src/webapp/demos/inlineEdit/simple/demo.html
  M src/webapp/demos/inlineEdit/simple/html/inlineEdit.html
  M src/webapp/demos/keyboard-a11y/demo.html
  M src/webapp/demos/keyboard-a11y/html/keyboard.html
  M src/webapp/demos/pager/demo.html
  M src/webapp/demos/pager/html/pager.html
  M src/webapp/demos/portal/html/sameOriginPolicyWarning.html
  M src/webapp/demos/progress/demo.html
  M src/webapp/demos/progress/html/progress.html
  M src/webapp/demos/renderer/demo.html
  M src/webapp/demos/renderer/html/renderer.html
  M src/webapp/demos/reorderer/gridReorderer/demo.html
  M src/webapp/demos/reorderer/gridReorderer/html/gridReorderer.html
  M src/webapp/demos/reorderer/imageReorderer/demo.html
  M src/webapp/demos/reorderer/imageReorderer/html/imageReorderer.html
  M src/webapp/demos/reorderer/layoutReorderer/demo.html
  M src/webapp/demos/reorderer/layoutReorderer/html/layoutReorderer.html
  M src/webapp/demos/reorderer/listReorderer/demo.html
  M src/webapp/demos/reorderer/listReorderer/html/listReorderer.html
  M src/webapp/demos/uiOptions/demo.html
  M src/webapp/demos/uiOptions/html/UIOptionsPreview.html
  M src/webapp/demos/uiOptions/html/uiOptions.html
  M src/webapp/demos/uploader/demo.html
  M src/webapp/demos/uploader/html/uploader.html
  A src/webapp/framework/fss/css/fss-base-context.css
  A src/webapp/framework/fss/css/fss-base-global.css
  A src/webapp/framework/fss/css/fss-reset-context.css
  A src/webapp/framework/fss/css/fss-reset-global.css
  M src/webapp/framework/fss/css/fss-reset.css
  M src/webapp/framework/fss/fssDependencies.json
  M src/webapp/integration-demos/sakai/html/UIOptionsPreview.html
  M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
  M src/webapp/standalone-demos/uiOptions/html/UIOptions.html
  M src/webapp/standalone-demos/uiOptions/html/UIOptionsPreview.html
  M src/webapp/tests/component-tests/reorderer/html/ImageReorderer-test.html
  M src/webapp/tests/framework-tests/fss/html/1.fss.layout.containers.html
  M src/webapp/tests/framework-tests/fss/html/2.fss.layout.columns.html
  M src/webapp/tests/framework-tests/fss/html/3.fss.layout.advanced.html
  M src/webapp/tests/framework-tests/fss/html/4.fss.text.size.html
  M src/webapp/tests/framework-tests/fss/html/5.fss.text.spacing.html
  M src/webapp/tests/framework-tests/fss/html/6.fss.text.font.family.html
  M src/webapp/tests/framework-tests/fss/html/7.fss.complete.html

Log Message:
-----------
Merge branch 'FLUID-4186'

* FLUID-4186:
  FLUID-4186: switched to separate base and reset
  FLUID-4186: Updating release notes for fss reset
  FLUID-4186: Added contextual demo to portal index
  FLUID-4186: Added a new FSS demo for context
  FLUID-4186: Depricating fss-reset.css
  FLUID-4186: Removed fl-focus from withBase.html
  FLUID-4186: Adding fl-focus to the base demo
  FLUID-4186: Updating to fl-focus in the base files
  FLUID-4186: Added a link to the base demo.
  FLUID-4186: Updated fss reset and added base demo
  FLUID-4186: added the split base and reset files


Compare: https://github.com/fluid-project/infusion/compare/6dca782...b4fcfdf



More information about the Commits mailing list