[Commotion-admin] [commotion-docs] Merging recent changes from staging to master. (#165)

[critzo]

You can merge this Pull Request by running:

  git pull https://github.com/opentechinstitute/commotion-docs staging

Or you can view, comment on it, or merge it online at:

  https://github.com/opentechinstitute/commotion-docs/pull/165

-- Commit Summary --

  * updated FAQ content and CSS for indentation of questions and answers
  * Adding pagination to blog section.
  * markdown html converter enabled
  * removed error causing portion of pagination links, will return to add back later
  * udpated yml file and css for faq
  * Merge pull request #155 from opentechinstitute/issue-152
  * added OTI principles to Commotion about page
  * added OTI principles to Commotion about page
  * Merge pull request #156 from opentechinstitute/principles-values
  * additional Q/A added to the FAQ
  * Merge pull request #157 from opentechinstitute/addtl-faqs
  * div for about/principles content added, css for indentation
  * updated formatting on principles page
  * formatting on principles page - footnote
  * updated two faq links based on feedback from @andygunn
  * updates per @hakwinsnaf feedback
  * Merge pull request #158 from opentechinstitute/faq-041914
  * crossposting recent OTI blog posts
  * tweak to funding faq
  * Merge pull request #159 from opentechinstitute/news-items
  * updated some faq content
  * updated links to images in recent blog post
  * updates to faq, additional funders page, associated menu changes, addition of security blog post
  * addition of link to new page
  * removed authorship from group post per request by @andygunn
  * added link to mesh sayada case study on where it's used page
  * fixed bad link on FAQ

-- File Changes --

    M commotionwireless.net/_config.yml (5)
    M commotionwireless.net/_includes/about_menu.html (1)
    M commotionwireless.net/_includes/blog-recent-posts.html (1)
    M commotionwireless.net/_includes/menu.html (3)
    M commotionwireless.net/_includes/posts-by-date-min.html (10)
    M commotionwireless.net/_layouts/blog-front.html (2)
    M commotionwireless.net/_posts/2012-05-08-neighborhood-network-builders-summary.md (26)
    A commotionwireless.net/_posts/2014-04-18-case-study-mesh-sayada.md (20)
    A commotionwireless.net/_posts/2014-04-18-digital-stewardship-and-your-community.md (31)
    A commotionwireless.net/_posts/2014-04-21-commotion-and-security.md (61)
    M commotionwireless.net/about/faq/index.md (95)
    A commotionwireless.net/about/funding/index.md (20)
    M commotionwireless.net/about/guiding-principles/index.md (32)
    M commotionwireless.net/about/where-its-used/index.md (5)
    R commotionwireless.net/blog/by-date.md (0)
    A commotionwireless.net/blog/index.html (30)
    D commotionwireless.net/blog/recent.md (10)
    M commotionwireless.net/css/commotion.css (46)
    A commotionwireless.net/files/posts/041814-Case-Study-Sayada.pdf (0)
    A commotionwireless.net/files/posts/041814-Cover-Page.png (0)
    A commotionwireless.net/files/posts/041814-DS_blog_post_graphic.png (0)
    A commotionwireless.net/files/posts/041814-Detroit.png (0)
    A commotionwireless.net/files/posts/041814-Dharmashala.png (0)
    A commotionwireless.net/files/posts/041814-Digital_stewards_blog_post_small.png (0)
    A commotionwireless.net/files/posts/041814-Red_Hook.png (0)
    A commotionwireless.net/files/posts/041814-Tunisia.png (0)

-- Patch Links --

https://github.com/opentechinstitute/commotion-docs/pull/165.patch
https://github.com/opentechinstitute/commotion-docs/pull/165.diff

---
Reply to this email directly or view it on GitHub:
https://github.com/opentechinstitute/commotion-docs/pull/165
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.chambana.net/pipermail/commotion-admin/attachments/20140425/88462ac4/attachment.html>