Don't call google search in dashboard if env is dev
fruga heroku needs Gemfile.lock
Remove duplication about perpage from blog
fruga heroku storage in s3.amazonaws.com
fruga mail configuration
Merge branch 'master' of github.com:fdv/publify
Clean spec and remove specs on view
Add published at to order article
Release 7.0 stable
Merge branch 'master' of github.com:fdv/publify
Update links on README and general copyedits [ci skip]

- Should be called "Simplified Chinese" in language list
- Change link to clone Publify to use the HTTPS version
  as the git link does not generate a link under Markdown
- Basic theme list should only list three items, the extra
  bit about screenshots serves better, neater as addendum.
- Link to FAQ hosted on GitHub wiki has moved
Merge pull request #244 from randomecho/copyedit-readme201309

Update links on README and general copyedits
Fix lists, links in Bootstrap theme README [ci skip]

- Sub-lists need indent to properly show on README render
- Update the heading numbers to match TOC
- Updates links to Bootstrap after they moved from Twitter
- List under Views section should only list two items,
  move the other bullets out into separate Exceptions list
Merge pull request #245 from randomecho/copyedit-readme-bootstrap

Fix lists, links in Bootstrap theme README [ci skip]
Merge branch 'master' of github.com:fdv/publify
Fixes a bug where failing at publishing a note would redirect to Admin::ContentController#edit and crash the application instead of redirecting to Admin::NotesController#edit as it should. Issue #247.

Makes Admin::NotesController inherits from Admin::BaseController like Admin::ContentController and Admin::PageController.

Moves private method parse_date_time from Admin::ContentController to Admin::BaseController to avoid code duplication.
Fixes a bug where failing at publishing a note would redirect to Admin::ContentController#edit and crash the application instead of redirecting to Admin::NotesController#edit as it should. Issue #247.

Makes Admin::NotesController inherits from Admin::BaseController like Admin::ContentController and Admin::PageController.

Moves private method parse_date_time from Admin::ContentController to Admin::BaseController to avoid code duplication.
Merge branch 'master' of github.com:fdv/publify
Merge branch 'bugfix_7.x'
Fix codeblock in Bootstrap README to use Markdown indent