418a5d654b480854ee9ccd8ba0946cc130d2806d Henri Bergius henri.bergius@iki.fi http://github.com/bergie/midcom/commit/90f5e931f176c3a0104a3baddcebe9505d54d3e4 90f5e931f176c3a0104a3baddcebe9505d54d3e4

2008-12-05T05:42:10-08:00

Merge branch 'master' into trunk Conflicts: build.xml midcom_core/component/baseclass.php midcom_core/component/interface.php midcom_core/component/loader.php midcom_core/configuration/defaults.yml midcom_core/controllers/comet.php midcom_core/controllers/page.php midcom_core/documentation/usage.txt midcom_core/exceptionhandler.php midcom_core/framework.php midcom_core/helpers/context.php midcom_core/helpers/head.php midcom_core/helpers/navigation.php midcom_core/helpers/toolbar/tal.php midcom_core/midcom.php midcom_core/services/authentication/basic.php midcom_core/services/authorization.php midcom_core/services/authorization/simple.php midcom_core/services/configuration.php midcom_core/services/configuration/yaml.php midcom_core/services/dispatcher/manual.php midcom_core/services/dispatcher/midgard.php midcom_core/services/sessioning.php midcom_core/services/sessioning/midgard.php midcom_core/services/templating/midgard.php midcom_core/services/toolbars.php midcom_core/services/toolbars/float.php midcom_core/services/uimessages.php midcom_core/services/uimessages/midgard.php midcom_core/static/midcom.js midcom_core/static/services/toolbars/float.css midcom_core/static/services/toolbars/float.js midcom_core/templates/ROOT.php midcom_core/templates/midcom-comet-messages.php midcom_core/templates/midcom-delete-page.php midcom_core/templates/midcom-edit-page.php midcom_core/templates/midcom_helpers_toolbar_tal.php midcom_helper_datamanager/datamanager.php midcom_helper_datamanager/exceptions.php midcom_helper_datamanager/manifest.yml midcom_helper_datamanager/schema.php midcom_helper_datamanager/storage.php midcom_helper_datamanager/storage/midgard.php midcom_helper_datamanager/tests/typesTest.php midcom_helper_datamanager/type.php midcom_helper_datamanager/typeproxy.php midcom_helper_datamanager/widget.php midcom_helper_datamanager/widget/text.php midcom_helper_datamanager/widgetproxy.php net_nemein_comettest/controllers/index.php net_nemein_news/configuration/defaults.yml net_nemein_news/configuration/schema.yml net_nemein_news/controllers/article.php net_nemein_news/templates/nnn-edit-article.php net_nemein_news/templates/nnn-show-article.php net_nemein_news/tests/articleTest.php net_nemein_news/tests/routesTest.php org_openpsa_qbpager/pager.php scaffold/tests/all.php tests/all.php tests/helpers.php tests/selenium/all.php tests/selenium/localhostTest.php tests/seleniumcase.php tests/testcase.php git-svn-id: https://svn.midgard-project.org/midgard/trunk/midcom@19573 62f49d1c-1c16-0410-9156-d311ce72abac diff timed out because it was too large 1751cbbdfe06c70b4827b93ada529e106e2f7338 Henri Bergius henri.bergius@iki.fi