Changeset [e125d2d7f69ea76628e028d39e91cbe733041e6c] by renoke
September 2nd, 2009 @ 08:31 PM
Merge branch 'master' of github.com:zena/zena
Conflicts:
test/unit/comment_test.rb
http://github.com/zena/zena/commit/e125d2d7f69ea76628e028d39e91cbe7...
Committed by renoke
- A lib/zena/test_controller.rb
- A lib/zena/use/custom_queries/complex.host.yml
- A lib/zena/view/test_case.rb
- A test/unit/zafu_parser/ajax.yml
- A test/unit/zafu_parser/apphelper.yml
- A test/unit/zafu_parser/basic.yml
- A test/unit/zafu_parser/complex.yml
- A test/unit/zafu_parser/data.yml
- A test/unit/zafu_parser/errors.yml
- A test/unit/zafu_parser/eval.yml
- A test/unit/zafu_parser/relations.yml
- A test/unit/zafu_parser/zazen.yml
- A test/unit/zafu_parser_test.rb
- A test/unit/zena/use/html_tags_test.rb
- A test/unit/zena/use/i18n_test.rb
- A test/unit/zena/use/zazen_test.rb
- R lib/custom_queries/complex.host.yml
- R test/helpers/application_helper_test.rb
- R test/helpers/testhelp.rb
- R test/helpers/zazen_test.rb
- R test/helpers/zena_parser/ajax.yml
- R test/helpers/zena_parser/apphelper.yml
- R test/helpers/zena_parser/basic.yml
- R test/helpers/zena_parser/complex.yml
- R test/helpers/zena_parser/data.yml
- R test/helpers/zena_parser/errors.yml
- R test/helpers/zena_parser/eval.yml
- R test/helpers/zena_parser/relations.yml
- R test/helpers/zena_parser/zazen.yml
- R test/helpers/zena_parser_test.rb
- M TODO_ZENA_1_0
- M app/controllers/application_controller.rb
- M app/models/node.rb
- M config/environment.rb
- M lib/tasks/zena.rake
- M lib/zazen/rules.rb
- M lib/zena/unit/test_case.rb
- M lib/zena/use/i18n.rb
- M lib/zena/use/node_query_finders.rb
- M lib/zena/use/test_helper.rb
- M lib/zena/use/zazen.rb
- M test/functional/comments_controller_test.rb
- M test/helpers/node_query_test.rb
- M test/sites/zena/data_entries.yml
- M test/sites/zena/versions.yml
- M test/test_zena.rb
- M test/unit/comment_test.rb
- M test/unit/data_entry_test.rb
- M test/unit/document_content_test.rb
- M test/unit/iformat_test.rb
- M test/unit/multiversion_test.rb
- M test/unit/node_test.rb
- M test/unit/page_test.rb
- M test/unit/relation_proxy_test.rb
- M test/unit/relation_test.rb
- M test/unit/secure_test.rb
- M test/unit/site_test.rb
- M test/unit/template_test.rb
- M test/unit/user_test.rb
- M test/unit/version_test.rb
- M test/unit/zena/use/urls_test.rb
- M test/unit/zena/use/zafu_test.rb
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile »
Anyone knows how to use formatting here ?
Git repository: http://github.com/zena
Official website: http://zenadmin.org