[Commits] [fluid-project/infusion] 05c20d: Merge branch 'master' of https://github.com/fluid-...

[noreply at github.com]

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

Commit: 05c20db0ddbab4f203187ed5808e1674b9328e4c
    https://github.com/fluid-project/infusion/commit/05c20db0ddbab4f203187ed5808e1674b9328e4c
Author: mlam <mlam at ocad.ca>
Date:   2011-05-19 (Thu, 19 May 2011)

Changed paths:
  M ReleaseNotes.txt
  M src/webapp/components/uiOptions/html/UIOptions.html
  A src/webapp/components/uiOptions/html/UIOptionsTemplate-layout.html
  A src/webapp/components/uiOptions/html/UIOptionsTemplate-links.html
  A src/webapp/components/uiOptions/html/UIOptionsTemplate-text.html
  M src/webapp/components/uiOptions/js/UIOptions.js
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/jquery.ui.theme.css
  M src/webapp/demos/uiOptions/js/uiOptions.js
  M src/webapp/framework/renderer/js/RendererUtilities.js
  M src/webapp/lib/jquery/ui/css/fl-theme-coal/coal.css
  M src/webapp/lib/jquery/ui/css/fl-theme-hc/hc.css
  M src/webapp/lib/jquery/ui/css/fl-theme-hci/hci.css
  M src/webapp/lib/jquery/ui/css/fl-theme-mist/mist.css
  M src/webapp/lib/jquery/ui/css/fl-theme-slate/slate.css
  M src/webapp/lib/jquery/ui/css/jquery.ui.theme.css
  M src/webapp/standalone-demos/uiOptions/html/UIOptions.html
  M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js
  M src/webapp/tests/framework-tests/renderer/js/RendererUtilitiesTests.js

Log Message:
-----------
Merge branch 'master' of https://github.com/fluid-project/infusion into FLUID-4243


Commit: 49d2ad017e390d8800dec68ab2eb36883d899ded
    https://github.com/fluid-project/infusion/commit/49d2ad017e390d8800dec68ab2eb36883d899ded
Author: Colin Clark <colinbdclark at gmail.com>
Date:   2011-05-19 (Thu, 19 May 2011)

Changed paths:
  M src/webapp/demos/uploader/html/uploader.html
  M src/webapp/demos/uploader/js/uploader.js

Log Message:
-----------
Merge remote branch 'mlam/FLUID-4243'

* mlam/FLUID-4243:
  FLUID-4243: Remove Uploader demo buttons


Commit: 85213ff1041de1869cd3968625f7ca7639ddd3aa
    https://github.com/fluid-project/infusion/commit/85213ff1041de1869cd3968625f7ca7639ddd3aa
Author: Colin Clark <colinbdclark at gmail.com>
Date:   2011-05-19 (Thu, 19 May 2011)

Changed paths:
  M src/webapp/demos/uploader/html/uploader.html
  M src/webapp/demos/uploader/js/uploader.js

Log Message:
-----------
FLUID-4243: Removed IoC-isms from Uploader demo to make it easy for new users to understand (at least until IoC is out of sneak peek).


Compare: https://github.com/fluid-project/infusion/compare/a1a9981...85213ff