zena 1.2.4 → 1.2.5

data/test/unit/zena/use/rendering_test.rb

@@ -40,7 +40,7 @@ class RenderingTest < Zena::View::TestCase
   end # With a node and skin
 end
 
-class RenderingInControllerTest < Zena::Controller::TestCase
+class RenderingControllerTest < Zena::Controller::TestCase
   tests NodesController
 
   class MockSession < ActiveRecord::Base

data/zena.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zena}
-  s.version = "1.2.4"
+  s.version = "1.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2013-06-13}
+  s.date = %q{2013-07-15}
   s.default_executable = %q{zena}
   s.description = %q{zena is a Ruby on Rails  CMS (content managment system) with a focus on usability, ease of customization and web 2.0 goodness (application like behaviour).}
   s.email = %q{gaspard@teti.ch}
@@ -298,13 +298,15 @@ Gem::Specification.new do |s|
     "bricks/acls/zena/test/sites/erebus/sites.yml",
     "bricks/acls/zena/test/sites/erebus/users.yml",
     "bricks/acls/zena/test/unit/acl_test.rb",
+    "bricks/activity/lib/bricks/activity.rb",
+    "bricks/activity/zena/migrate/20130711135905_add_activity_to_user.rb",
+    "bricks/activity/zena/test/integration/activity_integration_test.rb",
     "bricks/captcha/MIT-LICENSE",
     "bricks/captcha/README",
     "bricks/captcha/lib/bricks/captcha.rb",
     "bricks/captcha/zena/init.rb",
     "bricks/captcha/zena/test/zafu/captcha.yml",
     "bricks/fs_skin/lib/bricks/fs_skin.rb",
-    "bricks/fs_skin/zena/init.rb",
     "bricks/fs_skin/zena/migrate/20110702010330_add_fs_skin_to_idx_templates.rb",
     "bricks/fs_skin/zena/skins/blog/Image-edit.zafu",
     "bricks/fs_skin/zena/skins/blog/Image.zafu",
@@ -327,7 +329,6 @@ Gem::Specification.new do |s|
     "bricks/fs_skin/zena/test/integration/fs_skin_integration_test.rb",
     "bricks/fs_skin/zena/test/unit/fs_skin_test.rb",
     "bricks/grid/lib/bricks/grid.rb",
-    "bricks/grid/zena/init.rb",
     "bricks/math/lib/bricks/math.rb",
     "bricks/math/zena/init.rb",
     "bricks/mongrel/README",
@@ -357,7 +358,6 @@ Gem::Specification.new do |s|
     "bricks/pdf/zena/init.rb",
     "bricks/pdf/zena/tasks.rb",
     "bricks/single/lib/bricks/single.rb",
-    "bricks/single/zena/init.rb",
     "bricks/sphinx/MIT-LICENSE",
     "bricks/sphinx/README",
     "bricks/sphinx/lib/bricks/sphinx.rb",
@@ -368,7 +368,6 @@ Gem::Specification.new do |s|
     "bricks/sphinx/zena/tasks.rb",
     "bricks/spreadsheet/README",
     "bricks/spreadsheet/lib/bricks/spreadsheet.rb",
-    "bricks/spreadsheet/zena/init.rb",
     "bricks/spreadsheet/zena/test/sites/zena/links.yml",
     "bricks/spreadsheet/zena/test/unit/xlsx_test.rb",
     "bricks/spreadsheet/zena/test/zafu/README",
@@ -403,6 +402,8 @@ Gem::Specification.new do |s|
     "bricks/zena/zena/migrate/20120605091558_add_ssl_login_to_site.rb",
     "bricks/zena/zena/migrate/20120630123551_add_auto_publish_to_group.rb",
     "bricks/zena/zena/migrate/20120904071601_change_link_status_to_float.rb",
+    "bricks/zena/zena/migrate/20130617164527_add_master_id_to_site.rb",
+    "bricks/zena/zena/migrate/20130712081512_alter_login_users.rb",
     "config/boot.rb",
     "config/bricks.yml",
     "config/database_example.yml",
