[Commotion-admin] [commotion-docs] Merges recent changes into master branch (#149)

Tue Apr 15 14:59:34 EDT 2014

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/149

-- Commit Summary --

  * Update README.md
  * updated contact and bug report forms
  * Merge branch 'staging' of https://github.com/opentechinstitute/commotion-docs into staging
  * added text and graphic from 2 pager to the get-started page
  * added image for getstarted page
  * updated fax and added one question/answer
  * Merge pull request #131 from opentechinstitute/issue-129
  * Merge pull request #130 from opentechinstitute/issue-127
  * Adding initial blog post and image files for "How much does it cost?"
  * Okay, this time really adding the image files for "How much does it cost?" blog post.
  * Finished with various fixes to the markdown for How much does it cost.
  * Small fixes, bold, etc.
  * Added teaser image, updating styles for tables.
  * Added teaser image properly this time.
  * Merge branch 'staging' of https://github.com/opentechinstitute/commotion-docs into issue-128
  * Changed "building equipment" image to be a little less tall. It was just too big.
  * 1.1rc1 blog post
  * updated link to 1.1rc1 blog post release
  * Merge pull request #133 from opentechinstitute/1.1rc1releasenotes
  * updated promo on front page for 1.1rc1 release
  * Merge pull request #134 from opentechinstitute/1.1promo
  * updated formatting on release blog post
  * updated formatting on release blog post
  * updated email address on contact and bug report pages
  * replaced bad link on cck page to transifex.
  * updated links to 1.1rc1 downloads for Commotion router
  * Merge pull request #135 from opentechinstitute/4-14-14content-updates
  * updated link to tp link images
  * Merge branch 'staging' of https://github.com/opentechinstitute/commotion-docs into staging
  * updated text
  * updated css for mid-level screen size responsiveness
  * Merge pull request #139 from opentechinstitute/css-updates-4-14-14
  * requested classes created and applied. general image classes for container width and float added, infotable class added.
  * Merge pull request #140 from opentechinstitute/issue-128
  * added new faq per issue #132
  * multiple updates addressing issue #108, #141, #136 and #142
  * updated text per issue submitted.
  * Merge pull request #143 from opentechinstitute/issue-44
  * updated CSS for proper inclusion of AsapRegular as default font. Sans-serif fallback.
  * Merge pull request #144 from opentechinstitute/font-update
  * updated promo banner formatting and added items to developer resources submenu:
  * updated slideshow button styles and placement
  * Merge pull request #145 from opentechinstitute/banner-formatting
  * updated styles on slideshow buttons
  * Merge pull request #146 from opentechinstitute/banner-formatting
  * updated text per Issue #62 comment.
  * Merge pull request #147 from opentechinstitute/issue-62.1
  * updated faq entry for how commotion is funded
  * Merge pull request #148 from opentechinstitute/faq-update

-- File Changes --

    M README.md (6)
    M commotionwireless.net/_includes/blog-release-post.html (2)
    M commotionwireless.net/_includes/developers_menu.html (2)
    M commotionwireless.net/_includes/developers_resources_menu.html (8)
    A commotionwireless.net/_posts/2014-04-11-commotion-router-1.1rc1-release-notes.md (193)
    A commotionwireless.net/_posts/2014-04-14-how-much-does-it-cost.md (320)
    M commotionwireless.net/about/faq/index.md (124)
    M commotionwireless.net/about/press/index.md (4)
    R commotionwireless.net/contact/bak.index.php (0)
    A commotionwireless.net/contact/index.md (18)
    M commotionwireless.net/css/commotion-responsive-780.css (9)
    M commotionwireless.net/css/commotion.css (100)
    M commotionwireless.net/developer/resources/index.md (6)
    M commotionwireless.net/docs/cck/building-mounting/prep-install-rooftop-nodes/index.md (2)
    M commotionwireless.net/docs/cck/index.md (2)
    M commotionwireless.net/docs/get-started/index.md (53)
    D commotionwireless.net/docs/index.md (34)
    M commotionwireless.net/docs/supported-devices/index.md (2)
    M commotionwireless.net/download/routers/index.md (35)
    A commotionwireless.net/files/get-started-starting-network.png (0)
    A commotionwireless.net/files/posts/How-much-does-it-cost-building-equipment.png (0)
    A commotionwireless.net/files/posts/How-much-does-it-cost-gateway-connection.png (0)
    A commotionwireless.net/files/posts/How-much-does-it-cost-group-labor.png (0)
    A commotionwireless.net/files/posts/How-much-does-it-cost-icon-bandwidth.png (0)
    A commotionwireless.net/files/posts/How-much-does-it-cost-icon-equipment.png (0)
    A commotionwireless.net/files/posts/How-much-does-it-cost-icon-labor.png (0)
    A commotionwireless.net/files/posts/How-much-does-it-cost-neighborhood-network.png (0)
    A commotionwireless.net/files/posts/How-much-does-it-cost-small-Network.png (0)
    A commotionwireless.net/files/posts/How-much-does-it-cost-teaser-img.png (0)
    A commotionwireless.net/fonts/Asap SIL OFL Font License 1.1.txt (94)
    A commotionwireless.net/fonts/Asap-Bold-webfont.eot (0)
    A commotionwireless.net/fonts/Asap-Bold-webfont.svg (147)
    A commotionwireless.net/fonts/Asap-Bold-webfont.ttf (0)
    A commotionwireless.net/fonts/Asap-Bold-webfont.woff (0)
    A commotionwireless.net/fonts/Asap-BoldItalic-webfont.eot (0)
    A commotionwireless.net/fonts/Asap-BoldItalic-webfont.svg (147)
    A commotionwireless.net/fonts/Asap-BoldItalic-webfont.ttf (0)
    A commotionwireless.net/fonts/Asap-BoldItalic-webfont.woff (0)
    A commotionwireless.net/fonts/Asap-Italic-webfont.eot (0)
    A commotionwireless.net/fonts/Asap-Italic-webfont.svg (147)
    A commotionwireless.net/fonts/Asap-Italic-webfont.ttf (0)
    A commotionwireless.net/fonts/Asap-Italic-webfont.woff (0)
    A commotionwireless.net/fonts/Asap-Regular-webfont.eot (0)
    A commotionwireless.net/fonts/Asap-Regular-webfont.svg (147)
    A commotionwireless.net/fonts/Asap-Regular-webfont.ttf (0)
    A commotionwireless.net/fonts/Asap-Regular-webfont.woff (0)
    M commotionwireless.net/index.md (4)
    M commotionwireless.net/js/commotion-front.js (8)
    R commotionwireless.net/report/bak.index.php (0)
    A commotionwireless.net/report/index.md (36)

-- Patch Links --

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

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