[Commits] [inclusive-design/guide.inclusivedesign.ca] ef7004: Merge pull request #1 from inclusive-design/master

Wed Feb 28 22:22:07 UTC 2018

  Branch: refs/heads/master
  Home:   https://github.com/inclusive-design/guide.inclusivedesign.ca
  Commit: ef700414734787063778cfd60a39c6d8899a7eff
      https://github.com/inclusive-design/guide.inclusivedesign.ca/commit/ef700414734787063778cfd60a39c6d8899a7eff
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2016-10-06 (Thu, 06 Oct 2016)

  Changed paths:
    M docpad.js
    M helpers/idg.js
    M site-structure.json
    M src/documents/activities/CauseAndEffect.html.md.handlebars
    A src/documents/activities/InclusiveDesignMapping.html.md.handlebars
    M src/documents/activities/MatchingGame.html.md.handlebars
    M src/documents/css/docs-template.css.styl
    M src/documents/css/idg.css.styl
    M src/documents/index.html.md.handlebars
    A src/documents/insights/AutonomousUser.html.md.handlebars
    A src/documents/insights/DisabilityAsMismatch.html.md.handlebars
    A src/documents/insights/DiverseParticipationAndPerspectives.html.md.handlebars
    A src/documents/insights/IntegratedSolutions.html.md.handlebars
    A src/documents/insights/Interconnectedness.html.md.handlebars
    A src/documents/insights/OneSizeFitsOne.html.md.handlebars
    A src/documents/insights/UserContinuedDesign.html.md.handlebars
    A src/documents/insights/VirtuousCycles.html.md.handlebars
    M src/documents/practices/Collaborate.html.md.handlebars
    M src/documents/practices/CommunicateMultimodally.html.md.handlebars
    M src/documents/practices/DesignForAdaptabilityAndFlexibility.html.md.handlebars
    M src/documents/practices/DesignForUncertainty.html.md.handlebars
    M src/documents/practices/FacilitateInclusively.html.md.handlebars
    M src/documents/practices/FocusOnFunctionalNeedsAndPreferences.html.md.handlebars
    M src/documents/practices/IntegrateAccessibilityFromTheStart.html.md.handlebars
    M src/documents/practices/PracticeCoDesign.html.md.handlebars
    M src/documents/practices/TestFrequently.html.md.handlebars
    M src/documents/practices/WorkOpenly.html.md.handlebars
    R src/documents/principles/AutonomousUser.html.md.handlebars
    R src/documents/principles/DisabilityAsMismatch.html.md.handlebars
    R src/documents/principles/DiverseParticipationAndPerspectives.html.md.handlebars
    R src/documents/principles/IntegratedSolutions.html.md.handlebars
    R src/documents/principles/Interconnectedness.html.md.handlebars
    R src/documents/principles/OneSizeFitsOne.html.md.handlebars
    R src/documents/principles/UserContinuedDesign.html.md.handlebars
    R src/documents/principles/VirtuousCycles.html.md.handlebars
    A src/documents/tools/AccessibleCommunicationTools.html.md
    R src/documents/tools/AccessibleCommunicationTools.md
    A src/documents/tools/AccessibleDesignTools.html.md
    R src/documents/tools/AccessibleDesignTools.md
    A src/documents/tools/AccessibleDevelopmentTools.html.md
    R src/documents/tools/AccessibleDevelopmentTools.md
    A src/documents/tools/Infusion.html.md
    R src/documents/tools/Infusion.md
    M src/documents/tools/MetadataAuthoring.html.md.handlebars
    A src/documents/tools/Mindmaps.html.md
    R src/documents/tools/Mindmaps.md
    M src/documents/tools/Personas.html.md.handlebars
    M src/documents/tools/Prototyping.html.md.handlebars
    A src/documents/tools/SynchronizedDesignAssets.html.md
    R src/documents/tools/SynchronizedDesignAssets.md
    A src/documents/tools/UXWalkthroughs.html.md
    R src/documents/tools/UXWalkthroughs.md
    A src/documents/tools/UsabilityTesting.html.md
    R src/documents/tools/UsabilityTesting.md
    M src/documents/tools/UseCases.html.md.handlebars
    M src/documents/tools/UserStatesAndContexts.html.md.handlebars
    R src/static/images/Cause&Effect Cards.pdf
    A src/static/images/CauseAndEffectCards.pdf
    A src/static/images/InclusiveDesignDimensions.png
    A src/static/images/InclusiveDesignMappingTemplate.png
    A src/static/images/InclusiveDesignMappingTool01.png
    A src/static/images/InclusiveDesignMappingTool02.png
    A src/static/images/InclusiveDesignMappingTool03.png
    A src/static/images/InclusiveDesignMappingTool04.png
    A src/static/images/InclusiveDesignMappingTool05.png
    A src/static/images/StatesAndContextsToolMapped.png
    A src/static/images/StatesAndContextsToolSimple.jpg
    R src/static/images/User_States_And_Contexts.jpg
    A src/static/images/VirtuousCyclesOfDigitalInclusion.jpg
    R src/static/images/Virtuous_cycles_of_digital_inclusion.jpg
    A src/static/images/docs.png
    M src/static/images/icon-circle.svg
    A src/static/images/icon-dimension.svg

  Log Message:
  -----------
  Merge pull request #1 from inclusive-design/master

