Changeset [0c0e3becc9a2acc11b2496b21239137929b56b25] by Gaspard Bucher
Revision 0c0e3becc9a2acc11b2496b21239137929b56b25,
committed by Gaspard Bucher
· April 15th, 2010 @ 09:32 PM
Merge branch 'master' into 1.0-pre.
http://github.com/zena/zena/commit/0c0e3becc9a2acc11b2496b212391379...
17 changed files
-
M
History.txt -
M
Rakefile -
M
app/controllers/nodes_controller.rb -
M
app/models/node.rb -
M
app/views/templates/defaults/+login.zafu -
M
app/views/templates/document_create_tabs/_file.rhtml -
M
bricks/sphinx/misc/tasks.rb -
M
bricks/worker/misc/tasks.rb -
M
bricks/worker/misc/worker -
M
config/bricks.yml -
M
db/init/base/skins/default/Node-+login.zafu -
M
lib/bricks/requirements_validation.rb -
M
lib/zena/info.rb -
M
lib/zena/use/html_tags.rb -
M
public/javascripts/zena.js -
M
test/unit/node_test.rb -
M
zena.gemspec