@@ -2477,87 +2478,87 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
-      s.add_runtime_dependency(%q<fast_gettext>, ["~> 0.4.16"])
-      s.add_runtime_dependency(%q<rubyless>, ["= 0.8.10"])
-      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
-      s.add_runtime_dependency(%q<json>, ["= 1.5.1"])
-      s.add_runtime_dependency(%q<shoulda>, ["= 2.10.3"])
-      s.add_runtime_dependency(%q<httmultiparty>, ["= 0.3.8"])
-      s.add_runtime_dependency(%q<gem_plugin>, [">= 0"])
-      s.add_runtime_dependency(%q<daemons>, [">= 0"])
+      s.add_runtime_dependency(%q<RedCloth>, ["= 3.0.4"])
+      s.add_runtime_dependency(%q<versions>, ["= 0.3.1"])
       s.add_runtime_dependency(%q<yamltest>, ["= 0.7.0"])
+      s.add_runtime_dependency(%q<simple_xlsx_writer>, [">= 0"])
+      s.add_runtime_dependency(%q<gettext>, ["= 2.1.0"])
+      s.add_runtime_dependency(%q<will_paginate>, ["~> 2.3.12"])
+      s.add_runtime_dependency(%q<safe_yaml>, ["= 0.8.0"])
+      s.add_runtime_dependency(%q<differ>, ["= 0.1.2"])
+      s.add_runtime_dependency(%q<json>, ["= 1.5.1"])
       s.add_runtime_dependency(%q<open4>, [">= 0"])
+      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
       s.add_runtime_dependency(%q<authlogic>, ["= 2.1.3"])
-      s.add_runtime_dependency(%q<safe_yaml>, ["= 0.8.0"])
-      s.add_runtime_dependency(%q<rails>, ["= 2.3.18"])
+      s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
       s.add_runtime_dependency(%q<hpricot>, [">= 0"])
-      s.add_runtime_dependency(%q<querybuilder>, ["= 1.2.2"])
-      s.add_runtime_dependency(%q<simple_xlsx_writer>, [">= 0"])
-      s.add_runtime_dependency(%q<property>, ["= 2.3.2"])
       s.add_runtime_dependency(%q<uuidtools>, ["= 2.0.0"])
-      s.add_runtime_dependency(%q<syntax>, ["= 1.0.0"])
-      s.add_runtime_dependency(%q<will_paginate>, ["~> 2.3.12"])
+      s.add_runtime_dependency(%q<httmultiparty>, ["= 0.3.8"])
+      s.add_runtime_dependency(%q<shoulda>, ["= 2.10.3"])
+      s.add_runtime_dependency(%q<rails>, ["= 2.3.18"])
+      s.add_runtime_dependency(%q<daemons>, [">= 0"])
+      s.add_runtime_dependency(%q<fast_gettext>, ["~> 0.4.16"])
+      s.add_runtime_dependency(%q<gem_plugin>, [">= 0"])
       s.add_runtime_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
-      s.add_runtime_dependency(%q<RedCloth>, ["= 3.0.4"])
-      s.add_runtime_dependency(%q<versions>, ["= 0.3.1"])
-      s.add_runtime_dependency(%q<differ>, ["= 0.1.2"])
-      s.add_runtime_dependency(%q<gettext>, ["= 2.1.0"])
+      s.add_runtime_dependency(%q<querybuilder>, ["= 1.2.2"])
+      s.add_runtime_dependency(%q<rubyless>, ["= 0.8.10"])
+      s.add_runtime_dependency(%q<syntax>, ["= 1.0.0"])
+      s.add_runtime_dependency(%q<property>, ["= 2.3.2"])
     else
