typo 4.0.3 → 4.1

data/vendor/plugins/typo_textfilter_textile_and_markdown/README

@@ -0,0 +1,4 @@
+Typo-textfilter-textileAndMarkdown
+==================================
+
+Description goes here

data/vendor/plugins/typo_textfilter_textile_and_markdown/Rakefile

@@ -0,0 +1,22 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Test the typo_textfilter_textile_and_markdown plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Generate documentation for the typo_textfilter_textile_and_markdown plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'Typo-textfilter-textileAndMarkdown'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/vendor/plugins/typo_textfilter_textile_and_markdown/init.rb

@@ -0,0 +1,2 @@
+require 'text_filter_plugin'
+require 'typo_textfilter_textile_and_markdown'

data/vendor/plugins/typo_textfilter_textile_and_markdown/install.rb

@@ -0,0 +1 @@
+# Install hook code here

data/vendor/plugins/typo_textfilter_textile_and_markdown/lib/typo_textfilter_textile_and_markdown.rb

@@ -0,0 +1,12 @@
+class Typo
+  class Textfilter
+    class TextileAndMarkdown < TextFilterPlugin::Markup
+      plugin_display_name "Textile with Markdown"
+      plugin_description 'Textile and Markdown markup languages'
+
+      def self.filtertext(blog,content,text,params)
+        RedCloth.new(text).to_html
+      end
+    end
+  end
+end

data/vendor/plugins/typo_textfilter_textile_and_markdown/tasks/typo_textfilter_textile_and_markdown_tasks.rake

@@ -0,0 +1,4 @@
+# desc "Explaining what the task does"
+# task :typo_textfilter_textile_and_markdown do
+#   # Task goes here
+# end

data/vendor/plugins/typo_textfilter_textile_and_markdown/test/typo_textfilter_textile_and_markdown_test.rb

@@ -0,0 +1,8 @@
+require 'test/unit'
+
+class Typo-textfilter-textileAndMarkdownTest < Test::Unit::TestCase
+  # Replace this with your real tests.
+  def test_this_plugin
+    flunk
+  end
+end

data/vendor/plugins/typo_textfilter_tmcode/README

@@ -0,0 +1,4 @@
+Typo-textfilter-tmcode
+====================
+
+Description goes here

data/vendor/plugins/typo_textfilter_tmcode/Rakefile

@@ -0,0 +1,22 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Test the typo_textfilter_tmcode plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Generate documentation for the typo_textfilter_tmcode plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'Typo-textfilter-tmcode'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/vendor/plugins/typo_textfilter_tmcode/init.rb

@@ -0,0 +1,3 @@
+# Include hook code here
+
+require 'typo_textfilter_tmcode'

data/vendor/plugins/typo_textfilter_tmcode/install.rb

@@ -0,0 +1 @@
+# Install hook code here

data/vendor/plugins/typo_textfilter_tmcode/lib/typo_textfilter_tmcode.rb

