[Commits] [fluid-project/infusion] fb349f: Merge branch 'demo' into FLUID-4323-demo

GitHub noreply at github.com
Mon Apr 1 11:32:25 EDT 2013


  Branch: refs/heads/demo
  Home:   https://github.com/fluid-project/infusion
  Commit: fb349f23f8481081f9ad743996371162c3a0f915
      https://github.com/fluid-project/infusion/commit/fb349f23f8481081f9ad743996371162c3a0f915
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2013-03-27 (Wed, 27 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/css/UIOptions.css
    A src/webapp/components/uiOptions/css/fonts/UIO.eot
    A src/webapp/components/uiOptions/css/fonts/UIO.ttf
    A src/webapp/components/uiOptions/css/fonts/UIO.woff
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-layout.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-lineSpacer.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-links.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-textFont.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-textSizer.html
    M src/webapp/integration-demos/uiOptions/templates/UIOptionsTemplate-selfVoicing.html
    M src/webapp/integration-demos/uiOptions/templates/UIOptionsTemplate-simplifiedContent.html

  Log Message:
  -----------
  Merge branch 'demo' into FLUID-4323-demo


  Commit: b575493a89dafde35fc7205ee06dd364ee6eed78
      https://github.com/fluid-project/infusion/commit/b575493a89dafde35fc7205ee06dd364ee6eed78
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2013-03-27 (Wed, 27 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.html

  Log Message:
  -----------
  Merge branch 'demo' into FLUID-4323-demo


  Commit: 208c5bb4e459c42222ba3a8f659f542f3930f6ab
      https://github.com/fluid-project/infusion/commit/208c5bb4e459c42222ba3a8f659f542f3930f6ab
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2013-03-27 (Wed, 27 Mar 2013)

  Changed paths:
    M src/webapp/components/tableOfContents/html/TableOfContents.html
    M src/webapp/components/tableOfContents/js/TableOfContents.js
    M src/webapp/components/uiOptions/html/FatPanelUIOptionsFrame.html
    M src/webapp/integration-demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/integration-demos/uiOptions/js/uiOptionsExtra.js

  Log Message:
  -----------
  FLUID-4323: Fix up the interaction between content simplification and the TOC.


  Commit: 536234aece0663bbd8ec1b5de4fc7df084c02ef7
      https://github.com/fluid-project/infusion/commit/536234aece0663bbd8ec1b5de4fc7df084c02ef7
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2013-03-27 (Wed, 27 Mar 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/js/SettingsPanels.js

  Log Message:
  -----------
  Merge branch 'demo' into FLUID-4323-demo


  Commit: 63371a5b62eaae17695ead899941e78733823d4a
      https://github.com/fluid-project/infusion/commit/63371a5b62eaae17695ead899941e78733823d4a
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-04-01 (Mon, 01 Apr 2013)

  Changed paths:
    M src/webapp/components/tableOfContents/js/TableOfContents.js
    M src/webapp/integration-demos/uiOptions/js/uiOptionsExtra.js

  Log Message:
  -----------
  FLUID-4323: Fixed the chrome issue that the table of contents does not populated properly.


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

  Changed paths:
    M src/webapp/components/tableOfContents/html/TableOfContents.html
    M src/webapp/components/tableOfContents/js/TableOfContents.js
    M src/webapp/components/uiOptions/html/FatPanelUIOptionsFrame.html
    M src/webapp/integration-demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/integration-demos/uiOptions/js/uiOptionsExtra.js

  Log Message:
  -----------
  Merge remote-tracking branch 'cindyli/FLUID-4323' into demo

* cindyli/FLUID-4323:
  FLUID-4323: Fixed the chrome issue that the table of contents does not populated properly.
  FLUID-4323: Fix up the interaction between content simplification and the TOC.


Compare: https://github.com/fluid-project/infusion/compare/3dd082cecb42...214080bd5058


More information about the Commits mailing list