-      s.add_dependency(%q<tzinfo>, [">= 0"])
-      s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
-      s.add_dependency(%q<rubyless>, ["= 0.8.10"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<json>, ["= 1.5.1"])
-      s.add_dependency(%q<shoulda>, ["= 2.10.3"])
-      s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
-      s.add_dependency(%q<gem_plugin>, [">= 0"])
-      s.add_dependency(%q<daemons>, [">= 0"])
+      s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
+      s.add_dependency(%q<versions>, ["= 0.3.1"])
       s.add_dependency(%q<yamltest>, ["= 0.7.0"])
+      s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
+      s.add_dependency(%q<gettext>, ["= 2.1.0"])
+      s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
+      s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
+      s.add_dependency(%q<differ>, ["= 0.1.2"])
+      s.add_dependency(%q<json>, ["= 1.5.1"])
       s.add_dependency(%q<open4>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<authlogic>, ["= 2.1.3"])
-      s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
-      s.add_dependency(%q<rails>, ["= 2.3.18"])
+      s.add_dependency(%q<tzinfo>, [">= 0"])
       s.add_dependency(%q<hpricot>, [">= 0"])
-      s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
-      s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
-      s.add_dependency(%q<property>, ["= 2.3.2"])
       s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
-      s.add_dependency(%q<syntax>, ["= 1.0.0"])
-      s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
+      s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
+      s.add_dependency(%q<shoulda>, ["= 2.10.3"])
+      s.add_dependency(%q<rails>, ["= 2.3.18"])
+      s.add_dependency(%q<daemons>, [">= 0"])
+      s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
+      s.add_dependency(%q<gem_plugin>, [">= 0"])
       s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
-      s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
-      s.add_dependency(%q<versions>, ["= 0.3.1"])
-      s.add_dependency(%q<differ>, ["= 0.1.2"])
-      s.add_dependency(%q<gettext>, ["= 2.1.0"])
+      s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
+      s.add_dependency(%q<rubyless>, ["= 0.8.10"])
+      s.add_dependency(%q<syntax>, ["= 1.0.0"])
+      s.add_dependency(%q<property>, ["= 2.3.2"])
     end
   else
-    s.add_dependency(%q<tzinfo>, [">= 0"])
-    s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
-    s.add_dependency(%q<rubyless>, ["= 0.8.10"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<json>, ["= 1.5.1"])
-    s.add_dependency(%q<shoulda>, ["= 2.10.3"])
-    s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
-    s.add_dependency(%q<gem_plugin>, [">= 0"])
-    s.add_dependency(%q<daemons>, [">= 0"])
+    s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
+    s.add_dependency(%q<versions>, ["= 0.3.1"])
     s.add_dependency(%q<yamltest>, ["= 0.7.0"])
+    s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
+    s.add_dependency(%q<gettext>, ["= 2.1.0"])
+    s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
+    s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
+    s.add_dependency(%q<differ>, ["= 0.1.2"])
+    s.add_dependency(%q<json>, ["= 1.5.1"])
     s.add_dependency(%q<open4>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<authlogic>, ["= 2.1.3"])
-    s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
-    s.add_dependency(%q<rails>, ["= 2.3.18"])
+    s.add_dependency(%q<tzinfo>, [">= 0"])
     s.add_dependency(%q<hpricot>, [">= 0"])
-    s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
-    s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
-    s.add_dependency(%q<property>, ["= 2.3.2"])
     s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
-    s.add_dependency(%q<syntax>, ["= 1.0.0"])
-    s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
+    s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
+    s.add_dependency(%q<shoulda>, ["= 2.10.3"])
+    s.add_dependency(%q<rails>, ["= 2.3.18"])
+    s.add_dependency(%q<daemons>, [">= 0"])
+    s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
+    s.add_dependency(%q<gem_plugin>, [">= 0"])
     s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
-    s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
-    s.add_dependency(%q<versions>, ["= 0.3.1"])
-    s.add_dependency(%q<differ>, ["= 0.1.2"])
-    s.add_dependency(%q<gettext>, ["= 2.1.0"])
+    s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
+    s.add_dependency(%q<rubyless>, ["= 0.8.10"])
+    s.add_dependency(%q<syntax>, ["= 1.0.0"])
+    s.add_dependency(%q<property>, ["= 2.3.2"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zena
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 2
-  - 4
-  version: 1.2.4
+  - 5
+  version: 1.2.5
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -15,57 +15,59 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-13 00:00:00 +02:00
+date: 2013-07-15 00:00:00 +02:00
 default_executable: zena
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: tzinfo
+  name: RedCloth
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
+        - 3
         - 0
-        version: "0"
+        - 4
+        version: 3.0.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: fast_gettext
+  name: versions
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 17
         segments: 
         - 0
-        - 4
-        - 16
-        version: 0.4.16
+        - 3
+        - 1
+        version: 0.3.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rubyless
+  name: yamltest
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 43
+        hash: 3
         segments: 
         - 0
-        - 8
-        - 10
-        version: 0.8.10
+        - 7
+        - 0
+        version: 0.7.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: simple_xlsx_writer
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -79,99 +81,101 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: gettext
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 11
         segments: 
+        - 2
         - 1
-        - 5
-        - 1
-        version: 1.5.1
+        - 0
+        version: 2.1.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: will_paginate
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 33
+        hash: 27
         segments: 
         - 2
-        - 10
         - 3
-        version: 2.10.3
+        - 12
+        version: 2.3.12
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: httmultiparty
+  name: safe_yaml
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 63
         segments: 
         - 0
-        - 3
         - 8
-        version: 0.3.8
+        - 0
+        version: 0.8.0
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: gem_plugin
+  name: differ
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 31
         segments: 
         - 0
-        version: "0"
+        - 1
+        - 2
+        version: 0.1.2
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: daemons
+  name: json
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 5
+        - 1
+        version: 1.5.1
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: yamltest
+  name: open4
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
         - 0
-        - 7
-        - 0
-        version: 0.7.0
+        version: "0"
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: open4
+  name: jeweler
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
@@ -201,143 +205,139 @@ dependencies:
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: safe_yaml
+  name: tzinfo
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 3
         segments: 
         - 0
-        - 8
-        - 0
-        version: 0.8.0
+        version: "0"
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: hpricot
   prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 39
+        hash: 3
         segments: 
-        - 2
-        - 3
-        - 18
-        version: 2.3.18
+        - 0
+        version: "0"
   type: :runtime
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  name: uuidtools
   prerelease: false
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
+        - 2
         - 0
-        version: "0"
+        - 0
+        version: 2.0.0
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: querybuilder
+  name: httmultiparty
   prerelease: false
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 3
         segments: 
-        - 1
-        - 2
-        - 2
-        version: 1.2.2
+        - 0
+        - 3
+        - 8
+        version: 0.3.8
   type: :runtime
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
-  name: simple_xlsx_writer
+  name: shoulda
   prerelease: false
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 33
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 10
+        - 3
+        version: 2.10.3
   type: :runtime
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
-  name: property
+  name: rails
   prerelease: false
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 39
         segments: 
         - 2
         - 3
-        - 2
-        version: 2.3.2
+        - 18
+        version: 2.3.18
   type: :runtime
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
-  name: uuidtools
+  name: daemons
   prerelease: false
   requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
-        - 2
-        - 0
         - 0
-        version: 2.0.0
+        version: "0"
   type: :runtime
   version_requirements: *id019
 - !ruby/object:Gem::Dependency 
-  name: syntax
+  name: fast_gettext
   prerelease: false
   requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 47
         segments: 
-        - 1
-        - 0
         - 0
-        version: 1.0.0
+        - 4
+        - 16
+        version: 0.4.16
   type: :runtime
   version_requirements: *id020
 - !ruby/object:Gem::Dependency 
-  name: will_paginate
+  name: gem_plugin
   prerelease: false
   requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 3
         segments: 
-        - 2
-        - 3
-        - 12
-        version: 2.3.12
+        - 0
+        version: "0"
   type: :runtime
   version_requirements: *id021
 - !ruby/object:Gem::Dependency 
@@ -357,67 +357,67 @@ dependencies:
   type: :runtime
   version_requirements: *id022
 - !ruby/object:Gem::Dependency 
-  name: RedCloth
+  name: querybuilder
   prerelease: false
   requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 27
         segments: 
-        - 3
-        - 0
-        - 4
-        version: 3.0.4
+        - 1
+        - 2
+        - 2
+        version: 1.2.2
   type: :runtime
   version_requirements: *id023
 - !ruby/object:Gem::Dependency 
-  name: versions
+  name: rubyless
   prerelease: false
   requirement: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 43
         segments: 
         - 0
-        - 3
-        - 1
-        version: 0.3.1
+        - 8
+        - 10
+        version: 0.8.10
   type: :runtime
   version_requirements: *id024
 - !ruby/object:Gem::Dependency 
-  name: differ
+  name: syntax
   prerelease: false
   requirement: &id025 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 23
         segments: 
-        - 0
         - 1
-        - 2
-        version: 0.1.2
+        - 0
+        - 0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id025
 - !ruby/object:Gem::Dependency 
-  name: gettext
+  name: property
   prerelease: false
   requirement: &id026 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 7
         segments: 
         - 2
-        - 1
-        - 0
-        version: 2.1.0
+        - 3
+        - 2
+        version: 2.3.2
   type: :runtime
   version_requirements: *id026
 description: zena is a Ruby on Rails  CMS (content managment system) with a focus on usability, ease of customization and web 2.0 goodness (application like behaviour).
@@ -709,13 +709,15 @@ files:
 - bricks/acls/zena/test/sites/erebus/sites.yml
 - bricks/acls/zena/test/sites/erebus/users.yml
 - bricks/acls/zena/test/unit/acl_test.rb
+- bricks/activity/lib/bricks/activity.rb
+- bricks/activity/zena/migrate/20130711135905_add_activity_to_user.rb
+- bricks/activity/zena/test/integration/activity_integration_test.rb
 - bricks/captcha/MIT-LICENSE
 - bricks/captcha/README
 - bricks/captcha/lib/bricks/captcha.rb
 - bricks/captcha/zena/init.rb
 - bricks/captcha/zena/test/zafu/captcha.yml
 - bricks/fs_skin/lib/bricks/fs_skin.rb
-- bricks/fs_skin/zena/init.rb
 - bricks/fs_skin/zena/migrate/20110702010330_add_fs_skin_to_idx_templates.rb
 - bricks/fs_skin/zena/skins/blog/Image-edit.zafu
 - bricks/fs_skin/zena/skins/blog/Image.zafu
@@ -738,7 +740,6 @@ files:
 - bricks/fs_skin/zena/test/integration/fs_skin_integration_test.rb
 - bricks/fs_skin/zena/test/unit/fs_skin_test.rb
 - bricks/grid/lib/bricks/grid.rb
-- bricks/grid/zena/init.rb
 - bricks/math/lib/bricks/math.rb
 - bricks/math/zena/init.rb
 - bricks/mongrel/README
@@ -768,7 +769,6 @@ files:
 - bricks/pdf/zena/init.rb
 - bricks/pdf/zena/tasks.rb
 - bricks/single/lib/bricks/single.rb
-- bricks/single/zena/init.rb
 - bricks/sphinx/MIT-LICENSE
 - bricks/sphinx/README
 - bricks/sphinx/lib/bricks/sphinx.rb
@@ -779,7 +779,6 @@ files:
 - bricks/sphinx/zena/tasks.rb
 - bricks/spreadsheet/README
 - bricks/spreadsheet/lib/bricks/spreadsheet.rb
-- bricks/spreadsheet/zena/init.rb
 - bricks/spreadsheet/zena/test/sites/zena/links.yml
 - bricks/spreadsheet/zena/test/unit/xlsx_test.rb
 - bricks/spreadsheet/zena/test/zafu/README
@@ -814,6 +813,8 @@ files:
 - bricks/zena/zena/migrate/20120605091558_add_ssl_login_to_site.rb
 - bricks/zena/zena/migrate/20120630123551_add_auto_publish_to_group.rb
 - bricks/zena/zena/migrate/20120904071601_change_link_status_to_float.rb
+- bricks/zena/zena/migrate/20130617164527_add_master_id_to_site.rb
+- bricks/zena/zena/migrate/20130712081512_alter_login_users.rb
 - config/boot.rb
 - config/bricks.yml
 - config/database_example.yml