[Commits] [fluid-project/floeproject.org] 2ee028: Merge branch 'master' of https://github.com/waharn...

Michelle noreply at github.com
Fri Feb 8 20:28:19 UTC 2019


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/floeproject.org
  Commit: 2ee0283c0803bc1bc72b5bc36324fd72590a64ee
      https://github.com/fluid-project/floeproject.org/commit/2ee0283c0803bc1bc72b5bc36324fd72590a64ee
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2017-04-25 (Tue, 25 Apr 2017)

  Changed paths:
    R CNAME

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/waharnum/floeproject.org


  Commit: f21f5ae902f7dee71c00db0bd0a590a7e8e1f661
      https://github.com/fluid-project/floeproject.org/commit/f21f5ae902f7dee71c00db0bd0a590a7e8e1f661
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2019-02-07 (Thu, 07 Feb 2019)

  Changed paths:
    A CNAME
    M README.md
    M accessibilitySprint2015.html
    R css/fss/fss-layout.css
    R css/fss/fss-reset.css
    R css/fss/fss-text.css
    M css/style.css
    M index.html
    A js/resources.js
    M lib/foundation/README.md
    M lib/infusion/VERSION.md
    M lib/infusion/infusion-custom.js
    M lib/infusion/src/framework/preferences/css/Enactors.css
    M lib/infusion/src/framework/preferences/css/PrefsEditor.css
    M lib/infusion/src/framework/preferences/css/SeparatedPanelPrefsEditor.css
    M lib/infusion/src/framework/preferences/css/SeparatedPanelPrefsEditorFrame.css
    R lib/infusion/src/framework/preferences/css/stylus/Enactors.styl
    R lib/infusion/src/framework/preferences/css/stylus/FullNoPreviewPrefsEditor.styl
    R lib/infusion/src/framework/preferences/css/stylus/FullPrefsEditor.styl
    R lib/infusion/src/framework/preferences/css/stylus/FullPreviewPrefsEditor.styl
    R lib/infusion/src/framework/preferences/css/stylus/PrefsEditor.styl
    R lib/infusion/src/framework/preferences/css/stylus/README.md
    R lib/infusion/src/framework/preferences/css/stylus/SeparatedPanelPrefsEditor.styl
    R lib/infusion/src/framework/preferences/css/stylus/SeparatedPanelPrefsEditorFrame.styl
    R lib/infusion/src/framework/preferences/css/stylus/utils/Helpers.styl
    R lib/infusion/src/framework/preferences/css/stylus/utils/Themes.styl
    M lib/infusion/src/framework/preferences/html/PrefsEditorTemplate-contrast.html
    M lib/infusion/src/framework/preferences/html/PrefsEditorTemplate-enhanceInputs.html
    M lib/infusion/src/framework/preferences/html/PrefsEditorTemplate-layout.html
    M lib/infusion/src/framework/preferences/html/PrefsEditorTemplate-lineSpace.html
    M lib/infusion/src/framework/preferences/html/PrefsEditorTemplate-speak.html
    M lib/infusion/src/framework/preferences/html/PrefsEditorTemplate-textFont.html
    M lib/infusion/src/framework/preferences/html/PrefsEditorTemplate-textSize.html
    M lib/infusion/src/framework/preferences/html/SeparatedPanelPrefsEditor.html
    M lib/infusion/src/framework/preferences/html/SeparatedPanelPrefsEditorFrame.html
    M lib/infusion/src/framework/preferences/messages/contrast.json
    A news/2012-02-28-updates-to-ildh.html
    A news/2012-03-06-webinar-outside-in.html
    A news/2012-10-12-project-update.html
    A news/2012-10-15-floe-open-ed.html
    A news/2012-10-19-plans-for-floe-year-three.html
    A news/2012-10-24-jutta-zoomer-mag.html
    A news/2012-12-05-floe-deployment-feasibility-study-funded.html
    A news/2012-12-05-floe-leads-inclusive-design-workshop-at-big-ideas-fest.html
    A news/2013-03-05-fluid-releases-new-video-player.html
    A news/2013-11-05-call-for-contributions-wai-accessible-e-learning-online-symposium.html
    A news/2013-11-12-inclusive-design-of-oers.html
    A news/2014-03-01-edupub2-workshop.html
    A news/2014-03-10-harnessing-the-open-web.html
    A news/2014-03-18-metadata-editing-components.html
    A news/2014-03-24-floe-presentations-at-csun.html
    A news/2014-03-28-workshop-inclusive-technology-in-the-classroom.html
    A news/2014-04-04-panel-presentation-a11y-in-oer.html
    A news/2014-04-15-floe-at-hci.html
    M news/2014-04-21-metadata-search.html
    M news/2014-09-30-lumen-learning.html
    R news/2015-01-08-oer-a11y-sprint.html
    A news/2015-01-13-oer-a11y-sprint.html
    M news/2015-03-26-uio-wp-plugin.html
    M news/2015-05-08-workshop-business-advantages.html
    M news/2015-11-16-phet.html
    M news/2016-03-28-upcoming-talks-on-inclusive-digital-education.html
    M news/2016-11-30-DEEP-conference-2016.html
    M news/2016-11-30-IIDEX-2016.html
    M news/2016-11-30-UN-international-day-of-persons-with-disabilities.html
    A news/2017-07-19-inclusive-science-lab.html
    A news/2017-08-30-self-assessment-toolkit.html
    A news/2017-12-11-cast-cisl.html
    A news/2018-01-31-uioPlus.html
    A news/2018-04-18-New-Content-Added-to-Inclusive-Design-Resources.html
    A news/2018-06-19-El-Planeta-Es-La-Escuela.html
    A news/2018-08-30-Cities-Co-Design.html
    A news/2018-09-17-GSoC2018.html
    A news/2018-11-08-DEEP2018.html
    A news/2019-01-24-ResistanceInWire.html
    A news/YYYY-MM-DD-news-item-title.html
    A news/images/CitiesCoDesign.jpg
    A news/images/FloeAtDeep.png
    A news/images/Medellin_art.png
    A news/images/Medellin_art_thumb.png
    A news/images/Playtown.jpg
    A news/images/RIAW.png
    A news/images/Self-reflection Figure 1 thumb.png
    A news/images/Self-reflection Figure 1.png
    A news/images/Self-reflection Figure 2 thumb.png
    A news/images/Self-reflection Figure 2.png
    A news/images/Self-reflection Figure 3 thumb.png
    A news/images/Self-reflection Figure 3.png
    A news/images/Spifind.png
    A news/images/collaborative_art.png
    A news/images/collaborative_art_thumb.png
    A news/images/myl3-gsoc-playground.jpg
    A news/images/myl3-gsoc-quicknotes.jpg
    M news/index.html
    M prefsEditors.html
    A resources.html
    M security.html

  Log Message:
  -----------
  Merge remote-tracking branch 'fluid-project/master'


  Commit: c9dd7a860cb24d9c9008e7cff02b0e437dd7a2f1
      https://github.com/fluid-project/floeproject.org/commit/c9dd7a860cb24d9c9008e7cff02b0e437dd7a2f1
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2019-02-07 (Thu, 07 Feb 2019)

  Changed paths:
    M index.html
    A news/2019-02-07-CISL-site-and-demo.html
    A news/images/CISL-reader.png
    M news/index.html

  Log Message:
  -----------
  FLOE-565: initial add of CISL news article.


  Commit: 6355dc79828880369d23bd50b17e5211a6273e52
      https://github.com/fluid-project/floeproject.org/commit/6355dc79828880369d23bd50b17e5211a6273e52
  Author: Michelle <michelled33 at gmail.com>
  Date:   2019-02-08 (Fri, 08 Feb 2019)

  Changed paths:
    M index.html
    A news/2019-02-07-CISL-site-and-demo.html
    A news/images/CISL-reader.png
    M news/index.html

  Log Message:
  -----------
  Merge pull request #82 from waharnum/FLOE-565

FLOE-565: add CISL news item


Compare: https://github.com/fluid-project/floeproject.org/compare/65b124c2b69c...6355dc798288


More information about the Commits mailing list