typo 6.0.6 → 6.0.8

data/CACHE.SETUP.README

@@ -0,0 +1,53 @@
+To fully profit from Typo static caching capabilities, you need to add the
+following rewrite rules to either your .htaccess or your virtualhost after
+declaring the document root.
+
+== Rewrite Rules For Apache
+
+=== If Typo is installed at your URL root.
+  
+  RewriteEngine On
+
+  RewriteCond %{DOCUMENT_ROOT}/cache/index.html -f
+  RewriteRule ^/$ /cache/index.html [PT]
+
+  RewriteCond %{DOCUMENT_ROOT}/cache/%{REQUEST_FILENAME} -f
+  RewriteRule ^/(.*)$ /cache/$1 [PT]
+
+  RewriteCond %{DOCUMENT_ROOT}/cache/%{REQUEST_FILENAME}.html -f
+  RewriteRule ^/(.*)$ /cache/$1.html [PT]
+
+=== If Typo is installed in a sub-URL, e.g., /blog:
+
+  # Note that 'blog' appears twice in the rewritten URL.
+
+  RewriteEngine On
+
+  RewriteCond %{DOCUMENT_ROOT}/blog/cache/blog.html -f
+  RewriteRule ^/blog$ /blog/cache/blog.html [PT]
+
+  RewriteCond %{DOCUMENT_ROOT}/blog/cache/%{REQUEST_FILENAME} -f
+  RewriteRule ^/blog/(.*)$ /blog/cache/blog/$1 [PT]
+
+  RewriteCond %{DOCUMENT_ROOT}/blog/cache/%{REQUEST_FILENAME}.html -f
+  RewriteRule ^/blog/(.*)$ /blog/cache/blog/$1.html [PT]
+
+== Rewrite Rules For Nginx
+
+  if (-f $request_filename) {
+    break;
+  }
+
+  if (-f $document_root/cache/index.html) {
+    rewrite ^/$ /cache/index.html break;
+  }
+
+  if (-f $document_root/cache$uri) {
+    rewrite (.*) /cache$1 break;
+    break;
+  }
+
+  if (-f $document_root/cache$uri.html) {
+    rewrite (.*) /cache$1.html break;
+    break;
+  }

data/UPGRADE

@@ -0,0 +1,66 @@
+UPGRADING TO TYPO 6.0.5 HOWTO
+
+*** BEFORE UPGRADING ***
+
+Pre migration steps are divided into 2 categories : things you should do, and things you must do.
+
+You should make a backup of your current blog, either using a file transfer software or an archiver like zip or tar.
+
+You should make a backup of your database, using either mysqldump, pgdump or phpmyadmin, whichever you feel safe with.
+
+If you're upgrading from a pre 5.0 version, you should remove all the following sidebars before migrating:
+
+* AIM presence
+* Audioscrobbler
+* Backpack
+* Delicious
+* Flickr
+* 43 things
+* 43 places
+* Magnolia
+* Recent comments
+* Tada
+* Upcoming
+* Xbox
+
+These sidebars have been removed from Typo core at 5.0 and are now hosted on a separate repository. You can also migrate, then reinstall those plugins before trying to access your blog frontend or admin.
+
+If you're using a Typo version priori to 5.1, you must manually remove the lib directory inside your typo install.
+
+If you're using a third party theme, you'll have do some changes to your template as well. This is explained later.
+
+*** UPGRADING ***
+
+Upgrading should be a really easy process, depending on how you installed your typo first.
+
+First, stop your Typo installation. As Typo installer does not exist anymore you won't be able to use typo start / stop anymore.
+
+I assume you're running typo on a production environment, so firt run:
+
+$ export RAILS_ENV=production
+
+Then, rename your whole Typo directory to some safe place and replace it with the new one.
+
+$ mv typo_path old_typo
+$ mv new_typo typo_path
+
+Move your old files, theme, database.yml and any file you want to keep to your new Typo install.
+
+$ mv old_typo/themes/yourtheme new_typo/themes
+$ mv old_typo/public/files/ new_typo/public
+$ mv old_typo/config/database.yml new_typo/config
+$ ...
+
+Check that your Web server has the right to write your Typo install, then restart your Typo instance. 
+
+
+* UPGRADING DATABASE *
+
+Login in to your Typo admin using your favourite web browser. You'll access to the database migration page. Just click on the "migrate" button.
+
+If something goes wrong, go back to your terminal, and run
+
+$ cd typo_path
+$ rake RAILS_ENV=production db:migrate
+
+If things really goes wrong, then please ask for help on the Typo mailing list or on IRC #typo@irc.freenode.net

