[Commits] [inclusive-design/guide.inclusivedesign.ca] b6c32d: FLOE-545 Add collaborative art warmup to activitie...

GitHub noreply at github.com
Mon Apr 2 18:34:30 UTC 2018


  Branch: refs/heads/master
  Home:   https://github.com/inclusive-design/guide.inclusivedesign.ca
  Commit: b6c32dd3a655845fc4c98af8cba043bf9b447568
      https://github.com/inclusive-design/guide.inclusivedesign.ca/commit/b6c32dd3a655845fc4c98af8cba043bf9b447568
  Author: Dana Ayotte <danaayotte at Admins-Air.hitronhub.home>
  Date:   2018-03-09 (Fri, 09 Mar 2018)

  Changed paths:
    A .DS_Store
    A src/.DS_Store
    A src/documents/.DS_Store
    A src/documents/activities/.DS_Store
    M src/documents/activities/CauseAndEffect.html.md.handlebars
    A src/documents/activities/CollaborativeArtWarmup.html.md.handlebars
    A src/static/.DS_Store
    A src/static/images/collaborative_art.JPG

  Log Message:
  -----------
  FLOE-545 Add collaborative art warmup to activities


  Commit: 6dc912e49654ea4ead55b5c5737cff5025a7a2af
      https://github.com/inclusive-design/guide.inclusivedesign.ca/commit/6dc912e49654ea4ead55b5c5737cff5025a7a2af
  Author: Dana Ayotte <danaayotte at Admins-Air.hitronhub.home>
  Date:   2018-03-12 (Mon, 12 Mar 2018)

  Changed paths:
    M .DS_Store
    A package-lock.json
    M site-structure.json
    M src/.DS_Store
    M src/documents/.DS_Store
    M src/documents/activities/CollaborativeArtWarmup.html.md.handlebars
    A src/layouts/.DS_Store
    M src/static/.DS_Store
    M src/static/images/collaborative_art.JPG
    A src/static/images/collaborative_art2.JPG

  Log Message:
  -----------
  FLOE-545 add second image and add link from site structure


  Commit: 5253b5e2161bab627b6e6b4fd6c48746587ac3b1
      https://github.com/inclusive-design/guide.inclusivedesign.ca/commit/5253b5e2161bab627b6e6b4fd6c48746587ac3b1
  Author: Dana Ayotte <danaayotte at Admins-Air.hitronhub.home>
  Date:   2018-03-12 (Mon, 12 Mar 2018)

  Changed paths:
    M .DS_Store
    M src/.DS_Store
    M src/documents/.DS_Store
    M src/documents/activities/CollaborativeArtWarmup.html.md.handlebars

  Log Message:
  -----------
  FLOE-545 correct typos and make minor edits to content


  Commit: 0dc12dab56c0a44f30bf4c1f976cd5cb99744759
      https://github.com/inclusive-design/guide.inclusivedesign.ca/commit/0dc12dab56c0a44f30bf4c1f976cd5cb99744759
  Author: Dana Ayotte <danaayotte at Admins-Air.hitronhub.home>
  Date:   2018-03-13 (Tue, 13 Mar 2018)

  Changed paths:
    R .DS_Store
    R src/.DS_Store
    R src/documents/.DS_Store
    R src/layouts/.DS_Store
    R src/static/.DS_Store

  Log Message:
  -----------
  FLOE-545: removing DS_Store files


  Commit: df2271297c95b00acde7e32447f1a463f8f81556
      https://github.com/inclusive-design/guide.inclusivedesign.ca/commit/df2271297c95b00acde7e32447f1a463f8f81556
  Author: dayotte <dayotte at ocadu.ca>
  Date:   2018-04-02 (Mon, 02 Apr 2018)

  Changed paths:
    M .gitignore
    R package-lock.json
    R src/documents/activities/.DS_Store

  Log Message:
  -----------
  FLOE-545: remove unnecessary files and update gitignore file


  Commit: c1a1de8eee9013029396dab13c56a540792ebc9a
      https://github.com/inclusive-design/guide.inclusivedesign.ca/commit/c1a1de8eee9013029396dab13c56a540792ebc9a
  Author: dayotte <dayotte at ocadu.ca>
  Date:   2018-04-02 (Mon, 02 Apr 2018)

  Changed paths:
    M site-structure.json
    A src/documents/activities/FunctionalMashup.html.md.handlebars
    A src/documents/activities/WebOfStrings.html.md.handlebars
    A src/static/images/web_of_strings_diagram.png

  Log Message:
  -----------
  FLOE-545: merge changes from master


  Commit: 3748c2daba1d578efd2db322a4e6e9029c758f46
      https://github.com/inclusive-design/guide.inclusivedesign.ca/commit/3748c2daba1d578efd2db322a4e6e9029c758f46
  Author: jhung <jhung at ocadu.ca>
  Date:   2018-04-02 (Mon, 02 Apr 2018)

  Changed paths:
    M .gitignore
    M site-structure.json
    M src/documents/activities/CauseAndEffect.html.md.handlebars
    A src/documents/activities/CollaborativeArtWarmup.html.md.handlebars
    A src/static/images/collaborative_art.JPG
    A src/static/images/collaborative_art2.JPG

  Log Message:
  -----------
  Merge pull request #21 from dayotte/FLOE-545

Floe 545


Compare: https://github.com/inclusive-design/guide.inclusivedesign.ca/compare/bf3d19d55304...3748c2daba1d


More information about the Commits mailing list