merge upstream master


  Commit: 1f584df746c4b13acbdb2b1f637a38a89e72ec0d
      https://github.com/inclusive-design/guide.inclusivedesign.ca/commit/1f584df746c4b13acbdb2b1f637a38a89e72ec0d
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2018-02-28 (Wed, 28 Feb 2018)

  Changed paths:
    M docpad.js
    M package.json
    M site-structure.json
    M src/documents/activities/CauseAndEffect.html.md.handlebars
    M src/documents/activities/InclusiveDesignMapping.html.md.handlebars
    M src/documents/activities/MatchingGame.html.md.handlebars
    A src/documents/activities/ToddlerGrandparentConversation.html.md.handlebars
    M src/documents/css/idg.css.styl
    M src/documents/index.html.md.handlebars
    R src/documents/insights/AutonomousUser.html.md.handlebars
    M src/documents/insights/DisabilityAsMismatch.html.md.handlebars
    M src/documents/insights/IntegratedSolutions.html.md.handlebars
    M src/documents/insights/Interconnectedness.html.md.handlebars
    M src/documents/insights/OneSizeFitsOne.html.md.handlebars
    A src/documents/insights/PersonalDiscovery.html.md.handlebars
    M src/documents/insights/UserContinuedDesign.html.md.handlebars
    M src/documents/insights/VirtuousCycles.html.md.handlebars
    M src/documents/practices/Collaborate.html.md.handlebars
    M src/documents/practices/DesignForAdaptabilityAndFlexibility.html.md.handlebars
    A src/documents/practices/DesignForPrivacy.html.md.handlebars
    M src/documents/practices/FocusOnFunctionalNeedsAndPreferences.html.md.handlebars
    M src/documents/practices/PracticeCoDesign.html.md.handlebars
    M src/documents/practices/WorkOpenly.html.md.handlebars
    M src/documents/tools/AccessibleDesignTools.html.md
    M src/documents/tools/Infusion.html.md
    M src/documents/tools/Mindmaps.html.md
    M src/documents/tools/Personas.html.md.handlebars
    M src/documents/tools/Prototyping.html.md.handlebars
    M src/documents/tools/SynchronizedDesignAssets.html.md
    M src/documents/tools/UXWalkthroughs.html.md
    M src/documents/tools/UsabilityTesting.html.md
    M src/documents/tools/UseCases.html.md.handlebars
    M src/documents/tools/Wireframes.html.md.handlebars
    M src/layouts/index-template.html.handlebars
    M src/layouts/partials/footer.html.handlebars
    A src/static/images/InclusiveDesignMappingFacets.pdf
    A src/static/images/logo-P4A.svg
    A src/static/images/logo-floe.svg
    A src/static/print-branding/logo.svg
    A src/static/print/all.html
    A src/static/print/idg-print.css

  Log Message:
  -----------
  Merge remote-tracking branch 'inclusive-design/master'


  Commit: 9f51d4a57b7d8f4486843dd4e68ad244ec59c7b7
      https://github.com/inclusive-design/guide.inclusivedesign.ca/commit/9f51d4a57b7d8f4486843dd4e68ad244ec59c7b7
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2018-02-28 (Wed, 28 Feb 2018)

  Changed paths:
    M site-structure.json
    A src/documents/activities/VirtuousTornado.html.md.handlebars

  Log Message:
  -----------
  FLOE-544: initial structure for new entry.


  Commit: 9dbb26cf093da631b023e48748cd8761c499a791
      https://github.com/inclusive-design/guide.inclusivedesign.ca/commit/9dbb26cf093da631b023e48748cd8761c499a791
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2018-02-28 (Wed, 28 Feb 2018)

  Changed paths:
    M src/documents/activities/VirtuousTornado.html.md.handlebars
    A src/static/images/VirtuousTornado01.png
    A src/static/images/VirtuousTornado02.png
    A src/static/images/VirtuousTornado03.png

  Log Message:
  -----------
  FLOE-544: initial figures.


  Commit: 5043f466c65621f9f384b2428d87becbc70dd77a
      https://github.com/inclusive-design/guide.inclusivedesign.ca/commit/5043f466c65621f9f384b2428d87becbc70dd77a
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2018-02-28 (Wed, 28 Feb 2018)

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

  Log Message:
  -----------
  FLOE-544: add initial text.


  Commit: 33b0df97f9e02f1fd54905cf94bd6001490ff29d
      https://github.com/inclusive-design/guide.inclusivedesign.ca/commit/33b0df97f9e02f1fd54905cf94bd6001490ff29d
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2018-02-28 (Wed, 28 Feb 2018)

  Changed paths:
    M src/documents/activities/VirtuousTornado.html.md.handlebars
    A src/static/images/VirtuousTornado04.png

  Log Message:
  -----------
  FLOE-544: add virtuous tornado image.


  Commit: 37116c61e3fd3c34e6ceecbe2e351c81a43a731a
      https://github.com/inclusive-design/guide.inclusivedesign.ca/commit/37116c61e3fd3c34e6ceecbe2e351c81a43a731a
  Author: Alan Harnum <aharnum at ocadu.ca>
  Date:   2018-02-28 (Wed, 28 Feb 2018)

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

  Log Message:
  -----------
  FLOE-544: update text.


  Commit: 9ea095948f39d84bb6becbd31ac0f9dd5f246fd1
      https://github.com/inclusive-design/guide.inclusivedesign.ca/commit/9ea095948f39d84bb6becbd31ac0f9dd5f246fd1
  Author: Alan Harnum <waharnum at gmail.com>
  Date:   2018-02-28 (Wed, 28 Feb 2018)

  Changed paths:
    M site-structure.json
    A src/documents/activities/VirtuousTornado.html.md.handlebars
    A src/static/images/VirtuousTornado01.png
    A src/static/images/VirtuousTornado02.png
    A src/static/images/VirtuousTornado03.png
    A src/static/images/VirtuousTornado04.png

  Log Message:
  -----------
  Merge pull request #19 from waharnum/FLOE-544

FLOE-544: add Virtuous Tornado activity to Guide


Compare: https://github.com/inclusive-design/guide.inclusivedesign.ca/compare/4ffb18e6f52d...9ea095948f39