data/typo.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "typo"
-  s.version     = "6.0.6"
+  s.version     = "6.0.8"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Frédéric de Villamil", "Matijs van Zuijlen", "Yannick François", "Thomas Lecavellier", "Cyril Mougel"]
   s.email       = ["frederic@de-villamil.com"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: typo
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 63
   prerelease: 
   segments: 
   - 6
   - 0
-  - 6
-  version: 6.0.6
+  - 8
+  version: 6.0.8
 platform: ruby
 authors: 
 - "Fr\xC3\xA9d\xC3\xA9ric de Villamil"
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-02 00:00:00 +02:00
+date: 2011-08-13 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -33,14 +33,9 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- CHANGELOG
-- Gemfile
-- MIT-LICENSE
+- CACHE.SETUP.README
 - PostInstall.txt
-- README.textile
-- Rakefile
-- TODO.todo
-- config.ru
+- UPGRADE
 - typo.gemspec
 has_rdoc: true
 homepage: http://typosphere.org

data/CHANGELOG

@@ -1,1442 +0,0 @@
-commit a06c78d321b14b030b6d24cdf504c5ed815b961c
-Author: Yannick Francois <yannick.francois@free.fr>
-
-    fix spec error in category model, fix order with rails override default_scope method
-
-commit f415a01a01762154edd1f8b3855269c453829810
-Author: Yannick Francois <yannick.francois@free.fr>
-
-    fix spec failure on controller. Clean settings update and category controller fixture and code
-
-commit 65a645c3fc5c257b74f6c6e2d5c4e7ea5b50c6fd
-Merge: 143baf3 a668a5e
-Author: Frédéric de Villamil <frederic@de-villamil.com>
-
-    Merge pull request #25 from justinbkay/master
-
-commit aee952497bf5fd42a0b99fe5024d6aa3a093e281
-Merge: 65a645c f415a01
-Author: Frédéric de Villamil <frederic@de-villamil.com>
-
-    Merge pull request #26 from yaf/master
-
-commit 430a73cc9832d86079e4d0112d98d684db35d6e3
-Author: Justin <justinbkay@gmail.com>
-
-    Edited config/initializers/access_rules.rb via GitHub
-
-commit ffef976fa0198566fa7cb88763869b69509fdee2
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Turn of syntax highlighting for metrical/metric_fu.
-
-commit a51c3e5d788dc7dbecd78878d3da9df27abbdacc
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Add validation on Blog#blog_name.
-
-commit 851b38e285952858523f099ad45745bdb0f97c91
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Do not autosave when setting a setting.
-
-commit d889ecdb67d2a56b3576e543c91889bee96685c7
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Simplify setup controller: Let models do input validation.
-
-commit 7acb06115f48b53a464da5da2c088b89feb4fbfd
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Avoid unnecessary database access in Blog specs.
-
-commit 5bba4f9b48ceda2380a0540c0c2bd77d812dcd36
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Simplify render in controllers (Rails Best Practice).
-
-commit 96bf5db9bae3da4f5f0c2d01e36f158647f19005
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Fix deprecation warning.
-
-commit 08bad715208f2dd16a46dacfe29dfeef83306716
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Fix typo.
-
-commit 197b7b00085bfea830d62f82a333316ddb3b2aef
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Remove trailing whitespace.
-
-commit 52445259731a4427b8dc3fc9bd702bf033fa9746
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Simplify render in views: themes and articles.
-
-commit 278be15bbaeb779454ef9d641de4e55e3b57a36d
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Simplify render in views: other non-admin templates.
-
-commit ebe5b04ee2ba84059c953c70b8688e47e50ca40e
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Simplify render in views: admin.
-
-commit 602b9b8f14b4de86421ec39f6c278d46318320a5
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Simplify render in views: feed builders.
-
-commit a6fc8e9e33477a533f6303e1582102afacc19c8d
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Remove duplicated article_content partial.
-
-commit 16a989064751e2f926d9098a112d49e59fd113ec
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Make all theme text translatable.
-
-commit 9729e1e55709fb2f323f2f7f3c6064bbcdf58832
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Simplify test, fixing ordering issue.
-
-commit 99f6cbaedd11bbd2e6c84584f82dd76465b33369
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Speed up XML controller spec.
-
-commit 2221da8492310afa1eda37234f937231a3cd1e22
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Factor password-protected article view logic into partials.
-
-commit 0e206fec58cee7833276988748afbfe1e9266311
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Make themes use new password-protected article partials.
-
-commit 38b22400cde61894bdc48191fe4172cc2b500cc4
-Author: Eric Sorenson <ahpook@gmail.com>
-
-    Corrected URL to sidebar plugin wiki page
-
-commit d966eaba59ef9be2694c3bc2d5d5307aaccaa8a8
-Merge: 0e206fe 38b2240
-Author: Frédéric de Villamil <frederic@de-villamil.com>
-
-    Merge pull request #28 from ahpook/master
-
-commit 24b1ee01d771ecc2eafc5622c264d89e2827073e
-Author: Yannick Francois <yannick.francois@free.fr>
-
-    just remove :contributor fixture
-
-commit a7964f419c6b94ee816827172b3a4e8bbbdc6747
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Fix up migration 093, both up and down.
-
-commit cddc9bd4e45aac08cc6a15918ea9a0157d485f75
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Any content can have redirections.
-
-commit 965b2216777e4e5d61913f4ffe21871bb8e19884
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Properly indent migration logging for migration 093.
-
-commit 31e50e3fd8b16bbd65d7936e4a04d87393796c5d
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Add a TODO: Clean up themes.
-
-commit c4314cf116338eecc801d2c2f71f6aa382bcd1a3
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Use flickraw with cached API knowledge.
-
-commit e876760bc7f883449f4408457c9eeff2c7da95e0
-Author: Frédéric de Villamil <frederic@de-villamil.com>
-
-    Moving to MySQL 3.0.8
-
-commit 985b8df3e47b782c57c8e32a8bb38e76e07a51e7
-Author: Maarten Mulders <m.th.mulders@xs4all.nl>
-
-    Updated a part of the missing Dutch translations
-
-commit 5d9f852aaee9024ef57ca8f41fa4f265268e4b5a
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Use say instead of puts in migrations.
-
-commit 86f4d68770c637c42a581249bf3a2727a2574541
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Make entire migrate/rollback cycle work.
-
-commit 0377de0e08223142abab2306ba0ddaa14b17ecc1
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Remove empty helpers.
-
-commit e220b77aec27057745a9e1ab19e43820db6600ee
-Merge: e876760 985b8df
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Merge pull request #30 from mthmulders/master
-
-commit 47068dbf1ddf628007be34c8db004dcd2bd3a33d
-Author: Frédéric de Villamil <frederic@de-villamil.com>
-
-    Upgrade to Rails 3.0.9 (yes, this is Rails indeed, see my previous commit)
-
-commit 1d300196ca030ff6c3b0753a6f7b7689b55e0292
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Small Law of Demeter fix (eases mocking for view specs).
-
-commit 4466e9e03e5599fe968cb6f0ea2a6e8147e4dbae
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Start creating specs for admin views.
-
-commit 74536f96dd343d0e397f1c0c1eda6f69a7fcb3be
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Law of Demeter fix for User.profile.label.
-
-commit 5e9250442d483a3720f292b39c43c8960b6b70a9
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Don't stub out subtabs_for anymore in spec.
-
-commit 48eaa39a91524c5bba715d06d1b6e040f0baf140
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Specs for new content view should use an Article that behaves as new.
-
-commit 6e32ab4be7571ddc4422db03bf235e5ea643def5
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Fix rendering of image carousel in content (article) form.
-
-commit 8b8776e9de85b04831d4ee3f5729330c754a675f
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Mock out all database access for admin/content/new view spec.
-
-commit 9718e6549766bd4adb6de35183a2b6a23c399a56
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Remove superfluous text_filter form field.
-
-commit d881dca4f5b04d4e07fc7ad181b95228d1031595
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Fix rendering of image carousel in page form.
-
-commit 7d985e91e6ca8aa6af1fb03cc1a0f79d3299d80b
-Merge: d881dca 47068db
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Merge branch 'master' of github.com:fdv/typo
-
-commit 240af082440410bb0c4c45bf86a3c67cff84e13d
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Make down for migration 082 complete.
-
-commit be92c5cd980fb0dbd22446e55957c239b99cb1d7
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Replace complicated migration 068 with a simple rename.
-
-commit dca67e798977da240636a2d15ea388bf7da9c659
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Avoid STI errors in migration 093.
-
-commit 064719238e8b1ff486461ea9991f82939012b37f
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Remove dependency on present model code in migration 096.
-
-commit 4f1336ebf34ea14e1c834b0994a9250168a6e9bf
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Remove unused method in migration 024.
-
-commit 66fe732e528cd12746999fe1f0a64758d4ce9de4
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Avoid STI errors in migration 058.
-
-commit 4174e23a9bca431bc7f403647243147c799734d8
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Add fake models to migration 067.
-
-commit e2d101433b5263e14f67894620c08b8acb04f1bc
-Merge: 4174e23 24b1ee0
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Merge pull request #29 from yaf/master
-
-commit 8cbbb51ebe28311e0909b06b433f1c7dd7920d6b
-Merge: e2d1014 430a73c
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Merge pull request #27 from justinbkay/master
-
-commit 79a2635cb2ed98cb9bfd8a8c6b98e2b6bb90db2c
-Merge: 8cbbb51 75dbc8e
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Merge remote-tracking branch 'silviorelli/master'
-
-commit 62289bfdca4cfb164d88f5d70f544b238faec332
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Add reCaptcha support to the True Red theme.
-
-commit 4d9fb0f0088f2691531165b3c77583d666d082ec
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Fix RedCloth gem to a version that compiles with GCC 4.6.0.
-
-commit 2d1d0cf9e81bb181086df748fd998e6213401b37
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Fix up retrieval of use_recaptcha setting in views.
-
-commit 9725039d81dc4c79a47fdd366ca4ae244b84e423
-Author: Melanie Shebel <warchildbosnia@gmail.com>
-
-    Edited README.textile via GitHub
-
-commit fc2314df8eb5222fb4f1f8e08849c3864b779f34
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Replace inject([]) with map.
-
-commit b9d91239bebb097f664c098775625e3e8580b61d
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Replace inject('') with map plus join.
-
-commit 13df024567c2600f0b25399ec65908451b4bcae6
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Fix Content#short_url for sub-uri blogs.
-
-commit 17b2b7c41239500fbdbba179b602ee30bdb9f89b
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Fix redirect where to_path is a full URL and the blog is in a sub-URL.
-
-commit 431d1f99cf69af115b85e0344c158edd95049a56
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Speed up article specs.
-
-commit bc0b3c4b850192c0987c4ca25abc7eae22dbb1ec
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Move atom feed spec for special characters to view spec.
-
-commit 5bf6e0dc5887a8fe09d3bd5523742812cb854c5b
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Remove unused XmlController methods.
-
-commit d475d627364dd3602fd14bd56980186aa95386ce
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Don't need Article instance to test articlerss redirect.
-
-commit be753d8c58b2630a65b169045f18c2d9a6e1f6aa
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Use stub_model to avoid hitting the database.
-
-commit a5c7759db8022326a449e35702047782f7d353cc
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Make handling of unsupported type similar to unsupported format.
-
-commit 015000e01e05f8daad481a9f6458b156dde24087
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Add (passing) specs for TrackbacksController#index for feeds.
-
-commit 41357cec59b2fa6f1daa77e4b6a6b9ebfb2df69d
-Author: Yannick François <yannick.francois@free.fr>
-
-    patch migration 81 to work
-
-commit f8997896423cff5a68fb3b2a70d12a2f717ddcc2
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Make atom and rss feed builders shared partials.
-
-commit 4498feff7221ac894e4131ed0a5926c1f33ae0d6
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Add view spec for atom feed of trackbacks.
-
-commit c6748e5b7fe41aaaa3ec1db3b2d64d4d6d76fba2
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Spec RSS feed view.
-
-commit 5539779a1956219b506b86a0db2ae4fe99f211e0
-Merge: 41357ce c6748e5
-Author: Yannick François <yannick.francois@free.fr>
-
-    Merge remote-tracking branch 'upstream/master'
-
-commit ee7e17899988aef35e6d65d84f3af89f492c5344
-Author: Yannick François <yannick.francois@free.fr>
-
-    moove some test from category_controller to category model
-
-commit 63c69dafeeca5e32eef914cfa9df9b2fb50e37e6
-Author: Yannick François <yannick.francois@free.fr>
-
-    extract method, test refactoring, to improve test time execution and code understandability
-
-commit ced7fd474c9cf67e7ab41c68d66cc4da6d790a57
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Fix up feedback table name in migration 067.
-
-commit c1bffe131ded73835e9202bcf64ee09482419b4b
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Make migration 081 also succeed with items in the cache.
-
-commit d45b3e296cb89f0fe954d003ca47c73ebdf0bd31
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Add check that rendered feed is of type RSS.
-
-commit c57db7e93323eb5df82c053433ec4357c6d23c1f
-Author: Yannick François <yannick.francois@free.fr>
-
-    refactoring to reduce test execution time
-
-commit 1bf33c132f83c56fe1beb0e18debb40dd9587ecb
-Merge: c57db7e c1bffe1
-Author: Yannick François <yannick.francois@free.fr>
-
-    Merge remote-tracking branch 'upstream/master'
-
-commit ada18831929fe14f0f76becc8a4f0d4f3b17f33b
-Author: Yannick François <yannick.francois@free.fr>
-
-    improve test time execution
-
-commit 3c361f9eae8766cb84b60135c9c1b8c05f8e9a85
-Merge: d45b3e2 ada1883
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Merge pull request #32 from yaf/master
-
-commit 1c63fcb8525ae2d0a75d53249083feb7f4044925
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Splits administration CSS stylesheet into structure and colors. Adds some documentation for more clarity. Global structure and fonts are in administration_structure.css. Colors related info are in administration_colors.css
-
-commit 81d99927ce0ddb2b39f90cf481f3f78ad98af3e8
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    A few fixes in the file manager. We really ned to get a common one for both standard and visual editors. Anyone willing to take over it?
-
-commit bc2093b80f703dbf2d38ddfdf078fc5dc2b6d4a1
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Fixing broken sidebar configuration.
-
-commit 8735b93b63b4a4c5a41970c30d91bec64adb3d1c
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Removing debugs
-
-commit bfdca969505410602d1472b5dced8ccd77eb78b4
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Fixing sidebars publishing.
-
-commit 422b91f8e35ec3c9e46d40094b638b35c2790af0
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Add check to view spec that rendered feed is of type Atom.
-
-commit 658a17fc9481ec0d269a7c0bb0b31b90fb03f6c5
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Use direct XML parsing to check the RSS feed also
-
-commit 58f945244f6d15869e3c8e00c058c93007bcaf7c
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Split large spec on Trackback model.
-
-commit 3fc4e7a3ee3d776d9d195bd8427244717db21c48
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Split large atom feed view spec for trackbacks.
-
-commit 532a9b1196093e149cec9dbb80be5ca4950db9c5
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Show current typo version number in atom feed.
-
-commit ef573e86cf312c7b256a3a74b8e83f6818536eb9
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Remove feed validator checks for items covered in the view spec.
-
-commit 733818a6bbe6c8f999c76f783e573893dd1887ea
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Migrating users to the same config manager we're using for blogs.
-
-commit 1b072b1420d5caad715b725bd4ded5168b742fbb
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Ensure editor selection works even with a bogus user.
-
-commit c1acfa56cb4c9683b829f54216eaed0c474c98d6
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Give articles index Atom feed its own template.
-
-commit 5a0c2a7f544bc6e7a712ac8a33c64cc46f7c5706
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Specify assigns for article feeds.
-
-commit bacc4c66f4c0303d7440c3bbed0673d90cbf938d
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Give article feedback Atom feed its own template.
-
-commit f132f97842d3502165f89f2c46dba56a383ed935
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Use article index Atom feed template for search results.
-
-commit 4d63538209c61a930ce8c4782ca655b6d3368d90
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Move article comment feed spec to view specs.
-
-commit 97ee400e285f6b6ad2843c25403d726298002c49
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Give articles index RSS feed its own template.
-
-commit 5ddce99059985f416d5ec372d8262e21bfe7679e
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Give article feedback RSS feed its own template.
-
-commit 48d5f21a250d25745dc50272b8fde6a6a9410583
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Use article index RSS feed template for search results.
-
-commit 28d909ed6bc1e143f417242c0ca9914a11a7731c
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Fixes a 404 on 2 gifs in the admin. This unfortunately won't fix them when blog uses a sub URI.
-
-commit 1ce83332dd5c4bccaa58ef63cfd461f661da8b37
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Remove now unused render_feed method.
-
-commit 07f9da6b2c6f0c69f24d7ff7fdbd83fd6f96f6ef
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Re-enable spec for ignoring the HTTP Accept header.
-
-commit af3674168fc204a4d5ccd6fc533086065e931f80
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Fixes a buggy default setting that desindexes tags pages.
-
-commit 3699ebc49ef94cae1799912c8e69db6b1cf34145
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Makes categories listing a bit more useable adding some important information.
-
-commit bc1b6b8424b7b01640685870d9fe8d99be8556be
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Adding a bit of readability to articles / tags / categories lists
-
-commit f53cc0c5363f451b87fec0c145b660076b31f7cb
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Improves article lists readability.
-
-commit 8eaa22d82e9ceb9f03e26e6390317ed7ed3e948d
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Makes migration 95 work backward too
-
-commit 91d4628f266a9a583e2d6675f3ceea3cbd774bab
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Reorganizes admin menus and submenus.
-
-commit 5b35f9499aa8c6a82a49cc1ae6420c1a4c6d3014
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Fixing category controller specs
-
-commit 772c6afe009d3f2622314d12551617c46729a5f6
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Give trackbacks index Atom feed its own template.
-
-commit 59ceb506a15de7011fcc95cd230300f4a00334d7
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Extract atom trackback item template.
-
-commit cc613a392a3556f3095d71d3432a2ff49388e2db
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Give trackbacks index RSS feed its own template.
-
-commit fbd171e2b8fa7f3273e3e2cb07b311329951d65e
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Give comment index Atom and RSS feeds their own templates.
-
-commit ce2e5ac880f09f7ef1699faed56df2016cb05105
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Fix RJS for sidebar admin.
-
-commit 7eb3c5fb56cdbbdc2eb11116a3742acb3dbff4cf
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Render correct id for items in article feedback Atom feed.
-
-commit 6119e448096ff5950f209b81dc4f40702270da6d
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    No need to re-test feed validity.
-
-commit cf05decb590c5bc4f88de705f4c0741b450c7fec
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Clean up spec for AuthorsController#show.
-
-commit 89a121e9144f885fc761b7da975d8a79663a890e
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Fetch author's articles inside controller.
-
-commit 01c72c387e4277d8df1f10768cf8834377d751b1
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Extract Atom feed header into a partial.
-
-commit 5c3fecb8f0789bacd0019b7274cc8912481ef41a
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Use stub_full_article helper in articles atom feed view spec.
-
-commit c8c9582abfa7a496f7b09adbf0031d939d4bac02
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Fixes tabs / subtabs in admin + specs.
-
-commit a8b4cb53a8e3a817847d15c6e682c9aab05abc81
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Forgot to add migration to add new rules for articles and pages.
-
-commit f6a3344905f86835520ce65ee8f87e5010cac189
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Fixes a bug making theme catalogue exploding when Typo does not have internet access or has DNS failure.
-
-commit cd5979b6e4af20634f8b24654990c7696e77337e
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Fixes tag controller specs
-
-commit b7cc6607a50b0a7f6f3843e5007d298b200b77ba
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Fixes author sidebar count display
-
-commit 0338c06384447d2b2cef722ebdc5462b473fbe5e
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Give Atom and RSS feeds for author articles their own templates.
-
-commit e2a02f9a80a138846a902d8b997d03506abbde25
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Create spec for atom header partial.
-
-commit c449a88ebfb59f35a2c6f7573e5cdc0df64839b3
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Make grouping controller use article's feed templates.
-
-commit 39613b882c3a9d687811ca58d682eb848129f918
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Speed up CategoriesController specs.
-
-commit c50549f4af77db678d37e62bcc504f17ef1a8916
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Give Write New Article link more importance. Improves admin header readability
-
-commit 9eaf50117695e9a17777c69b504c9c5233f8d9a6
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Make feedback controller use individual templates.
-
-commit 3863ae180f5dfbbd9fbf0f3e5d9a4a5ca60d600c
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Adds options to articles and pages.
-
-commit d28950ea0e112b358c772ea73210a549727bad4a
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Adding some text shadow here and there. A little bit of eye candy
-
-commit 43835fc45a1e6cb1ee57835da3101ae28dd5eb8f
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Makes simple and visual editor buttons look (more or less) alike.
-
-commit e4838cdcf135044275684786c146d4a9ff56a509
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Test atom feed view partial for articles with tags, categories and resources.
-
-commit 997f6f0ee1a514f3e7f174642e8fde57c48a5b10
-Merge: 43835fc c449a88
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Merge branch 'master' of github.com:fdv/typo
-
-commit 775fcc4551abc42bec71b6f546681560c7c2f1c8
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Fix tag factory: display name, if set, should not be different from name.
-
-commit a6b39ccd71acf6bbb301357c747444589248d0ce
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Remove now-superfluous inclusion of Rake::DSL.
-
-commit 29c6cc2043f462bc7d506af5ec5431ff05540bee
-Merge: a6b39cc 997f6f0
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Merge branch 'master' of github.com:fdv/typo
-
-commit f98afdad61ace81787ce5564c70be441059a9c91
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Use a partial to render each article entry in tha articles Atom feed.
-
-commit 364c9525cc3a816bf6d17483ffd81e069bed267f
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Use the article partial in the authors Atom feed.
-
-commit 658e8108b709125202f57d7f5995450db91186c5
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Fix rendering of resources in article Atom partial.
-
-commit 8df2ce10febf0223fc9a8630239190181ebd7c47
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Fix user factory and fixtures to make all specs pass.
-
-commit 89e1fb1e1524bc85578337992d34dc4921c34592
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Protect password-protected articles in Atom feed (again).
-
-commit 15af968a0149c9334507bae6af926c651ddb7d53
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Hide extended content if the blog says so (again).
-
-commit 5703a3250de84daf6ec0f6a8f9d08ddbc51f5cc2
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Remove secret-leaking summary element from article Atom template.
-
-commit ae6bea55cc8b7421e1b5bb745483f2f5f037d78a
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Show RSS description in Atom feed article entry.
-
-commit 1f33b984cf6401c0659e4de28e6cf0970687ec11
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Remove shared Atom feed builder and all #to_atom methods.
-
-commit 0dd5efa2ebce92a05edc0af8dc8225d2cff8a888
-Author: Yannick Francois <yannick.francois@free.fr>
-
-    clean spec on categoriesController SEO Options to prepare time execution improvement
-
-commit c9eb71f63aa5ea4e75f0456d98304c0d93214de9
-Author: Yannick Francois <yannick.francois@free.fr>
-
-    add spec on set_noindex method and clean grouping_controller code
-
-commit 8846ee960ee2f475d73d388f5323047f112e5e99
-Author: Yannick Francois <yannick.francois@free.fr>
-
-    refactoring SEO Options on article_controller_spec
-
-commit 49c7fe635d13712483b299bacc2e34a5051653ee
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Create RSS item partial for articles.
-
-commit 547c1e3f1eaa2bdfd5b8b2abf7ee86ac7b19217d
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Add spec for non-ascii permalinks in RSS.
-
-commit da4fa193b77499f7b03c771046402d77092cf0cb
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Use the RSS article partial in the authors rss feed.
-
-commit 3606e2fac6f74d7c2759ad4617a9d0a96d100bcb
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Use trackback and comment partials in article feedback RSS feed.
-
-commit 6cf5dc51830235549e2f74f9b0e41ba39bc21ffc
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Simplify feedback atom feed spec.
-
-commit 25cb69df3e8b539dfabe7eadf9c9564bdbaaca9b
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Remove shared RSS feed builder and all #to_rss methods.
-
-commit adcc69741033a4e9ad5b6632a3754af9420e8dd4
-Merge: 25cb69d c9eb71f
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Merge branch 'master' of github.com:fdv/typo
-
-commit d484a05e9e68272de63551dc655b8404810f75e2
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Reformat XML controller specs.
-
-commit ef088cc4b10c48bf26844024983c51dac4dfee4b
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Clean up XML controller assertions.
-
-commit 08d5df7915f215b8cb9485aa5e56a8862754f26d
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Make ancient XmlController actions redirect to their final destination.
-
-commit 1ac761ad836ac448396db1121b34db345a130808
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Redirect XmlController#feed of type trackbacks to TrackbacksController.
-
-commit 939070a49addee941768db906610ff8be6133be3
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Collect #feed redirect specs in one describe block.
-
-commit 3e62f542d419dce8efca8cb78acb81b853f17eaa
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Clean up XmlController#feed as it now only needs to render googlesitemap.
-
-commit 321c0bde8798b4f05745dce3427be722ed2a35ca
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Remove now-unused rss and atom views for XmlController.
-
-commit 25267d5bbc343031860a5b1598ab9d82ebfff737
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Remove long-unused XmlController itunes views.
-
-commit 00b21d5eed88e566f140bd6d718e4a6db2d9a715
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Remove superfluous copy of rsd view.
-
-commit 41b929b1ca8ae4050c9ea4091c40a616182d1bc7
-Merge: 8846ee9 adcc697
-Author: Yannick Francois <yannick.francois@free.fr>
-
-    Merge branch 'master' of github.com:fdv/typo
-
-commit 2583435c5dc19f461f031df16478489cdfaeaea5
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Make #rsd use rsd format.
-
-commit 6345fc8fb9a02165690ec9342924335e8b2f484d
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Clean up RSD route.
-
-commit e9b0b650e3be22ef49c2c4edf6198cabce1b8064
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Remove unused catch-all route.
-
-commit d0eabe9568d3d5dbd471dae756b3d43ba581f62c
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Organize routes more logically.
-
-commit 7d56340b076a1837adf6a115426e6e0f49efd2c7
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Add specific route for XmlController#feed without format.
-
-commit 965b92aaab15360c6ff0b6bbbcc47c701f959cae
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Fix link to dashboard in administration layout.
-
-commit bc440a587224400292409cafe12078cb521126b3
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Change blog model specs to use existing route.
-
-commit 00541fc033f0b409ad8abd650d39206a86c1a4c0
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Add specific route for ArticlesController#markup_help.
-
-commit b1bfc68cf4954080e03283d89c18a303c248b921
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Add specific route for TagsController#check_password.
-
-commit 841f400b7b72287b6f11b67df4a037eb6122e9ce
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Fix specs to use correct controller.
-
-commit 6c72ae268ee20b5a23b8558c12e07f6dfffb57cf
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Fix User#permalink_url: There is no UsersController.
-
-commit fd7fe55c391009ddf5187b1102aed6ed6ba49681
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Fix remaining spec failures caused by the removal of the catch-all route.
-
-commit 798b2a8d709332b24ca0aea1c633d5d7d3bd6e9c
-Author: Huy Dinh <mail@huydinh.eu>
-
-    sqlite3-ruby was renamed to sqlite3; changing that in Gemfile, too.
-
-commit 49451a431484e1843ddac5e46ec248def0886159
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Reorganize CategoriesController specs.
-
-commit b64afaf00a9d544561cb702a0860448fe04b32d5
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Remove trailing whitespace.
-
-commit b459f5790f51c12e72e4e990c78e1cc273b7cad0
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Prevent down migration on migrations 098 and 100.
-
-commit 2026b6237adcc602f1762c5ba7793333933e1174
-Merge: 41b929b 49451a4
-Author: Yannick Francois <yannick.francois@free.fr>
-
-    Merge branch 'master' of github.com:fdv/typo
-
-commit 2590b7115095080defe26dd9f390999d6ce2a0b9
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Move comment partial under comments/.
-
-commit 54376e4f0cf801374cfd2bc78ae00800631bc679
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Remove duplicate comment_list partials.
-
-commit 23d7c7d7c2a6c5bbcc25f27d4da65550699a74ee
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Cleaning old code.
-
-commit 2dc44bc8bf9d29059f12531f049a2cfb9572b074
-Merge: 23d7c7d 2026b62
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Merge branch 'master' of github.com:fdv/typo
-
-commit 706de133cc41348665756080a2a100f5e09c613a
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Removing old, unused code since we're now using content#preview
-
-commit 36053308a8a7432b24a6d1b6109b7c72b6767dc8
-Author: Yannick Francois <yannick.francois@free.fr>
-
-    remove users fixture usage in account_controller_spec
-
-commit 47c2ba5a456a66379b04e9fb33f04235371ab4c8
-Author: Yannick Francois <yannick.francois@free.fr>
-
-    remove users fixtures in model's specs
-
-commit 16929b882c1847582d0b3dd64c3e9e2bfa51fd96
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Fixing a buggy behavior where a permalink could not contain a unique ID.
-
-commit 61d81a2d90d49b39e443d0ec5e8199d47013aa1b
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Adding permalinks SEO tab.
-
-commit 10e86d4ff3a0a21c7bb923cebe2477eb4e4cf867
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Forgot to add the seo#permalinks view in latest commit
-
-commit 2cff8ab2cd38b8396049712a7f0b6f4b61b8baa1
-Merge: 10e86d4 47c2ba5
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Merge branch 'master' of github.com:fdv/typo
-
-commit 7d42911209da0c02457560fbb67a8ea7245b5b02
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Adding some documentation + translation
-
-commit 3ed958718ba89ec57d9410e1831844f638e99bed
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    A bit of form styling.
-
-commit ef02008bbd4ebc6edab21eb7efdede9e81388e5a
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Fix automatic finding of file to render.
-
-commit 6f3dd59da8028ef7b5dd35ce8f2f163c52b590cd
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Changes permalinks form destination and Seo#permalinks behavior for further devs (further meaning now)
-
-commit d83dbfaf6f146ca01607bb731260798b1e164591
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Fixes post save redirects for SeoController
-
-commit 9adde9e05e929b6f08a96fd61babc9daa3ca49b5
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Pull out blog creation to outer before block in article view spec.
-
-commit 9f6c33e415d1191689fe5f6799426b459eb18c53
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Pull out article creation to outer block in article read spec.
-
-commit 17c6ddb78d86a81e41cdf3941c213ebcaa8411c3
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Pull out remaining before block contents in article read spec.
-
-commit becbb1ec37a2ad2d3b7e938f20f9f7ea31bc59b9
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Clean up and reformat context blocks in article read spec.
-
-commit 74c97e5debca96c00fdf01241d1da0c49c211c6d
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Stub out all database access in article read view spec.
-
-commit adab5018b0f8ce0f8dd7318858296d1e113da755
-Author: Yannick Francois <yannick.francois@free.fr>
-
-    fix spec error on blog permalink validation rules
-
-commit 608b2c4bf1de5dd7c0ae10950b97f748e6c0767b
-Merge: d83dbfa adab501
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Merge branch 'master' of github.com:fdv/typo
-
-commit 03b2ce4542d197407abb4c1ae5b0baebd777cf46
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Fix feed specs since article stub now uses textile text filter.
-
-commit 56e98cebb641afc9949f73dd64e175c4342028b3
-Merge: 03b2ce4 adab501
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Merge branch 'master' of github.com:fdv/typo
-
-commit f4367e1acf9ac2ed9aed23f9700a9b1224bbf655
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Spec now-invalid permalink formats as invalid in blog model spec.
-
-commit 5f09721d764ce620ebbdbdc87f958edeca831114
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Fix SEO controller specs: Move `get` to before block.
-
-commit 39274abbe71ab1b7579e25a1f1f405116cc38f74
-Merge: 5f09721 798b2a8
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Merge pull request #34 from Skudo/sqlite3
-
-commit d41ecbd6f4332b44a993d30f612364ef9d59c41e
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Move comment partials to their appropriate location in themes.
-
-commit b4de3cd25671d18b0e57ba6da7c59820fbbc77f0
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Show only published articles on the author page and feeds.
-
-commit 9c8a7dadc86e9a0361e4754f5e24dbcf30ad4f93
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Show comment creation date and time in partial for Standard Issue.
-
-commit b60f18d5b24b000db44bddb1c400d40d5742021c
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Add back admin tools for comments.
-
-commit 9af91d4179f11ea66c59c70af71cfd99ad686581
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Move themeless comment_box partial to comment_form.
-
-commit 4c54ec3618d0bbc1930e6cefb5daa3cdb169275a
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Fix automatic finding of file to render in article index view spec.
-
-commit ce9b89eda731ac6ec21319a40027b6988d66c638
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Clean up formatting of sidebar controller and its specs.
-
-commit 0e9fa8261311cd7a9ffead99754c495d7e0589b8
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Clean up sidebars table if it contains a record with an invalid type.
-
-commit c151318d373041660ec69a1b59a5cbd0ff7ba321
-Author: Yannick Francois <yannick.francois@free.fr>
-
-    remove fixture usage in profiles controller spec
-
-commit 2113cc234a2af151c804a3bb08c3edc66a1625ba
-Author: Yannick Francois <yannick.francois@free.fr>
-
-    remove fixture usage in setting_controller_spec
-
-commit 5d315be98486da31141ef5b3edf82fce8a52ec85
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Adding a custom template for all pages meta titles and description.
-
-commit 7dd4c827f72ec31a7ef0a7f284bcaa29338b418b
-Merge: 5d315be c151318
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Fixing some conflicts
-
-commit f557e30524d9357c53d46a8287da98919e6fc00c
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Allows theme developper to pass a string parametre to xxx_links helpers:
-    - article_links
-    - category_links
-    - tag_links
-    - next_link
-    - prev_link
-
-commit 71a788b92705c26cc6ad6e0141ff72e4d21426ec
-Merge: 2113cc2 7dd4c82
-Author: Yannick Francois <yannick.francois@free.fr>
-
-    Merge branch 'master' of github.com:fdv/typo
-
-commit face17d9fb5bdb5f5f67e98bd78db6dd8fb300fb
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Deprecate use of view_root in sidebar plugins.
-
-commit 6bb98338d3df42952292acb36f9b95ee8747334a
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Make default plugins use new default view location.
-
-commit f14834cc644cfc11f15c8c653c82b8158e8ffb29
-Merge: f557e30 71a788b
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Merge branch 'master' of github.com:fdv/typo
-
-commit f88ace6e1b1e130835f72cb703ecdaa7f1360693
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Adding test on render without layout back after a Rails fix
-
-commit a82bd3900a43c1891e60d6e9dd738cb3b3637db8
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    A little refactoring of to_title to make it more readable (how could I commit this???)
-
-commit 58760bcbc437df90a2c840dc7621453a7e42f91c
-Author: Yaf <yannick.francois@free.fr>
-
-    Remove Feedback Fixtures usage in spec...
-
-commit cc8407987c2d78462627b95307eda93a270cc89a
-Author: Yannick Francois <yannick.francois@free.fr>
-
-    Remove user fixture usage
-
-commit e07d6133712679b7872a24b9a783ab4fcf9e72dc
-Merge: cc84079 58760bc
-Author: Yannick Francois <yannick.francois@free.fr>
-
-    Merge branch 'master' of github.com:fdv/typo
-
-commit 7c07738e57e4c72cc1f790bd6c74958fbf1447b5
-Author: Yannick Francois <yannick.francois@free.fr>
-
-    As usual: removing users fixture usage in few controllers
-
-commit baa0825b852d30cfbb07eba7e42845c4884ce8a0
-Author: Yannick Francois <yannick.francois@free.fr>
-
-    remove users fixtures usage...
-
-commit 8ace69ea2de1aaa76962e1fed04d0887a9d0a674
-Author: Thomas Lecavelier <thomas@lecavelier.name>
-
-    Remove artifact
-
-commit 82bcadf7a88ec39f590803ee4e9f1e9d859609e6
-Author: Thomas Lecavelier <thomas@lecavelier.name>
-
-    Fix admin category#new view
-
-commit 75285bf89d647aa74816b7fb89d25e068c392898
-Merge: 6bb9833 82bcadf
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Merge branch 'master' of github.com:fdv/typo
-
-commit 2ce0a1cb21efa93a56c991f307ebd1815c53a3be
-Author: Yannick Francois <yannick.francois@free.fr>
-
-    Remove Users fixture usage...
-
-commit ef9cb65e030bec2d49c240d91a8a36fc685e4944
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Fix view spec to work properly on Ruby 1.9.
-
-commit bb96f82f1eb66d96895b82513edfd8d060002086
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Add coding comment for Ruby 1.9.2.
-
-commit c1b2ba833730dcd5602f232b56706baf5b697923
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Move rendering part of SEO options spec to view specs.
-
-commit 392c78df621e91740b102636a5b1f9bb3b886884
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Log caught sidebar errors to aid debugging.
-
-commit bd29bff6f41898c0ffb870757b64f85747698a70
-Author: Matijs van Zuijlen <matijs@matijs.net>
-
-    Move sidebar views to match default view path for Rails plugins.
-
-commit 72d1871d3f8e5da3964a61e132a0933dc6069591
-Author: Yannick Francois <yannick.francois@free.fr>
-
-    Refactorign spec to be more independant
-
-commit a52d4cb1237acf67fc228280eda1edd2254e6b44
-Author: Yannick Francois <yannick.francois@free.fr>
-
-    Fix sidebar helper spec
-
-commit c7061eb6d3e1b2efe1bc2d7019f6b004644b7108
-Author: Yaf <yannick.francois@free.fr>
-
-    removing Feedback fixture \o/
-
-commit 960c46fbb0661c03b4e723c606b6f8fbaf75ca74
-Author: Lars Tobias Skjong-Børsting <larstobi@relatime.no>
-
-    Use newer RedCloth than 4.2.3. Fixes this error: couldn't parse YAML at line 183 column 9
-
-commit e5e1f63b77a6f9bf7e58c131ca2f76dc606b0ef2
-Merge: c7061eb 960c46f
-Author: Frédéric de Villamil <frederic@de-villamil.com>
-
-    Merge pull request #35 from larstobi/master
-
-commit 240efdd92aeb47b063cda97ccaf2b388de26580d
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Feature request: add a custom tracking field for people not using Google Analytics.
-
-commit 5099220c7cdfa83505304d0ba7277e6fb94b70a2
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Adds post types with admin management.
-
-commit dd004ed2b32b7d242d954dfb828f61c7d25356ec
-Merge: 5099220 e5e1f63
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Merge branch 'master' of github.com:fdv/typo
-
-commit 50f57c4dc31d985575fc441d518338e4002f926a
-Author: Yannick Francois <yannick.francois@free.fr>
-
-    Remove another fixture ... \o/
-
-commit 6e8d844330b119548e5f6eb3d4b28abc64e02d14
-Merge: 50f57c4 dd004ed
-Author: Yannick Francois <yannick.francois@free.fr>
-
-    Merge branch 'master' of github.com:fdv/typo
-
-commit 5909042805f2bf32f7df3d649ed106dcce7b7424
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Adding Yannick and Thomas to default static sidebar contents
-
-commit 88ac7aa9941c8afafbfed2c0ab5e6b86cbbdd1a4
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Updateing various documentation for next release. Now waiting for Norwegian translation to finish
-
-commit b9a4c587470fc714ae691e3818f1f55d70d2559f
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Readme update
-
-commit 2beacc028979370cd200e3c2053e32801cc0ee65
-Author: Yannick Francois <yannick.francois@free.fr>
-
-    Refactoring to greenbar (content_helper code cleaner)
-
-commit 6d63b5a2c150b2e76b6b950ae6fe84b9546ad882
-Merge: 2beacc0 b9a4c58
-Author: Yannick Francois <yannick.francois@free.fr>
-
-    Merge branch 'master' of github.com:fdv/typo
-
-commit b413b029d7d0d04005d857fc6b2989d4f2a5dc0b
-Author: Yannick Francois <yannick.francois@free.fr>
-
-    Remove unuse fixture file
-
-commit b60f243dc84eeea018af8253e547ff889468eb39
-Author: Lars Tobias Skjong-Børsting <larstobi@relatime.no>
-
-    Typo: double any.
-
-commit c82448293be20d2be699d9185cbf7c39e71854ad
-Author: Lars Tobias Skjong-Børsting <larstobi@relatime.no>
-
-    Typo: double any.
-
-commit fc6cfaa992a01492c72b65d188477c63e26c9dee
-Merge: c824482 b60f243
-Author: Lars Tobias Skjong-Børsting <larstobi@relatime.no>
-
-    Merge branch 'master' of github.com:larstobi/typo
-
-commit 73947273b3098b94e7a199af17a9be43ced9c822
-Author: Lars Tobias Skjong-Børsting <larstobi@relatime.no>
-
-    Norwegian translation
-
-commit dc3ba7d1c30bdce8bd935dd3c0d5c1a667420274
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Fixes a typo in all languages files
-
-commit 13c84400393e1038ef0d09213dac31a27bda1872
-Merge: dc3ba7d 7394727
-Author: Frédéric de Villamil <frederic@de-villamil.com>
-
-    Merge pull request #36 from larstobi/master
-
-commit 49659205b25c7188ec24f1ed0bbde933ad1455ce
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Fixes UTF8 issues
-
-commit ae13d42e053affea5491b192ddde671abac9bc90
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Fixes French translation
-
-commit cdaaaa582e5d3d330a86a1bd588e706c363263c3
-Merge: ae13d42 13c8440
-Author: Frédéric de Villamil <neuro@asocial.org>
-
-    Merge branch 'master' of github.com:fdv/typo