@@ -0,0 +1,86 @@
+class Typo
+  class Textfilter
+    class TMCode < TextFilterPlugin::MacroPre
+      plugin_display_name "TMCode"
+      plugin_description "Ensures the CSS files for TextMate syntax highlighting are included."
+
+      def self.help_text
+        %{
+You can use `<typo:tmcode>` to include blocks of HTML code output by TextMate.
+Optionally you can default the block to hidden, to be expanded with a `<typo:tmcoderef>` reference.
+
+    <typo:tmcode>
+    <!-- TextMate-generated HTML code here -->
+    </typo:tmcode>
+
+    Expand or collapse my <typo:tmcoderef id="foo">code</typo:tmcoderef>.
+    <typo:tmcode hidden="true" id="foo">
+    <!-- TextMate-generated HTML code here -->
+    </typo:tmcode>
+
+You can also provide the optional attribute `theme` which specifies which theme to use for colorizing.
+The list of available themes can be seen in the config screen, where you can also pick a theme to use
+if the `theme` attribute isn't specified.
+
+The HTML code that you enclose with this macro can be generated by selecting a block of text in TextMate
+and selecting the TextMate->Create HTML From Document command.
+}
+      end
+
+      def self.macrofilter(blog,content,attrib,params,text="")
+        isHidden      = attrib['hidden'] || 'false'
+        blockID       = attrib['id']
+        theme         = (attrib['theme'] || config_value(params, 'default-theme')).downcase.gsub(' ', '_')
+
+        isHidden = ["yes", "true", "1", "hidden"].include?(isHidden.downcase)
+
+        set_whiteboard blog, content, isHidden, theme unless content.nil?
+
+        %{<notextile><div class="textmate-source #{theme}#{isHidden ? ' tmcode-collapsed' : ''}"#{blockID ? %{ id="tmcode_#{blockID}"} : ''}>\n#{text}\n</div></notextile>}
+      end
+
+      def self.default_config
+        {"default-theme" => {:default => "twilight",
+                             :description => "Default theme for tmcode snippets",
+                             :options => ["Twilight", "iPlastic", "Dawn", 'Space Cadet']}}
+      end
+
+      def self.set_whiteboard(blog, content, isHidden, theme)
+        content.whiteboard['page_header_tmcode'] = <<-HTML
+          <link href="#{blog.base_url}/stylesheets/textmate/textmate.css" media="all" rel="Stylesheet" type="text/css" />
+        HTML
+        content.whiteboard["page_header_tmcode_#{theme}"] = <<-HTML unless theme.blank?
+          <link href="#{blog.base_url}/stylesheets/textmate/#{theme}.css" media="screen" rel="Stylesheet" type="text/css" />
+        HTML
+        TMCodeRef.set_whiteboard blog, content if isHidden
+      end
+    end
+
+    class TMCodeRef < TextFilterPlugin::MacroPost
+      plugin_display_name "TMCodeRef"
+      plugin_description "Adds expand/collapse links for TMCode sections."
+
+      def self.help_text
+        %{
+Use `<typo:tmcoderef id="ref">text</typo:tmcoderef>` to cause `text` to be a hyperlink which toggles
+the collapsed state of the `<typo:tmcode>` block referenced by the `id`.
+}
+      end
+
+      def self.macrofilter(blog,content,attrib,params,text="")
+        blockID = attrib['id']
+
+        set_whiteboard blog, content
+
+        %{<a href="#" onclick="toggleCodeCollapse('tmcode_#{blockID.gsub("('|\\)", "\\\\\\1")}');return false;">#{text}</a>}
+      end
+
+      def self.set_whiteboard(blog, content)
+        content.whiteboard['page_header_codecollapse'] = <<-HTML
+          <link href="#{blog.base_url}/stylesheets/codecollapse.css" media="screen" rel="Stylesheet" type="text/css" />
+          <script src="#{blog.base_url}/javascripts/codecollapse.js" type="text/javascript" defer="defer"></script>
+        HTML
+      end
+    end
+  end
+end

data/vendor/plugins/typo_textfilter_tmcode/tasks/typo_textfilter_tmcode_tasks.rake

@@ -0,0 +1,4 @@
+# desc "Explaining what the task does"
+# task :typo_textfilter_tmcode do
+#   # Task goes here
+# end

data/vendor/plugins/typo_textfilter_tmcode/test/typo_textfilter_tmcode_test.rb

@@ -0,0 +1,8 @@
+require 'test/unit'
+
+class Typo_textfilter_tmcode_test < Test::Unit::TestCase
+  # Replace this with your real tests.
+  def test_this_plugin
+    flunk
+  end
+end

data/vendor/plugins/upcoming_sidebar/Rakefile

@@ -0,0 +1,22 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Test the upcoming_sidebar plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Generate documentation for the upcoming_sidebar plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'UpcomingSidebar'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/vendor/plugins/upcoming_sidebar/init.rb

@@ -0,0 +1,5 @@
+require 'sidebar'
+require 'upcoming_sidebar'
+
+UpcomingSidebar.view_root = File.dirname(__FILE__) + '/views'
+

data/vendor/plugins/upcoming_sidebar/lib/upcoming_sidebar.rb

@@ -0,0 +1,15 @@
+class UpcomingSidebar < Sidebar
+  description 'Events from <a href="http://www.upcoming.org">upcoming.org</a>'
+
+  setting :feed, '', :label => 'Feed URL'
+  setting :count, 4, :label => 'Items Limit'
+
+  lifetime 6.hours
+
+  def upcoming
+    @upcoming ||= Upcoming.new(feed)
+  rescue Exception => e
+    logger.info e
+    nil
+  end
+end

data/vendor/plugins/upcoming_sidebar/test/upcoming_sidebar_test.rb

@@ -0,0 +1,8 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+
+class UpcomingSidebarTest < Test::Unit::TestCase
+  def test_sidebar_is_available
+    assert Sidebar.available_sidebars.include?(UpcomingSidebar)
+  end
+end

data/{components/plugins/sidebars/upcoming → vendor/plugins/upcoming_sidebar/views}/content.rhtml

@@ -1,8 +1,8 @@
-<% if @upcoming -%>
+<% if sidebar.upcoming -%>
 <h3>Upcoming Events</h3>
 <ul id="upcoming">
-<% for event in @upcoming.choose(@sb_config['count'].to_i) -%>
+<% for event in sidebar.upcoming.choose(count.to_i) -%>
   <li><%= link_to event.title, event.link, {:title => event.description } %> - <%= event.timespan %></li>
   <% end -%>
 </ul>
-<% end -%>
+<% end -%>

data/vendor/plugins/xbox_sidebar/Rakefile

@@ -0,0 +1,22 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Test the xbox_sidebar plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Generate documentation for the xbox_sidebar plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'XboxSidebar'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/vendor/plugins/xbox_sidebar/init.rb

@@ -0,0 +1,5 @@
+require 'sidebar'
+require 'xbox_sidebar'
+
+XboxSidebar.view_root = File.dirname(__FILE__) + '/views'
+

data/{components/plugins/sidebars/xbox_controller.rb → vendor/plugins/xbox_sidebar/lib/xbox_sidebar.rb}

@@ -1,4 +1,4 @@
-class Plugins::Sidebars::XboxController < Sidebars::ComponentPlugin
+class XboxSidebar < Sidebar
   display_name "Xbox Gamer Card"
   description "Displays your Xbox Live Gamer Card"
 

data/vendor/plugins/xbox_sidebar/test/xbox_sidebar_test.rb

@@ -0,0 +1,8 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+
+class XboxSidebarTest < Test::Unit::TestCase
+  def test_sidebar_is_available
+    assert Sidebar.available_sidebars.include?(XboxSidebar)
+  end
+end

data/vendor/plugins/xbox_sidebar/views/content.rhtml

@@ -0,0 +1,2 @@
+<h3>Xbox Live Gamer Card</h3>
+<iframe src="http://gamercard.xbox.com/<%= URI.escape(gamertag) %>.card" scrolling="no" frameborder="0" height="140" width="204"><%= gamertag %></iframe>

data/vendor/plugins/xml_sidebar/Rakefile

@@ -0,0 +1,22 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Test the xml_sidebar plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Generate documentation for the xml_sidebar plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'XmlSidebar'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/vendor/plugins/xml_sidebar/init.rb

@@ -0,0 +1,5 @@
+require 'sidebar'
+require 'xml_sidebar'
+
+XmlSidebar.view_root = File.dirname(__FILE__) + '/views'
+

data/{components/plugins/sidebars/xml_controller.rb → vendor/plugins/xml_sidebar/lib/xml_sidebar.rb}

@@ -1,4 +1,4 @@
-class Plugins::Sidebars::XmlController < Sidebars::ComponentPlugin
+class XmlSidebar < Sidebar
   display_name "XML Syndication"
   description "RSS and Atom feeds"
 

data/vendor/plugins/xml_sidebar/test/xml_sidebar_test.rb

@@ -0,0 +1,8 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+
+class XmlSidebarTest < Test::Unit::TestCase
+  def test_sidebar_is_available
+    assert Sidebar.available_sidebars.include?(XmlSidebar)
+  end
+end

data/vendor/plugins/xml_sidebar/views/content.rhtml

@@ -0,0 +1,12 @@
+<h3>Syndicate</h3>
+<ul>
+  <% if articles -%>
+  <li><a href="<%= url_for :controller=>'xml', :action=>'feed', :format => format, :type => 'feed' %>" title="Articles feed">Articles</a></li>
+  <% end %>
+  <% if comments -%>
+  <li><a href="<%= url_for :controller=>'xml', :action=>'feed', :format => format, :type => 'comments' %>" title="Comments feed">Comments</a></li>
+  <% end %>
+  <% if trackbacks -%>
+  <li><a href="<%= url_for :controller=>'xml', :action=>'feed', :format => format, :type => 'trackbacks' %>" title="Trackbacks feed">Trackbacks</a></li>
+  <% end %>
+</ul>

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: typo
 version: !ruby/object:Gem::Version 
-  version: 4.0.3
-date: 2006-08-17 00:00:00 -07:00
+  version: "4.1"
+date: 2007-03-11 00:00:00 +01:00
 summary: Modern weblog engine.
 require_paths: 
 - .
@@ -31,11 +31,13 @@ authors:
 files: 
 - app
 - bin
+- CHANGES-4.1
 - components
 - config
 - db
 - doc
 - installer
+- lang
 - lib
 - log
 - MAINTAINERS
@@ -43,10 +45,13 @@ files:
 - public
 - Rakefile
 - README
+- README.SIDEBARS
 - script
+- spec
 - test
 - themes
 - tmp
+- TODO-4.1
 - vendor
 - app/apis
 - app/controllers
@@ -65,7 +70,6 @@ files:
 - app/controllers/content_controller.rb
 - app/controllers/live_controller.rb
 - app/controllers/redirect_controller.rb
-- app/controllers/sidebar_controller.rb
 - app/controllers/textfilter_controller.rb
 - app/controllers/theme_controller.rb
 - app/controllers/xml_controller.rb
@@ -113,19 +117,19 @@ files:
 - app/helpers/admin/trackbacks_helper.rb
 - app/helpers/admin/users_helper.rb
 - app/helpers/sidebars/plugin_helper.rb
-- app/models/aggregations
 - app/models/article.rb
 - app/models/blacklist_pattern.rb
 - app/models/blog.rb
 - app/models/blog_sweeper.rb
+- app/models/categorization.rb
 - app/models/category.rb
 - app/models/comment.rb
 - app/models/config_manager.rb
 - app/models/content.rb
-- app/models/content_observer.rb
 - app/models/content_state
 - app/models/email_notifier.rb
 - app/models/feedback.rb
+- app/models/notification.rb
 - app/models/notification_mailer.rb
 - app/models/page.rb
 - app/models/page_cache.rb
@@ -141,15 +145,6 @@ files:
 - app/models/trigger.rb
 - app/models/user.rb
 - app/models/web_notifier.rb
-- app/models/aggregations/audioscrobbler.rb
-- app/models/aggregations/backpack.rb
-- app/models/aggregations/delicious.rb
-- app/models/aggregations/flickr.rb
-- app/models/aggregations/fortythree.rb
-- app/models/aggregations/magnolia.rb
-- app/models/aggregations/tada.rb
-- app/models/aggregations/technorati.rb
-- app/models/aggregations/upcoming.rb
 - app/models/content_state/base.rb
 - app/models/content_state/draft.rb
 - app/models/content_state/factory.rb
@@ -158,6 +153,7 @@ files:
 - app/models/content_state/just_marked_as_spam.rb
 - app/models/content_state/just_presumed_ham.rb
 - app/models/content_state/just_published.rb
+- app/models/content_state/just_withdrawn.rb
 - app/models/content_state/new.rb
 - app/models/content_state/presumed_ham.rb
 - app/models/content_state/presumed_spam.rb
@@ -195,6 +191,7 @@ files:
 - app/views/admin/general
 - app/views/admin/pages
 - app/views/admin/resources
+- app/views/admin/shared
 - app/views/admin/sidebar
 - app/views/admin/textfilters
 - app/views/admin/themes
@@ -260,6 +257,7 @@ files:
 - app/views/admin/resources/destroy.rhtml
 - app/views/admin/resources/list.rhtml
 - app/views/admin/resources/new.rhtml
+- app/views/admin/shared/_edit.rhtml
 - app/views/admin/sidebar/_active.rhtml
 - app/views/admin/sidebar/_actives.rhtml
 - app/views/admin/sidebar/_available.rhtml
@@ -310,6 +308,7 @@ files:
 - app/views/articles/view_page.rhtml
 - app/views/layouts/accounts.rhtml
 - app/views/layouts/administration.rhtml
+- app/views/layouts/minimal.rhtml
 - app/views/layouts/sidebar.rhtml
 - app/views/live/search.rhtml
 - app/views/notification_mailer/_mail_footer.rhtml
@@ -342,81 +341,6 @@ files:
 - app/views/xml/rsd.rxml
 - app/views/xml/rss20_feed.rxml
 - bin/typo
-- components/plugins
-- components/sidebars
-- components/plugins/sidebars
-- components/plugins/textfilters
-- components/plugins/sidebars/aimpresence
-- components/plugins/sidebars/aimpresence_controller.rb
-- components/plugins/sidebars/amazon
-- components/plugins/sidebars/amazon_controller.rb
-- components/plugins/sidebars/archives
-- components/plugins/sidebars/archives_controller.rb
-- components/plugins/sidebars/audioscrobbler
-- components/plugins/sidebars/audioscrobbler_controller.rb
-- components/plugins/sidebars/backpack
-- components/plugins/sidebars/backpack_controller.rb
-- components/plugins/sidebars/category
-- components/plugins/sidebars/category_controller.rb
-- components/plugins/sidebars/delicious
-- components/plugins/sidebars/delicious_controller.rb
-- components/plugins/sidebars/flickr
-- components/plugins/sidebars/flickr_controller.rb
-- components/plugins/sidebars/fortythree
-- components/plugins/sidebars/fortythree_controller.rb
-- components/plugins/sidebars/fortythreeplaces
-- components/plugins/sidebars/fortythreeplaces_controller.rb
-- components/plugins/sidebars/magnolia
-- components/plugins/sidebars/magnolia_controller.rb
-- components/plugins/sidebars/recent_comments
-- components/plugins/sidebars/recent_comments_controller.rb
-- components/plugins/sidebars/static
-- components/plugins/sidebars/static_controller.rb
-- components/plugins/sidebars/tada
-- components/plugins/sidebars/tada_controller.rb
-- components/plugins/sidebars/tag
-- components/plugins/sidebars/tag_controller.rb
-- components/plugins/sidebars/technorati
-- components/plugins/sidebars/technorati_controller.rb
-- components/plugins/sidebars/upcoming
-- components/plugins/sidebars/upcoming_controller.rb
-- components/plugins/sidebars/xbox
-- components/plugins/sidebars/xbox_controller.rb
-- components/plugins/sidebars/xml
-- components/plugins/sidebars/xml_controller.rb
-- components/plugins/sidebars/aimpresence/content.rhtml
-- components/plugins/sidebars/amazon/content.rhtml
-- components/plugins/sidebars/archives/content.rhtml
-- components/plugins/sidebars/audioscrobbler/content.rhtml
-- components/plugins/sidebars/backpack/content.rhtml
-- components/plugins/sidebars/category/content.rhtml
-- components/plugins/sidebars/delicious/content.rhtml
-- components/plugins/sidebars/flickr/content.rhtml
-- components/plugins/sidebars/fortythree/content.rhtml
-- components/plugins/sidebars/fortythreeplaces/content.rhtml
-- components/plugins/sidebars/magnolia/content.rhtml
-- components/plugins/sidebars/recent_comments/content.rhtml
-- components/plugins/sidebars/static/content.rhtml
-- components/plugins/sidebars/tada/content.rhtml
-- components/plugins/sidebars/tag/content.rhtml
-- components/plugins/sidebars/technorati/content.rhtml
-- components/plugins/sidebars/upcoming/content.rhtml
-- components/plugins/sidebars/xbox/content.rhtml
-- components/plugins/sidebars/xml/content.rhtml
-- components/plugins/textfilters/amazon_controller.rb
-- components/plugins/textfilters/code_controller.rb
-- components/plugins/textfilters/flickr_controller.rb
-- components/plugins/textfilters/htmlfilter_controller.rb
-- components/plugins/textfilters/lightbox_controller.rb
-- components/plugins/textfilters/macropost_controller.rb
-- components/plugins/textfilters/macropre_controller.rb
-- components/plugins/textfilters/markdown_controller.rb
-- components/plugins/textfilters/none_controller.rb
-- components/plugins/textfilters/smartypants_controller.rb
-- components/plugins/textfilters/sparkline_controller.rb
-- components/plugins/textfilters/textile_and_markdown_controller.rb
-- components/plugins/textfilters/textile_controller.rb
-- components/sidebars/README
 - config/boot.rb
 - config/database.yml.example
 - config/environment.rb
@@ -430,7 +354,6 @@ files:
 - config/environments/test.rb
 - db/converters
 - db/migrate
-- db/schema.mysql-v3.sql
 - db/schema.mysql.sql
 - db/schema.postgresql.sql
 - db/schema.rb
@@ -497,6 +420,17 @@ files:
 - db/migrate/048_remove_count_caching.rb
 - db/migrate/049_move_feedback_to_new_state_machine.rb
 - db/migrate/050_add_status_confirmed_field_to_content.rb
+- db/migrate/051_fix_canonical_server_url.rb
+- db/migrate/052_remove_cached_html.rb
+- db/migrate/053_promote_canonical_server_url.rb
+- db/migrate/054_upgrade_sidebar_objects.rb
+- db/migrate/055_link_sidebars_to_blog.rb
+- db/migrate/056_create_notifications.rb
+- db/migrate/057_add_categorization_model.rb
+- db/migrate/058_separate_entries_and_feedback.rb
+- db/migrate/059_cleanup_feedback_table.rb
+- db/migrate/060_cleanup_contents_table.rb
+- db/migrate/061_convert_title_prefix_setting.rb
 - db/scripts/fix_permalinks.rb
 - db/updates/update.168.to.200.mysql.sql
 - db/updates/update.168.to.200.psql.sql
@@ -506,6 +440,7 @@ files:
 - installer/apache20.conf.example.template
 - installer/lighttpd.conf.example.template
 - installer/rails_installer_defaults.yml
+- lang/fr_FR.rb
 - lib/backpack_api.rb
 - lib/bare_migration.rb
 - lib/email_notify.rb
@@ -513,14 +448,17 @@ files:
 - lib/generators
 - lib/jabber_notify.rb
 - lib/login_system.rb
+- lib/memory_profiler.rb
 - lib/migrator.rb
 - lib/rails_patch
+- lib/route_cache.rb
 - lib/sanitize.rb
 - lib/sidebars
 - lib/spam_protection.rb
 - lib/tasks
 - lib/text_filter_plugin.rb
 - lib/transforms.rb
+- lib/typo_deprecated.rb
 - lib/typo_guid.rb
 - lib/typo_plugins.rb
 - lib/typo_version.rb
@@ -528,15 +466,14 @@ files:
 - lib/generators/sidebar
 - lib/generators/sidebar/sidebar_generator.rb
 - lib/generators/sidebar/templates
-- lib/generators/sidebar/templates/components
-- lib/generators/sidebar/templates/components/plugins
-- lib/generators/sidebar/templates/components/plugins/sidebars
-- lib/generators/sidebar/templates/components/plugins/sidebars/controller_template.rb
-- lib/generators/sidebar/templates/components/plugins/sidebars/views
-- lib/generators/sidebar/templates/components/plugins/sidebars/views/content_template.rhtml
+- lib/generators/sidebar/templates/content.rhtml
+- lib/generators/sidebar/templates/init.rb
+- lib/generators/sidebar/templates/Rakefile
+- lib/generators/sidebar/templates/sidebar.rb
+- lib/generators/sidebar/templates/unit_test.rb
 - lib/rails_patch/active_record.rb
-- lib/rails_patch/components.rb
 - lib/sidebars/component_plugin.rb
+- lib/sidebars/consolidated_plugin.rb
 - lib/sidebars/plugin.rb
 - lib/tasks/release.rake
 - lib/tasks/schemas.rake
@@ -557,17 +494,21 @@ files:
 - public/images/bg.jpg
 - public/images/bgcolor.jpg
 - public/images/body_bg.png
+- public/images/bracket.gif
 - public/images/branding_bg.png
 - public/images/branding_logo.png
-- public/images/checked.gif
+- public/images/cancel.png
+- public/images/checked.png
 - public/images/content_bg.png
 - public/images/delete.png
+- public/images/edit.png
 - public/images/footer.jpg
 - public/images/footer.png
 - public/images/global_bg.png
 - public/images/global_logo.png
 - public/images/go.png
 - public/images/header.jpg
+- public/images/help.png
 - public/images/loading.gif
 - public/images/not-checked copy.gif
 - public/images/not-checked.gif
@@ -577,6 +518,7 @@ files:
 - public/images/sections_bg.png
 - public/images/sections_hilite.png
 - public/images/sections_hover.png
+- public/images/show.png
 - public/images/spinner-blue.gif
 - public/images/spinner.gif
 - public/images/spot-header.gif
@@ -587,6 +529,7 @@ files:
 - public/images/admin/hdr-tile.gif
 - public/images/admin/toggle.gif
 - public/javascripts/application.js
+- public/javascripts/codecollapse.js
 - public/javascripts/controls.js
 - public/javascripts/cookies.js
 - public/javascripts/dragdrop.js
@@ -597,9 +540,17 @@ files:
 - public/javascripts/slider.js
 - public/javascripts/typo.js
 - public/stylesheets/administration.css
+- public/stylesheets/codecollapse.css
 - public/stylesheets/lightbox.css
+- public/stylesheets/minimal.css
 - public/stylesheets/rss.css
+- public/stylesheets/textmate
 - public/stylesheets/user-styles.css
+- public/stylesheets/textmate/dawn.css
+- public/stylesheets/textmate/iplastic.css
+- public/stylesheets/textmate/space_cadet.css
+- public/stylesheets/textmate/textmate.css
+- public/stylesheets/textmate/twilight.css
 - script/about
 - script/benchmarker
 - script/breakpointer
@@ -618,20 +569,69 @@ files:
 - script/spacecheck
 - script/performance/benchmarker
 - script/performance/profiler
+- script/process/inspector
 - script/process/reaper
 - script/process/spawner
 - script/process/spinner
+- spec/controllers
+- spec/fixtures
+- spec/helpers
+- spec/models
+- spec/controllers/accounts_controller_spec.rb
+- spec/controllers/articles_controller_spec.rb
+- spec/fixtures/articles_tags.yml
+- spec/fixtures/blacklist_patterns.yml
+- spec/fixtures/blogs.yml
+- spec/fixtures/categories.yml
+- spec/fixtures/categorizations.yml
+- spec/fixtures/contents.yml
+- spec/fixtures/feedback.yml
+- spec/fixtures/notifications.yml
+- spec/fixtures/page_caches.yml
+- spec/fixtures/redirects.yml
+- spec/fixtures/resources.yml
+- spec/fixtures/sidebars.yml
+- spec/fixtures/tags.yml
+- spec/fixtures/text_filters.yml
+- spec/fixtures/triggers.yml
+- spec/fixtures/users.yml
+- spec/fixtures/whiteboards.yml
+- spec/helpers/admin_base_helper_spec.rb
+- spec/models/amazon_sidebar_spec.rb
+- spec/models/audioscrobbler_spec.rb
+- spec/models/blog_spec.rb
+- spec/models/cache_support_spec.rb
+- spec/models/category_spec.rb
+- spec/models/configuration_spec.rb
+- spec/models/content_state_spec.rb
+- spec/models/delegate_to_content_state_spec.rb
+- spec/models/delicious_spec.rb
+- spec/models/flickr_spec.rb
+- spec/models/metafragment_spec.rb
+- spec/models/page_cache_spec.rb
+- spec/models/page_spec.rb
+- spec/models/ping_spec.rb
+- spec/models/redirect_spec.rb
+- spec/models/resource_spec.rb
+- spec/models/static_sidebar_spec.rb
+- spec/models/tag_spec.rb
+- spec/models/text_filter_spec.rb
+- spec/models/theme_spec.rb
+- spec/models/trackback_spec.rb
+- spec/models/trigger_spec.rb
+- spec/models/user_spec.rb
 - test/fixtures
 - test/functional
 - test/mocks
 - test/test_helper.rb
 - test/unit
-- test/fixtures/articles_categories.yml
 - test/fixtures/articles_tags.yml
 - test/fixtures/blacklist_patterns.yml
 - test/fixtures/blogs.yml
 - test/fixtures/categories.yml
+- test/fixtures/categorizations.yml
 - test/fixtures/contents.yml
+- test/fixtures/feedback.yml
 - test/fixtures/notification_mailer
 - test/fixtures/notifications.yml
 - test/fixtures/page_caches.yml
@@ -691,11 +691,13 @@ files:
 - test/mocks/themes/azure/views/theme/static_view_test.rhtml
 - test/mocks/themes/CamelCaseDirectory/about.markdown
 - test/mocks/themes/i-have-special-chars/about.markdown
+- test/unit/amazon_sidebar_test.rb
 - test/unit/article_test.rb
 - test/unit/assumptions_tests.rb
 - test/unit/audioscrobbler_test.rb
 - test/unit/blacklist_pattern_test.rb
 - test/unit/blog_test.rb
+- test/unit/cache_support_test.rb
 - test/unit/category_test.rb
 - test/unit/comment_test.rb
 - test/unit/configuration_test.rb
@@ -706,13 +708,14 @@ files:
 - test/unit/magnolia_test.rb
 - test/unit/metafragment_test.rb
 - test/unit/notification_mailer_test.rb
-- test/unit/observer_test.rb
+- test/unit/notification_test.rb
 - test/unit/page_cache_test.rb
 - test/unit/page_test.rb
 - test/unit/ping_test.rb
 - test/unit/redirect_test.rb
 - test/unit/resource_test.rb
 - test/unit/sidebar_test.rb
+- test/unit/static_sidebar_test.rb
 - test/unit/tag_test.rb
 - test/unit/text_filter_test.rb
 - test/unit/theme_test.rb
@@ -720,6 +723,7 @@ files:
 - test/unit/trigger_test.rb
 - test/unit/user_test.rb
 - test/unit/content_state/factory_test.rb
+- test/unit/content_state/feedback_states_test.rb
 - themes/azure
 - themes/scribbish
 - themes/azure/about.markdown
@@ -768,12 +772,15 @@ files:
 - themes/scribbish/views/articles/index.rhtml
 - themes/scribbish/views/articles/read.rhtml
 - tmp/cache
+- tmp/pids
 - tmp/sessions
 - tmp/sockets
 - vendor/akismet
 - vendor/bluecloth
+- vendor/cached_model
 - vendor/flickr
 - vendor/jabber4r
+- vendor/memcache-client
 - vendor/plugins
 - vendor/redcloth
 - vendor/rubypants
@@ -802,6 +809,15 @@ files:
 - vendor/bluecloth/tests/data/ml-announce.txt
 - vendor/bluecloth/tests/data/re-overflow.txt
 - vendor/bluecloth/tests/data/re-overflow2.txt
+- vendor/cached_model/History.txt
+- vendor/cached_model/lib
+- vendor/cached_model/LICENSE.txt
+- vendor/cached_model/Manifest.txt
+- vendor/cached_model/Rakefile
+- vendor/cached_model/README.txt
+- vendor/cached_model/test
+- vendor/cached_model/lib/cached_model.rb
+- vendor/cached_model/test/test_cached_model.rb
 - vendor/flickr/flickr.rb
 - vendor/flickr/index.html
 - vendor/flickr/Rakefile
@@ -819,12 +835,384 @@ files:
 - vendor/jabber4r/lib/jabber4r/roster.rb
 - vendor/jabber4r/lib/jabber4r/session.rb
 - vendor/jabber4r/lib/jabber4r/vcard.rb
+- vendor/memcache-client/History.txt
+- vendor/memcache-client/lib
+- vendor/memcache-client/LICENSE.txt
+- vendor/memcache-client/Manifest.txt
+- vendor/memcache-client/Rakefile
+- vendor/memcache-client/README.txt
+- vendor/memcache-client/test
+- vendor/memcache-client/lib/memcache.rb
+- vendor/memcache-client/lib/memcache_util.rb
+- vendor/memcache-client/test/test_mem_cache.rb
+- vendor/plugins/action_view_patch
+- vendor/plugins/aimpresence_sidebar
+- vendor/plugins/amazon_sidebar
+- vendor/plugins/archives_sidebar
+- vendor/plugins/audioscrobbler_sidebar
+- vendor/plugins/backpack_sidebar
+- vendor/plugins/category_sidebar
+- vendor/plugins/delicious_sidebar
 - vendor/plugins/expiring_action_cache
+- vendor/plugins/flickr_sidebar
+- vendor/plugins/fortythree_sidebar
+- vendor/plugins/fortythreeplaces_sidebar
+- vendor/plugins/haml
+- vendor/plugins/localization
+- vendor/plugins/magnolia_sidebar
+- vendor/plugins/recent_comments_sidebar
+- vendor/plugins/static_sidebar
+- vendor/plugins/tada_sidebar
+- vendor/plugins/tag_sidebar
+- vendor/plugins/technorati_sidebar
+- vendor/plugins/typo_textfilter_amazon
+- vendor/plugins/typo_textfilter_code
+- vendor/plugins/typo_textfilter_flickr
+- vendor/plugins/typo_textfilter_htmlfilter
+- vendor/plugins/typo_textfilter_lightbox
+- vendor/plugins/typo_textfilter_markdown
+- vendor/plugins/typo_textfilter_none
+- vendor/plugins/typo_textfilter_smartypants
+- vendor/plugins/typo_textfilter_sparkline
+- vendor/plugins/typo_textfilter_textile
+- vendor/plugins/typo_textfilter_textile_and_markdown
+- vendor/plugins/typo_textfilter_tmcode
+- vendor/plugins/upcoming_sidebar
 - vendor/plugins/upload_progress
+- vendor/plugins/xbox_sidebar
+- vendor/plugins/xml_sidebar
+- vendor/plugins/action_view_patch/init.rb
+- vendor/plugins/action_view_patch/lib
+- vendor/plugins/action_view_patch/Rakefile
+- vendor/plugins/action_view_patch/test
+- vendor/plugins/action_view_patch/lib/action_view_patch.rb
+- vendor/plugins/action_view_patch/test/action_view_patch_test.rb
+- vendor/plugins/aimpresence_sidebar/init.rb
+- vendor/plugins/aimpresence_sidebar/lib
+- vendor/plugins/aimpresence_sidebar/Rakefile
+- vendor/plugins/aimpresence_sidebar/test
+- vendor/plugins/aimpresence_sidebar/views
+- vendor/plugins/aimpresence_sidebar/lib/aimpresence_sidebar.rb
+- vendor/plugins/aimpresence_sidebar/test/aimpresence_sidebar_test.rb
+- vendor/plugins/aimpresence_sidebar/views/content.rhtml
+- vendor/plugins/amazon_sidebar/init.rb
+- vendor/plugins/amazon_sidebar/lib
+- vendor/plugins/amazon_sidebar/views
+- vendor/plugins/amazon_sidebar/lib/amazon_sidebar.rb
+- vendor/plugins/amazon_sidebar/views/content.rhtml
+- vendor/plugins/archives_sidebar/init.rb
+- vendor/plugins/archives_sidebar/lib
+- vendor/plugins/archives_sidebar/Rakefile
+- vendor/plugins/archives_sidebar/test
+- vendor/plugins/archives_sidebar/views
+- vendor/plugins/archives_sidebar/lib/archives_sidebar.rb
+- vendor/plugins/archives_sidebar/test/archives_sidebar_test.rb
+- vendor/plugins/archives_sidebar/views/content.rhtml
+- vendor/plugins/audioscrobbler_sidebar/init.rb
+- vendor/plugins/audioscrobbler_sidebar/lib
+- vendor/plugins/audioscrobbler_sidebar/Rakefile
+- vendor/plugins/audioscrobbler_sidebar/test
+- vendor/plugins/audioscrobbler_sidebar/views
+- vendor/plugins/audioscrobbler_sidebar/lib/audioscrobbler.rb
+- vendor/plugins/audioscrobbler_sidebar/lib/audioscrobbler_sidebar.rb
+- vendor/plugins/audioscrobbler_sidebar/test/audioscrobbler_sidebar_test.rb
+- vendor/plugins/audioscrobbler_sidebar/views/content.rhtml
+- vendor/plugins/backpack_sidebar/init.rb
+- vendor/plugins/backpack_sidebar/lib
+- vendor/plugins/backpack_sidebar/Rakefile
+- vendor/plugins/backpack_sidebar/test
+- vendor/plugins/backpack_sidebar/views
+- vendor/plugins/backpack_sidebar/lib/backpack.rb
+- vendor/plugins/backpack_sidebar/lib/backpack_sidebar.rb
+- vendor/plugins/backpack_sidebar/test/backpack_sidebar_test.rb
+- vendor/plugins/backpack_sidebar/views/content.rhtml
+- vendor/plugins/category_sidebar/init.rb
+- vendor/plugins/category_sidebar/lib
+- vendor/plugins/category_sidebar/Rakefile
+- vendor/plugins/category_sidebar/test
+- vendor/plugins/category_sidebar/views
+- vendor/plugins/category_sidebar/lib/category_sidebar.rb
+- vendor/plugins/category_sidebar/test/category_sidebar_test.rb
+- vendor/plugins/category_sidebar/views/content.rhtml
+- vendor/plugins/delicious_sidebar/init.rb
+- vendor/plugins/delicious_sidebar/lib
+- vendor/plugins/delicious_sidebar/Rakefile
+- vendor/plugins/delicious_sidebar/test
+- vendor/plugins/delicious_sidebar/views
+- vendor/plugins/delicious_sidebar/lib/delicious.rb
+- vendor/plugins/delicious_sidebar/lib/delicious_sidebar.rb
+- vendor/plugins/delicious_sidebar/test/delicious_sidebar_test.rb
+- vendor/plugins/delicious_sidebar/views/content.rhtml
 - vendor/plugins/expiring_action_cache/init.rb
 - vendor/plugins/expiring_action_cache/lib
 - vendor/plugins/expiring_action_cache/lib/actionparamcache.rb
 - vendor/plugins/expiring_action_cache/lib/metafragment.rb
+- vendor/plugins/flickr_sidebar/init.rb
+- vendor/plugins/flickr_sidebar/lib
+- vendor/plugins/flickr_sidebar/Rakefile
+- vendor/plugins/flickr_sidebar/test
+- vendor/plugins/flickr_sidebar/views
+- vendor/plugins/flickr_sidebar/lib/flickr.rb
+- vendor/plugins/flickr_sidebar/lib/flickr_sidebar.rb
+- vendor/plugins/flickr_sidebar/test/flickr_sidebar_test.rb
+- vendor/plugins/flickr_sidebar/views/content.rhtml
+- vendor/plugins/fortythree_sidebar/init.rb
+- vendor/plugins/fortythree_sidebar/lib
+- vendor/plugins/fortythree_sidebar/Rakefile
+- vendor/plugins/fortythree_sidebar/test
+- vendor/plugins/fortythree_sidebar/views
+- vendor/plugins/fortythree_sidebar/lib/fortythree.rb
+- vendor/plugins/fortythree_sidebar/lib/fortythree_sidebar.rb
+- vendor/plugins/fortythree_sidebar/test/fortythree_sidebar_test.rb
+- vendor/plugins/fortythree_sidebar/views/content.rhtml
+- vendor/plugins/fortythreeplaces_sidebar/init.rb
+- vendor/plugins/fortythreeplaces_sidebar/lib
+- vendor/plugins/fortythreeplaces_sidebar/Rakefile
+- vendor/plugins/fortythreeplaces_sidebar/test
+- vendor/plugins/fortythreeplaces_sidebar/views
+- vendor/plugins/fortythreeplaces_sidebar/lib/fortythree.rb
+- vendor/plugins/fortythreeplaces_sidebar/lib/fortythreeplaces_sidebar.rb
+- vendor/plugins/fortythreeplaces_sidebar/test/fortythreeplaces_sidebar_test.rb
+- vendor/plugins/fortythreeplaces_sidebar/views/content.rhtml
+- vendor/plugins/haml/bin
+- vendor/plugins/haml/init.rb
+- vendor/plugins/haml/lib
+- vendor/plugins/haml/MIT-LICENSE
+- vendor/plugins/haml/Rakefile
+- vendor/plugins/haml/REFERENCE
+- vendor/plugins/haml/test
+- vendor/plugins/haml/VERSION
+- vendor/plugins/haml/bin/haml
+- vendor/plugins/haml/lib/haml
+- vendor/plugins/haml/lib/haml/buffer.rb
+- vendor/plugins/haml/lib/haml/engine.rb
+- vendor/plugins/haml/lib/haml/helpers
+- vendor/plugins/haml/lib/haml/helpers.rb
+- vendor/plugins/haml/lib/haml/template.rb
+- vendor/plugins/haml/lib/haml/helpers/action_view_mods.rb
+- vendor/plugins/haml/test/benchmark.rb
+- vendor/plugins/haml/test/engine_test.rb
+- vendor/plugins/haml/test/helper_test.rb
+- vendor/plugins/haml/test/mocks
+- vendor/plugins/haml/test/profile.rb
+- vendor/plugins/haml/test/results
+- vendor/plugins/haml/test/rhtml
+- vendor/plugins/haml/test/runner.rb
+- vendor/plugins/haml/test/template_test.rb
+- vendor/plugins/haml/test/templates
+- vendor/plugins/haml/test/mocks/article.rb
+- vendor/plugins/haml/test/results/content_for_layout.xhtml
+- vendor/plugins/haml/test/results/eval_suppressed.xhtml
+- vendor/plugins/haml/test/results/helpers.xhtml
+- vendor/plugins/haml/test/results/helpful.xhtml
+- vendor/plugins/haml/test/results/just_stuff.xhtml
+- vendor/plugins/haml/test/results/list.xhtml
+- vendor/plugins/haml/test/results/original_engine.xhtml
+- vendor/plugins/haml/test/results/partials.xhtml
+- vendor/plugins/haml/test/results/silent_script.xhtml
+- vendor/plugins/haml/test/results/standard.xhtml
+- vendor/plugins/haml/test/results/tag_parsing.xhtml
+- vendor/plugins/haml/test/results/very_basic.xhtml
+- vendor/plugins/haml/test/results/whitespace_handling.xhtml
+- vendor/plugins/haml/test/rhtml/standard.rhtml
+- vendor/plugins/haml/test/templates/_partial.haml
+- vendor/plugins/haml/test/templates/_text_area.haml
+- vendor/plugins/haml/test/templates/content_for_layout.haml
+- vendor/plugins/haml/test/templates/eval_suppressed.haml
+- vendor/plugins/haml/test/templates/helpers.haml
+- vendor/plugins/haml/test/templates/helpful.haml
+- vendor/plugins/haml/test/templates/just_stuff.haml
+- vendor/plugins/haml/test/templates/list.haml
+- vendor/plugins/haml/test/templates/original_engine.haml
+- vendor/plugins/haml/test/templates/partialize.haml
+- vendor/plugins/haml/test/templates/partials.haml
+- vendor/plugins/haml/test/templates/silent_script.haml
+- vendor/plugins/haml/test/templates/standard.haml
+- vendor/plugins/haml/test/templates/tag_parsing.haml
+- vendor/plugins/haml/test/templates/very_basic.haml
+- vendor/plugins/haml/test/templates/whitespace_handling.haml
+- vendor/plugins/localization/CHANGELOG
+- vendor/plugins/localization/init.rb
+- vendor/plugins/localization/lib
+- vendor/plugins/localization/README
+- vendor/plugins/localization/lib/localization.rb
+- vendor/plugins/magnolia_sidebar/init.rb
+- vendor/plugins/magnolia_sidebar/lib
+- vendor/plugins/magnolia_sidebar/Rakefile
+- vendor/plugins/magnolia_sidebar/test
+- vendor/plugins/magnolia_sidebar/views
+- vendor/plugins/magnolia_sidebar/lib/magnolia_aggregation.rb
+- vendor/plugins/magnolia_sidebar/lib/magnolia_sidebar.rb
+- vendor/plugins/magnolia_sidebar/test/magnolia_sidebar_test.rb
+- vendor/plugins/magnolia_sidebar/views/content.rhtml
+- vendor/plugins/recent_comments_sidebar/init.rb
+- vendor/plugins/recent_comments_sidebar/lib
+- vendor/plugins/recent_comments_sidebar/Rakefile
+- vendor/plugins/recent_comments_sidebar/test
+- vendor/plugins/recent_comments_sidebar/views
+- vendor/plugins/recent_comments_sidebar/lib/recent_comments_sidebar.rb
+- vendor/plugins/recent_comments_sidebar/test/recent_comments_sidebar_test.rb
+- vendor/plugins/recent_comments_sidebar/views/content.rhtml
+- vendor/plugins/static_sidebar/init.rb
+- vendor/plugins/static_sidebar/lib
+- vendor/plugins/static_sidebar/views
+- vendor/plugins/static_sidebar/lib/static_sidebar.rb
+- vendor/plugins/static_sidebar/views/content.rhtml
+- vendor/plugins/tada_sidebar/init.rb
+- vendor/plugins/tada_sidebar/lib
+- vendor/plugins/tada_sidebar/Rakefile
+- vendor/plugins/tada_sidebar/test
+- vendor/plugins/tada_sidebar/views
+- vendor/plugins/tada_sidebar/lib/tada.rb
+- vendor/plugins/tada_sidebar/lib/tada_sidebar.rb
+- vendor/plugins/tada_sidebar/test/tada_sidebar_test.rb
+- vendor/plugins/tada_sidebar/views/content.rhtml
+- vendor/plugins/tag_sidebar/init.rb
+- vendor/plugins/tag_sidebar/lib
+- vendor/plugins/tag_sidebar/Rakefile
+- vendor/plugins/tag_sidebar/test
+- vendor/plugins/tag_sidebar/views
+- vendor/plugins/tag_sidebar/lib/tag_sidebar.rb
+- vendor/plugins/tag_sidebar/test/tag_sidebar_test.rb
+- vendor/plugins/tag_sidebar/views/content.rhtml
+- vendor/plugins/technorati_sidebar/init.rb
+- vendor/plugins/technorati_sidebar/lib
+- vendor/plugins/technorati_sidebar/Rakefile
+- vendor/plugins/technorati_sidebar/test
+- vendor/plugins/technorati_sidebar/views
+- vendor/plugins/technorati_sidebar/lib/technorati.rb
+- vendor/plugins/technorati_sidebar/lib/technorati_sidebar.rb
+- vendor/plugins/technorati_sidebar/test/technorati_sidebar_test.rb
+- vendor/plugins/technorati_sidebar/views/content.rhtml
+- vendor/plugins/typo_textfilter_amazon/init.rb
+- vendor/plugins/typo_textfilter_amazon/install.rb
+- vendor/plugins/typo_textfilter_amazon/lib
+- vendor/plugins/typo_textfilter_amazon/Rakefile
+- vendor/plugins/typo_textfilter_amazon/README
+- vendor/plugins/typo_textfilter_amazon/tasks
+- vendor/plugins/typo_textfilter_amazon/test
+- vendor/plugins/typo_textfilter_amazon/lib/typo_textfilter_amazon.rb
+- vendor/plugins/typo_textfilter_amazon/tasks/typo_textfilter_amazon_tasks.rake
+- vendor/plugins/typo_textfilter_amazon/test/typo_textfilter_amazon_test.rb
+- vendor/plugins/typo_textfilter_code/init.rb
+- vendor/plugins/typo_textfilter_code/install.rb
+- vendor/plugins/typo_textfilter_code/lib
+- vendor/plugins/typo_textfilter_code/Rakefile
+- vendor/plugins/typo_textfilter_code/README
+- vendor/plugins/typo_textfilter_code/tasks
+- vendor/plugins/typo_textfilter_code/test
+- vendor/plugins/typo_textfilter_code/lib/typo_textfilter_code.rb
+- vendor/plugins/typo_textfilter_code/tasks/typo_textfilter_code_tasks.rake
+- vendor/plugins/typo_textfilter_code/test/typo_textfilter_code_test.rb
+- vendor/plugins/typo_textfilter_flickr/init.rb
+- vendor/plugins/typo_textfilter_flickr/install.rb
+- vendor/plugins/typo_textfilter_flickr/lib
+- vendor/plugins/typo_textfilter_flickr/Rakefile
+- vendor/plugins/typo_textfilter_flickr/README
+- vendor/plugins/typo_textfilter_flickr/tasks
+- vendor/plugins/typo_textfilter_flickr/test
+- vendor/plugins/typo_textfilter_flickr/lib/typo_textfilter_flickr.rb
+- vendor/plugins/typo_textfilter_flickr/tasks/typo_textfilter_flickr_tasks.rake
+- vendor/plugins/typo_textfilter_flickr/test/typo_textfilter_flickr_test.rb
+- vendor/plugins/typo_textfilter_htmlfilter/init.rb
+- vendor/plugins/typo_textfilter_htmlfilter/install.rb
+- vendor/plugins/typo_textfilter_htmlfilter/lib
+- vendor/plugins/typo_textfilter_htmlfilter/Rakefile
+- vendor/plugins/typo_textfilter_htmlfilter/README
+- vendor/plugins/typo_textfilter_htmlfilter/tasks
+- vendor/plugins/typo_textfilter_htmlfilter/test
+- vendor/plugins/typo_textfilter_htmlfilter/lib/typo_textfilter_htmlfilter.rb
+- vendor/plugins/typo_textfilter_htmlfilter/tasks/typo_textfilter_htmlfilter_tasks.rake
+- vendor/plugins/typo_textfilter_htmlfilter/test/typo_textfilter_htmlfilter_test.rb
+- vendor/plugins/typo_textfilter_lightbox/init.rb
+- vendor/plugins/typo_textfilter_lightbox/install.rb
+- vendor/plugins/typo_textfilter_lightbox/lib
+- vendor/plugins/typo_textfilter_lightbox/Rakefile
+- vendor/plugins/typo_textfilter_lightbox/README
+- vendor/plugins/typo_textfilter_lightbox/tasks
+- vendor/plugins/typo_textfilter_lightbox/test
+- vendor/plugins/typo_textfilter_lightbox/lib/typo_textfilter_lightbox.rb
+- vendor/plugins/typo_textfilter_lightbox/tasks/typo_textfilter_lightbox_tasks.rake
+- vendor/plugins/typo_textfilter_lightbox/test/typo_textfilter_lightbox_test.rb
+- vendor/plugins/typo_textfilter_markdown/init.rb
+- vendor/plugins/typo_textfilter_markdown/install.rb
+- vendor/plugins/typo_textfilter_markdown/lib
+- vendor/plugins/typo_textfilter_markdown/Rakefile
+- vendor/plugins/typo_textfilter_markdown/README
+- vendor/plugins/typo_textfilter_markdown/tasks
+- vendor/plugins/typo_textfilter_markdown/test
+- vendor/plugins/typo_textfilter_markdown/lib/typo_textfilter_markdown.rb
+- vendor/plugins/typo_textfilter_markdown/tasks/typo_textfilter_markdown_tasks.rake
+- vendor/plugins/typo_textfilter_markdown/test/typo_textfilter_markdown_test.rb
+- vendor/plugins/typo_textfilter_none/init.rb
+- vendor/plugins/typo_textfilter_none/install.rb
+- vendor/plugins/typo_textfilter_none/lib
+- vendor/plugins/typo_textfilter_none/Rakefile
+- vendor/plugins/typo_textfilter_none/README
+- vendor/plugins/typo_textfilter_none/tasks
+- vendor/plugins/typo_textfilter_none/test
+- vendor/plugins/typo_textfilter_none/lib/typo_textfilter_none.rb
+- vendor/plugins/typo_textfilter_none/tasks/typo_textfilter_none_tasks.rake
+- vendor/plugins/typo_textfilter_none/test/typo_textfilter_none_test.rb
+- vendor/plugins/typo_textfilter_smartypants/init.rb
+- vendor/plugins/typo_textfilter_smartypants/install.rb
+- vendor/plugins/typo_textfilter_smartypants/lib
+- vendor/plugins/typo_textfilter_smartypants/Rakefile
+- vendor/plugins/typo_textfilter_smartypants/README
+- vendor/plugins/typo_textfilter_smartypants/tasks
+- vendor/plugins/typo_textfilter_smartypants/test
+- vendor/plugins/typo_textfilter_smartypants/lib/typo_textfilter_smartypants.rb
+- vendor/plugins/typo_textfilter_smartypants/tasks/typo_textfilter_smartypants_tasks.rake
+- vendor/plugins/typo_textfilter_smartypants/test/typo_textfilter_smartypants_test.rb
+- vendor/plugins/typo_textfilter_sparkline/init.rb
+- vendor/plugins/typo_textfilter_sparkline/install.rb
+- vendor/plugins/typo_textfilter_sparkline/lib
+- vendor/plugins/typo_textfilter_sparkline/Rakefile
+- vendor/plugins/typo_textfilter_sparkline/README
+- vendor/plugins/typo_textfilter_sparkline/tasks
+- vendor/plugins/typo_textfilter_sparkline/test
+- vendor/plugins/typo_textfilter_sparkline/lib/typo_textfilter_sparkline.rb
+- vendor/plugins/typo_textfilter_sparkline/tasks/typo_textfilter_sparkline_tasks.rake
+- vendor/plugins/typo_textfilter_sparkline/test/typo_textfilter_sparkline_test.rb
+- vendor/plugins/typo_textfilter_textile/init.rb
+- vendor/plugins/typo_textfilter_textile/install.rb
+- vendor/plugins/typo_textfilter_textile/lib
+- vendor/plugins/typo_textfilter_textile/Rakefile
+- vendor/plugins/typo_textfilter_textile/README
+- vendor/plugins/typo_textfilter_textile/tasks
+- vendor/plugins/typo_textfilter_textile/test
+- vendor/plugins/typo_textfilter_textile/lib/typo_textfilter_textile.rb
+- vendor/plugins/typo_textfilter_textile/tasks/typo_textfilter_textile_tasks.rake
+- vendor/plugins/typo_textfilter_textile/test/typo_textfilter_textile_test.rb
+- vendor/plugins/typo_textfilter_textile_and_markdown/init.rb
+- vendor/plugins/typo_textfilter_textile_and_markdown/install.rb
+- vendor/plugins/typo_textfilter_textile_and_markdown/lib
+- vendor/plugins/typo_textfilter_textile_and_markdown/Rakefile
+- vendor/plugins/typo_textfilter_textile_and_markdown/README
+- vendor/plugins/typo_textfilter_textile_and_markdown/tasks
+- vendor/plugins/typo_textfilter_textile_and_markdown/test
+- vendor/plugins/typo_textfilter_textile_and_markdown/lib/typo_textfilter_textile_and_markdown.rb
+- vendor/plugins/typo_textfilter_textile_and_markdown/tasks/typo_textfilter_textile_and_markdown_tasks.rake
+- vendor/plugins/typo_textfilter_textile_and_markdown/test/typo_textfilter_textile_and_markdown_test.rb
+- vendor/plugins/typo_textfilter_tmcode/init.rb
+- vendor/plugins/typo_textfilter_tmcode/install.rb
+- vendor/plugins/typo_textfilter_tmcode/lib
+- vendor/plugins/typo_textfilter_tmcode/Rakefile
+- vendor/plugins/typo_textfilter_tmcode/README
+- vendor/plugins/typo_textfilter_tmcode/tasks
+- vendor/plugins/typo_textfilter_tmcode/test
+- vendor/plugins/typo_textfilter_tmcode/lib/typo_textfilter_tmcode.rb
+- vendor/plugins/typo_textfilter_tmcode/tasks/typo_textfilter_tmcode_tasks.rake
+- vendor/plugins/typo_textfilter_tmcode/test/typo_textfilter_tmcode_test.rb
+- vendor/plugins/upcoming_sidebar/init.rb
+- vendor/plugins/upcoming_sidebar/lib
+- vendor/plugins/upcoming_sidebar/Rakefile
+- vendor/plugins/upcoming_sidebar/test
+- vendor/plugins/upcoming_sidebar/views
+- vendor/plugins/upcoming_sidebar/lib/upcoming.rb
+- vendor/plugins/upcoming_sidebar/lib/upcoming_sidebar.rb
+- vendor/plugins/upcoming_sidebar/test/upcoming_sidebar_test.rb
+- vendor/plugins/upcoming_sidebar/views/content.rhtml
 - vendor/plugins/upload_progress/CHANGELOG
 - vendor/plugins/upload_progress/init.rb
 - vendor/plugins/upload_progress/lib
@@ -842,6 +1230,22 @@ files:
 - vendor/plugins/upload_progress/test/multipart_progress_testx.rb
 - vendor/plugins/upload_progress/test/upload_progress_helper_testx.rb
 - vendor/plugins/upload_progress/test/upload_progress_testx.rb
+- vendor/plugins/xbox_sidebar/init.rb
+- vendor/plugins/xbox_sidebar/lib
+- vendor/plugins/xbox_sidebar/Rakefile
+- vendor/plugins/xbox_sidebar/test
+- vendor/plugins/xbox_sidebar/views
+- vendor/plugins/xbox_sidebar/lib/xbox_sidebar.rb
+- vendor/plugins/xbox_sidebar/test/xbox_sidebar_test.rb
+- vendor/plugins/xbox_sidebar/views/content.rhtml
+- vendor/plugins/xml_sidebar/init.rb
+- vendor/plugins/xml_sidebar/lib
+- vendor/plugins/xml_sidebar/Rakefile
+- vendor/plugins/xml_sidebar/test
+- vendor/plugins/xml_sidebar/views
+- vendor/plugins/xml_sidebar/lib/xml_sidebar.rb
+- vendor/plugins/xml_sidebar/test/xml_sidebar_test.rb
+- vendor/plugins/xml_sidebar/views/content.rhtml
 - vendor/redcloth/bin
 - vendor/redcloth/doc
 - vendor/redcloth/install.rb
@@ -1014,7 +1418,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.6
+        version: "1.2"
     version: 
 - !ruby/object:Gem::Dependency 
   name: mongrel