Changeset [e4a0ec2b306b2c9994199a60dbbfa0d853c5b538] by Gaspard Bucher
Revision e4a0ec2b306b2c9994199a60dbbfa0d853c5b538,
committed by Gaspard Bucher
· February 15th, 2010 @ 10:09 AM
Merge branch 'master' into 1.0-pre
http://github.com/zena/zena/commit/e4a0ec2b306b2c9994199a60dbbfa0d8...
61 changed files
-
A
lib/zena/base_additions.rb -
A
lib/zena/core_ext/date_time.rb -
A
lib/zena/core_ext/dir.rb -
A
lib/zena/core_ext/fixnum.rb -
A
lib/zena/core_ext/string.rb -
A
lib/zena/fix_rails_layouts.rb -
A
lib/zena/use/image_builder.rb -
A
lib/zena/use/query_comment.rb -
A
lib/zena/use/query_node.rb -
A
lib/zena/use/query_node_finders.rb -
A
lib/zena/webdav_adapter.rb -
A
locale/de/LC_MESSAGES/zena.mo -
A
locale/de/zena.po -
A
public/calendar/lang/calendar-de-utf8.js -
A
public/calendar/menuarrow.gif -
A
test/helpers/query_node/basic.yml -
A
test/helpers/query_node/comments.yml -
A
test/helpers/query_node/complex.yml -
A
test/helpers/query_node/filters.yml -
A
test/helpers/query_node/relations.yml -
A
test/helpers/query_node_test.rb -
A
zena_console.rb -
R
lib/base_additions.rb -
R
lib/comment_query.rb -
R
lib/core_ext/date_time.rb -
R
lib/core_ext/dir.rb -
R
lib/core_ext/fixnum.rb -
R
lib/core_ext/string.rb -
R
lib/fix_rails_layouts.rb -
R
lib/image_builder.rb -
R
lib/webdav_adapter.rb -
R
lib/zena/use/node_query_finders.rb -
R
test/helpers/node_query/basic.yml -
R
test/helpers/node_query/comments.yml -
R
test/helpers/node_query/complex.yml -
R
test/helpers/node_query/filters.yml -
R
test/helpers/node_query/relations.yml -
R
test/helpers/node_query_test.rb -
R
vendor/bricks/20070122-172926.txt -
M
.gitignore -
M
app/controllers/nodes_controller.rb -
M
app/controllers/versions_controller.rb -
M
app/models/iformat.rb -
M
app/models/image.rb -
M
app/models/image_content.rb -
M
app/views/templates/edit_tabs/_image.rhtml -
M
bricks/tags/patch/node.rb -
M
config/gems.yml -
M
db/migrate/047_change_default_link_id_to_zero.rb -
M
db/migrate/20090825201159_insert_zero_link.rb -
M
lib/zena.rb -
M
lib/zena/info.rb -
M
lib/zena/use/html_tags.rb -
M
test/custom_queries/complex.host.yml -
M
test/functional/virtual_classes_controller_test.rb -
M
test/test_helper.rb -
M
test/test_zena.rb -
M
test/unit/core_ext_test.rb -
M
test/unit/iformat_test.rb -
M
test/unit/image_builder_test.rb -
M
test/unit/zena/use/upload_test.rb