Navigation

← Previous Changeset
Next Changeset →

Changeset 405

Timestamp:

04/24/07 01:26:36 (1 year ago)

Author:

jlong

Message:

merged changes from the mental branch into trunk r125:404

Files:

trunk/radiant/CHANGELOG (modified) (1 diff)
trunk/radiant/CONTRIBUTORS (modified) (1 diff)
trunk/radiant/INSTALL (copied) (copied from branches/mental/radiant/INSTALL)
trunk/radiant/LICENSE (modified) (1 diff)
trunk/radiant/README (modified) (4 diffs)
trunk/radiant/Rakefile (modified) (2 diffs)
trunk/radiant/app/behaviors (deleted)
trunk/radiant/app/controllers/admin/abstract_model_controller.rb (copied) (copied from branches/mental/radiant/app/controllers/admin/abstract_model_controller.rb)
trunk/radiant/app/controllers/admin/export_controller.rb (modified) (1 diff)
trunk/radiant/app/controllers/admin/extension_controller.rb (copied) (copied from branches/mental/radiant/app/controllers/admin/extension_controller.rb)
trunk/radiant/app/controllers/admin/layout_controller.rb (modified) (1 diff)
trunk/radiant/app/controllers/admin/model_controller.rb (deleted)
trunk/radiant/app/controllers/admin/page_controller.rb (modified) (4 diffs)
trunk/radiant/app/controllers/admin/snippet_controller.rb (modified) (1 diff)
trunk/radiant/app/controllers/admin/user_controller.rb (modified) (3 diffs)
trunk/radiant/app/controllers/admin/welcome_controller.rb (modified) (3 diffs)
trunk/radiant/app/controllers/application.rb (modified) (4 diffs)
trunk/radiant/app/controllers/site_controller.rb (modified) (4 diffs)
trunk/radiant/app/filters (deleted)
trunk/radiant/app/helpers/admin/export_helper.rb (modified) (1 diff)
trunk/radiant/app/helpers/admin/extension_helper.rb (copied) (copied from branches/mental/radiant/app/helpers/admin/extension_helper.rb)
trunk/radiant/app/helpers/admin/page_helper.rb (modified) (2 diffs)
trunk/radiant/app/helpers/application_helper.rb (modified) (5 diffs)
trunk/radiant/app/models/archive_day_index_page.rb (copied) (copied from branches/mental/radiant/app/models/archive_day_index_page.rb)
trunk/radiant/app/models/archive_finder.rb (modified) (1 diff)
trunk/radiant/app/models/archive_month_index_page.rb (copied) (copied from branches/mental/radiant/app/models/archive_month_index_page.rb)
trunk/radiant/app/models/archive_page.rb (copied) (copied from branches/mental/radiant/app/models/archive_page.rb)
trunk/radiant/app/models/archive_year_index_page.rb (copied) (copied from branches/mental/radiant/app/models/archive_year_index_page.rb)
trunk/radiant/app/models/behavior.rb (deleted)
trunk/radiant/app/models/env_dump_page.rb (copied) (copied from branches/mental/radiant/app/models/env_dump_page.rb)
trunk/radiant/app/models/file_not_found_page.rb (copied) (copied from branches/mental/radiant/app/models/file_not_found_page.rb)
trunk/radiant/app/models/layout.rb (modified) (1 diff)
trunk/radiant/app/models/page.rb (modified) (6 diffs)
trunk/radiant/app/models/page_context.rb (modified) (5 diffs)
trunk/radiant/app/models/page_part.rb (modified) (2 diffs)
trunk/radiant/app/models/radiant/config.rb (modified) (2 diffs)
trunk/radiant/app/models/radiant/extension_meta.rb (copied) (copied from branches/mental/radiant/app/models/radiant/extension_meta.rb)
trunk/radiant/app/models/response_cache.rb (modified) (7 diffs)
trunk/radiant/app/models/snippet.rb (modified) (2 diffs)
trunk/radiant/app/models/standard_tags.rb (copied) (copied from branches/mental/radiant/app/models/standard_tags.rb)
trunk/radiant/app/models/status.rb (modified) (1 diff)
trunk/radiant/app/models/text_filter.rb (modified) (1 diff)
trunk/radiant/app/models/user.rb (modified) (1 diff)
trunk/radiant/app/views/admin/extension (copied) (copied from branches/mental/radiant/app/views/admin/extension)
trunk/radiant/app/views/admin/extension/index.rhtml (copied) (copied from branches/mental/radiant/app/views/admin/extension/index.rhtml)
trunk/radiant/app/views/admin/layout/edit.rhtml (copied) (copied from branches/mental/radiant/app/views/admin/layout/edit.rhtml)
trunk/radiant/app/views/admin/layout/index.rhtml (modified) (2 diffs)
trunk/radiant/app/views/admin/layout/new.rhtml (deleted)
trunk/radiant/app/views/admin/layout/remove.rhtml (modified) (1 diff)
trunk/radiant/app/views/admin/page/_meta_row.rhtml (copied) (copied from branches/mental/radiant/app/views/admin/page/_meta_row.rhtml)
trunk/radiant/app/views/admin/page/_node.rhtml (modified) (3 diffs)
trunk/radiant/app/views/admin/page/_part.rhtml (modified) (1 diff)
trunk/radiant/app/views/admin/page/_tag_reference.rhtml (copied) (copied from branches/mental/radiant/app/views/admin/page/_tag_reference.rhtml)
trunk/radiant/app/views/admin/page/edit.rhtml (copied) (copied from branches/mental/radiant/app/views/admin/page/edit.rhtml)
trunk/radiant/app/views/admin/page/filter_reference.rjs (copied) (copied from branches/mental/radiant/app/views/admin/page/filter_reference.rjs)
trunk/radiant/app/views/admin/page/index.rhtml (modified) (2 diffs)
trunk/radiant/app/views/admin/page/new.rhtml (deleted)
trunk/radiant/app/views/admin/page/tag_reference.rjs (copied) (copied from branches/mental/radiant/app/views/admin/page/tag_reference.rjs)
trunk/radiant/app/views/admin/snippet/edit.rhtml (copied) (copied from branches/mental/radiant/app/views/admin/snippet/edit.rhtml)
trunk/radiant/app/views/admin/snippet/index.rhtml (modified) (2 diffs)
trunk/radiant/app/views/admin/snippet/new.rhtml (deleted)
trunk/radiant/app/views/admin/user/edit.rhtml (copied) (copied from branches/mental/radiant/app/views/admin/user/edit.rhtml)
trunk/radiant/app/views/admin/user/index.rhtml (modified) (2 diffs)
trunk/radiant/app/views/admin/user/new.rhtml (deleted)
trunk/radiant/app/views/layouts/application.rhtml (modified) (2 diffs)
trunk/radiant/bin/radiant (copied) (copied from branches/mental/radiant/bin/radiant)
trunk/radiant/components (deleted)
trunk/radiant/config (modified) (1 prop)
trunk/radiant/config/boot.rb (modified) (2 diffs)
trunk/radiant/config/database.sqlite.yml (modified) (1 diff)
trunk/radiant/config/database.sqlite3.yml (deleted)
trunk/radiant/config/database.sqlserver.yml (copied) (copied from branches/mental/radiant/config/database.sqlserver.yml)
trunk/radiant/config/environment.rb (modified) (6 diffs)
trunk/radiant/config/environments/production.rb (modified) (1 diff)
trunk/radiant/config/environments/test.rb (modified) (1 diff)
trunk/radiant/config/routes.rb (modified) (2 diffs)
trunk/radiant/db/development_structure.sql (deleted)
trunk/radiant/db/migrate/001_create_radiant_tables.rb (modified) (6 diffs)
trunk/radiant/db/migrate/002_insert_initial_data.rb (modified) (1 diff)
trunk/radiant/db/migrate/006_integer_columns_to_boolean.rb (modified) (1 diff)
trunk/radiant/db/migrate/010_merge_behaviors_and_pages.rb (copied) (copied from branches/mental/radiant/db/migrate/010_merge_behaviors_and_pages.rb)
trunk/radiant/db/migrate/011_rename_type_column_on_page_to_class_name.rb (copied) (copied from branches/mental/radiant/db/migrate/011_rename_type_column_on_page_to_class_name.rb)
trunk/radiant/db/migrate/012_create_extension_meta.rb (copied) (copied from branches/mental/radiant/db/migrate/012_create_extension_meta.rb)
trunk/radiant/db/migrate/013_add_notes_field_to_user.rb (copied) (copied from branches/mental/radiant/db/migrate/013_add_notes_field_to_user.rb)
trunk/radiant/db/migrate/014_rename_config_default_parts_key.rb (copied) (copied from branches/mental/radiant/db/migrate/014_rename_config_default_parts_key.rb)
trunk/radiant/db/migrate/015_add_optimistic_locking.rb (copied) (copied from branches/mental/radiant/db/migrate/015_add_optimistic_locking.rb)
trunk/radiant/db/schema.rb (modified) (1 diff)
trunk/radiant/db/templates/simple-blog.yml (modified) (2 diffs)
trunk/radiant/db/templates/styled-blog.yml (modified) (3 diffs)
trunk/radiant/lib/advanced_delegation.rb (deleted)
trunk/radiant/lib/annotatable.rb (copied) (copied from branches/mental/radiant/lib/annotatable.rb)
trunk/radiant/lib/archive_index_behavior_tags_and_methods.rb (deleted)
trunk/radiant/lib/archive_index_tags_and_methods.rb (copied) (copied from branches/mental/radiant/lib/archive_index_tags_and_methods.rb)
trunk/radiant/lib/generators/behavior (deleted)
trunk/radiant/lib/generators/extension (copied) (copied from branches/mental/radiant/lib/generators/extension)
trunk/radiant/lib/generators/extension/USAGE (copied) (copied from branches/mental/radiant/lib/generators/extension/USAGE)
trunk/radiant/lib/generators/extension/extension_generator.rb (copied) (copied from branches/mental/radiant/lib/generators/extension/extension_generator.rb)
trunk/radiant/lib/generators/extension/templates (copied) (copied from branches/mental/radiant/lib/generators/extension/templates)
trunk/radiant/lib/generators/extension/templates/README (copied) (copied from branches/mental/radiant/lib/generators/extension/templates/README)
trunk/radiant/lib/generators/extension/templates/Rakefile (copied) (copied from branches/mental/radiant/lib/generators/extension/templates/Rakefile)
trunk/radiant/lib/generators/extension/templates/extension.rb (copied) (copied from branches/mental/radiant/lib/generators/extension/templates/extension.rb)
trunk/radiant/lib/generators/extension/templates/functional_test.rb (copied) (copied from branches/mental/radiant/lib/generators/extension/templates/functional_test.rb)
trunk/radiant/lib/generators/extension/templates/migration.rb (copied) (copied from branches/mental/radiant/lib/generators/extension/templates/migration.rb)
trunk/radiant/lib/generators/extension/templates/tasks.rake (copied) (copied from branches/mental/radiant/lib/generators/extension/templates/tasks.rake)
trunk/radiant/lib/generators/extension/templates/test_helper.rb (copied) (copied from branches/mental/radiant/lib/generators/extension/templates/test_helper.rb)
trunk/radiant/lib/generators/extension_controller (copied) (copied from branches/mental/radiant/lib/generators/extension_controller)
trunk/radiant/lib/generators/extension_controller/USAGE (copied) (copied from branches/mental/radiant/lib/generators/extension_controller/USAGE)
trunk/radiant/lib/generators/extension_controller/extension_controller_generator.rb (copied) (copied from branches/mental/radiant/lib/generators/extension_controller/extension_controller_generator.rb)
trunk/radiant/lib/generators/extension_controller/templates (copied) (copied from branches/mental/radiant/lib/generators/extension_controller/templates)
trunk/radiant/lib/generators/extension_controller/templates/controller.rb (copied) (copied from branches/mental/radiant/lib/generators/extension_controller/templates/controller.rb)
trunk/radiant/lib/generators/extension_controller/templates/functional_test.rb (copied) (copied from branches/mental/radiant/lib/generators/extension_controller/templates/functional_test.rb)
trunk/radiant/lib/generators/extension_controller/templates/helper.rb (copied) (copied from branches/mental/radiant/lib/generators/extension_controller/templates/helper.rb)
trunk/radiant/lib/generators/extension_controller/templates/view.rhtml (copied) (copied from branches/mental/radiant/lib/generators/extension_controller/templates/view.rhtml)
trunk/radiant/lib/generators/extension_model (copied) (copied from branches/mental/radiant/lib/generators/extension_model)
trunk/radiant/lib/generators/extension_model/USAGE (copied) (copied from branches/mental/radiant/lib/generators/extension_model/USAGE)
trunk/radiant/lib/generators/extension_model/extension_model_generator.rb (copied) (copied from branches/mental/radiant/lib/generators/extension_model/extension_model_generator.rb)
trunk/radiant/lib/generators/extension_model/templates (copied) (copied from branches/mental/radiant/lib/generators/extension_model/templates)
trunk/radiant/lib/generators/extension_model/templates/fixtures.yml (copied) (copied from branches/mental/radiant/lib/generators/extension_model/templates/fixtures.yml)
trunk/radiant/lib/generators/extension_model/templates/migration.rb (copied) (copied from branches/mental/radiant/lib/generators/extension_model/templates/migration.rb)
trunk/radiant/lib/generators/extension_model/templates/model.rb (copied) (copied from branches/mental/radiant/lib/generators/extension_model/templates/model.rb)
trunk/radiant/lib/generators/extension_model/templates/unit_test.rb (copied) (copied from branches/mental/radiant/lib/generators/extension_model/templates/unit_test.rb)
trunk/radiant/lib/generators/filter (deleted)
trunk/radiant/lib/generators/instance (copied) (copied from branches/mental/radiant/lib/generators/instance)
trunk/radiant/lib/generators/instance/instance_generator.rb (copied) (copied from branches/mental/radiant/lib/generators/instance/instance_generator.rb)
trunk/radiant/lib/generators/instance/templates (copied) (copied from branches/mental/radiant/lib/generators/instance/templates)
trunk/radiant/lib/generators/instance/templates/databases (copied) (copied from branches/mental/radiant/lib/generators/instance/templates/databases)
trunk/radiant/lib/generators/instance/templates/databases/mysql.yml (copied) (copied from branches/mental/radiant/lib/generators/instance/templates/databases/mysql.yml)
trunk/radiant/lib/generators/instance/templates/databases/postgresql.yml (copied) (copied from branches/mental/radiant/lib/generators/instance/templates/databases/postgresql.yml)
trunk/radiant/lib/generators/instance/templates/databases/sqlite3.yml (copied) (copied from branches/mental/radiant/lib/generators/instance/templates/databases/sqlite3.yml)
trunk/radiant/lib/generators/instance/templates/databases/sqlserver.yml (copied) (copied from branches/mental/radiant/lib/generators/instance/templates/databases/sqlserver.yml)
trunk/radiant/lib/generators/instance/templates/instance_boot.rb (copied) (copied from branches/mental/radiant/lib/generators/instance/templates/instance_boot.rb)
trunk/radiant/lib/generators/instance/templates/instance_environment.rb (copied) (copied from branches/mental/radiant/lib/generators/instance/templates/instance_environment.rb)
trunk/radiant/lib/generators/instance/templates/instance_generate (copied) (copied from branches/mental/radiant/lib/generators/instance/templates/instance_generate)
trunk/radiant/lib/generators/instance/templates/instance_rakefile (copied) (copied from branches/mental/radiant/lib/generators/instance/templates/instance_rakefile)
trunk/radiant/lib/generators/instance/templates/instance_routes.rb (copied) (copied from branches/mental/radiant/lib/generators/instance/templates/instance_routes.rb)
trunk/radiant/lib/inheritable_class_attributes.rb (modified) (1 diff)
trunk/radiant/lib/login_system.rb (modified) (2 diffs)
trunk/radiant/lib/method_observer.rb (copied) (copied from branches/mental/radiant/lib/method_observer.rb)
trunk/radiant/lib/plugins/active_record_extensions (copied) (copied from branches/mental/radiant/lib/plugins/active_record_extensions)
trunk/radiant/lib/plugins/active_record_extensions/init.rb (copied) (copied from branches/mental/radiant/lib/plugins/active_record_extensions/init.rb)
trunk/radiant/lib/plugins/active_record_extensions/lib (copied) (copied from branches/mental/radiant/lib/plugins/active_record_extensions/lib)
trunk/radiant/lib/plugins/active_record_extensions/lib/active_record_extensions.rb (copied) (copied from branches/mental/radiant/lib/plugins/active_record_extensions/lib/active_record_extensions.rb)
trunk/radiant/lib/plugins/extension_patches (copied) (copied from branches/mental/radiant/lib/plugins/extension_patches)
trunk/radiant/lib/plugins/extension_patches/init.rb (copied) (copied from branches/mental/radiant/lib/plugins/extension_patches/init.rb)
trunk/radiant/lib/plugins/extension_patches/lib (copied) (copied from branches/mental/radiant/lib/plugins/extension_patches/lib)
trunk/radiant/lib/plugins/extension_patches/lib/fixture_loading_extension.rb (copied) (copied from branches/mental/radiant/lib/plugins/extension_patches/lib/fixture_loading_extension.rb)
trunk/radiant/lib/plugins/extension_patches/lib/generator_base_extension.rb (copied) (copied from branches/mental/radiant/lib/plugins/extension_patches/lib/generator_base_extension.rb)
trunk/radiant/lib/plugins/extension_patches/lib/mailer_view_paths_extension.rb (copied) (copied from branches/mental/radiant/lib/plugins/extension_patches/lib/mailer_view_paths_extension.rb)
trunk/radiant/lib/plugins/extension_patches/lib/routing_extension.rb (copied) (copied from branches/mental/radiant/lib/plugins/extension_patches/lib/routing_extension.rb)
trunk/radiant/lib/plugins/extension_patches/lib/view_paths_extension.rb (copied) (copied from branches/mental/radiant/lib/plugins/extension_patches/lib/view_paths_extension.rb)
trunk/radiant/lib/plugins/index_quoting_fix (deleted)
trunk/radiant/lib/plugins/object_extensions (copied) (copied from branches/mental/radiant/lib/plugins/object_extensions)
trunk/radiant/lib/plugins/object_extensions/init.rb (copied) (copied from branches/mental/radiant/lib/plugins/object_extensions/init.rb)
trunk/radiant/lib/plugins/object_extensions/lib (copied) (copied from branches/mental/radiant/lib/plugins/object_extensions/lib)
trunk/radiant/lib/plugins/object_extensions/lib/object_extensions.rb (copied) (copied from branches/mental/radiant/lib/plugins/object_extensions/lib/object_extensions.rb)
trunk/radiant/lib/plugins/response_cache_timeout (copied) (copied from branches/mental/radiant/lib/plugins/response_cache_timeout)
trunk/radiant/lib/plugins/response_cache_timeout/init.rb (copied) (copied from branches/mental/radiant/lib/plugins/response_cache_timeout/init.rb)
trunk/radiant/lib/plugins/string_extensions (copied) (copied from branches/mental/radiant/lib/plugins/string_extensions)
trunk/radiant/lib/plugins/string_extensions/init.rb (copied) (copied from branches/mental/radiant/lib/plugins/string_extensions/init.rb)
trunk/radiant/lib/plugins/string_extensions/lib (copied) (copied from branches/mental/radiant/lib/plugins/string_extensions/lib)
trunk/radiant/lib/plugins/string_extensions/lib/string_extensions.rb (copied) (copied from branches/mental/radiant/lib/plugins/string_extensions/lib/string_extensions.rb)
trunk/radiant/lib/radiant (copied) (copied from branches/mental/radiant/lib/radiant)
trunk/radiant/lib/radiant.rb (modified) (3 diffs)
trunk/radiant/lib/radiant/admin_ui.rb (copied) (copied from branches/mental/radiant/lib/radiant/admin_ui.rb)
trunk/radiant/lib/radiant/extension.rb (copied) (copied from branches/mental/radiant/lib/radiant/extension.rb)
trunk/radiant/lib/radiant/extension_loader.rb (copied) (copied from branches/mental/radiant/lib/radiant/extension_loader.rb)
trunk/radiant/lib/radiant/extension_migrator.rb (copied) (copied from branches/mental/radiant/lib/radiant/extension_migrator.rb)
trunk/radiant/lib/radiant/initializer.rb (copied) (copied from branches/mental/radiant/lib/radiant/initializer.rb)
trunk/radiant/lib/radiant/setup.rb (copied) (copied from branches/mental/radiant/lib/radiant/setup.rb)
trunk/radiant/lib/radiant/taggable.rb (copied) (copied from branches/mental/radiant/lib/radiant/taggable.rb)
trunk/radiant/lib/registerable.rb (deleted)
trunk/radiant/lib/simpleton.rb (copied) (copied from branches/mental/radiant/lib/simpleton.rb)
trunk/radiant/lib/tasks/database.rake (copied) (copied from branches/mental/radiant/lib/tasks/database.rake)
trunk/radiant/lib/tasks/environments.rake (copied) (copied from branches/mental/radiant/lib/tasks/environments.rake)
trunk/radiant/lib/tasks/extensions.rake (copied) (copied from branches/mental/radiant/lib/tasks/extensions.rake)
trunk/radiant/lib/tasks/framework.rake (copied) (copied from branches/mental/radiant/lib/tasks/framework.rake)
trunk/radiant/lib/tasks/instance.rake (copied) (copied from branches/mental/radiant/lib/tasks/instance.rake)
trunk/radiant/lib/tasks/release.rake (modified) (6 diffs)
trunk/radiant/lib/tasks/undefine.rake (copied) (copied from branches/mental/radiant/lib/tasks/undefine.rake)
trunk/radiant/log (modified) (1 prop)
trunk/radiant/log/.keep (copied) (copied from branches/mental/radiant/log/.keep)
trunk/radiant/public/images/add-child.png (deleted)
trunk/radiant/public/images/admin (copied) (copied from branches/mental/radiant/public/images/admin)
trunk/radiant/public/images/admin/add-child.png (copied) (copied from branches/mental/radiant/public/images/admin/add-child.png)
trunk/radiant/public/images/admin/brown-bottom-line.gif (copied) (copied from branches/mental/radiant/public/images/admin/brown-bottom-line.gif)
trunk/radiant/public/images/admin/clear-page-cache.png (copied) (copied from branches/mental/radiant/public/images/admin/clear-page-cache.png)
trunk/radiant/public/images/admin/collapse.png (copied) (copied from branches/mental/radiant/public/images/admin/collapse.png)
trunk/radiant/public/images/admin/expand.png (copied) (copied from branches/mental/radiant/public/images/admin/expand.png)
trunk/radiant/public/images/admin/layout.png (copied) (copied from branches/mental/radiant/public/images/admin/layout.png)
trunk/radiant/public/images/admin/minus.png (copied) (copied from branches/mental/radiant/public/images/admin/minus.png)
trunk/radiant/public/images/admin/new-homepage.png (copied) (copied from branches/mental/radiant/public/images/admin/new-homepage.png)
trunk/radiant/public/images/admin/new-layout.png (copied) (copied from branches/mental/radiant/public/images/admin/new-layout.png)
trunk/radiant/public/images/admin/new-snippet.png (copied) (copied from branches/mental/radiant/public/images/admin/new-snippet.png)
trunk/radiant/public/images/admin/new-user.png (copied) (copied from branches/mental/radiant/public/images/admin/new-user.png)
trunk/radiant/public/images/admin/page.png (copied) (copied from branches/mental/radiant/public/images/admin/page.png)
trunk/radiant/public/images/admin/plus.png (copied) (copied from branches/mental/radiant/public/images/admin/plus.png)
trunk/radiant/public/images/admin/remove-disabled.png (copied) (copied from branches/mental/radiant/public/images/admin/remove-disabled.png)
trunk/radiant/public/images/admin/remove.png (copied) (copied from branches/mental/radiant/public/images/admin/remove.png)
trunk/radiant/public/images/admin/snippet.png (copied) (copied from branches/mental/radiant/public/images/admin/snippet.png)
trunk/radiant/public/images/admin/spinner.gif (copied) (copied from branches/mental/radiant/public/images/admin/spinner.gif)
trunk/radiant/public/images/admin/view-site.gif (copied) (copied from branches/mental/radiant/public/images/admin/view-site.gif)
trunk/radiant/public/images/admin/virtual-page.png (copied) (copied from branches/mental/radiant/public/images/admin/virtual-page.png)
trunk/radiant/public/images/brown-bottom-line.gif (deleted)
trunk/radiant/public/images/clear-page-cache.png (deleted)
trunk/radiant/public/images/collapse.png (deleted)
trunk/radiant/public/images/expand.png (deleted)
trunk/radiant/public/images/layout.png (deleted)
trunk/radiant/public/images/minus.png (deleted)
trunk/radiant/public/images/new-homepage.png (deleted)
trunk/radiant/public/images/new-layout.png (deleted)
trunk/radiant/public/images/new-snippet.png (deleted)
trunk/radiant/public/images/new-user.png (deleted)
trunk/radiant/public/images/page.png (deleted)
trunk/radiant/public/images/plus.png (deleted)
trunk/radiant/public/images/remove-disabled.png (deleted)
trunk/radiant/public/images/remove.png (deleted)
trunk/radiant/public/images/snippet.png (deleted)
trunk/radiant/public/images/spinner.gif (deleted)
trunk/radiant/public/images/view-site.gif (deleted)
trunk/radiant/public/images/virtual-page.png (deleted)
trunk/radiant/public/javascripts/controls.js (modified) (16 diffs)
trunk/radiant/public/javascripts/dragdrop.js (modified) (32 diffs)
trunk/radiant/public/javascripts/effects.js (modified) (33 diffs)
trunk/radiant/public/javascripts/pngfix.js (modified) (1 diff)
trunk/radiant/public/javascripts/prototype.js (modified) (66 diffs)
trunk/radiant/public/javascripts/sitemap.js (copied) (copied from branches/mental/radiant/public/javascripts/sitemap.js)
trunk/radiant/public/javascripts/tag_reference_search.js (copied) (copied from branches/mental/radiant/public/javascripts/tag_reference_search.js)
trunk/radiant/public/stylesheets/admin (copied) (copied from branches/mental/radiant/public/stylesheets/admin)
trunk/radiant/public/stylesheets/admin.css (deleted)
trunk/radiant/public/stylesheets/admin/main.css (copied) (copied from branches/mental/radiant/public/stylesheets/admin/main.css)
trunk/radiant/script/process/inspector (copied) (copied from branches/mental/radiant/script/process/inspector)
trunk/radiant/script/setup_database (deleted)
trunk/radiant/test/fixtures/extensions (copied) (copied from branches/mental/radiant/test/fixtures/extensions)
trunk/radiant/test/fixtures/extensions/basic (copied) (copied from branches/mental/radiant/test/fixtures/extensions/basic)
trunk/radiant/test/fixtures/extensions/basic/app (copied) (copied from branches/mental/radiant/test/fixtures/extensions/basic/app)
trunk/radiant/test/fixtures/extensions/basic/app/controllers (copied) (copied from branches/mental/radiant/test/fixtures/extensions/basic/app/controllers)
trunk/radiant/test/fixtures/extensions/basic/app/controllers/basic_extension_controller.rb (copied) (copied from branches/mental/radiant/test/fixtures/extensions/basic/app/controllers/basic_extension_controller.rb)
trunk/radiant/test/fixtures/extensions/basic/app/models (copied) (copied from branches/mental/radiant/test/fixtures/extensions/basic/app/models)
trunk/radiant/test/fixtures/extensions/basic/app/models/basic_extension_mailer.rb (copied) (copied from branches/mental/radiant/test/fixtures/extensions/basic/app/models/basic_extension_mailer.rb)
trunk/radiant/test/fixtures/extensions/basic/app/models/basic_extension_model.rb (copied) (copied from branches/mental/radiant/test/fixtures/extensions/basic/app/models/basic_extension_model.rb)
trunk/radiant/test/fixtures/extensions/basic/app/views (copied) (copied from branches/mental/radiant/test/fixtures/extensions/basic/app/views)
trunk/radiant/test/fixtures/extensions/basic/app/views/basic_extension (copied) (copied from branches/mental/radiant/test/fixtures/extensions/basic/app/views/basic_extension)
trunk/radiant/test/fixtures/extensions/basic/app/views/basic_extension/index.rhtml (copied) (copied from branches/mental/radiant/test/fixtures/extensions/basic/app/views/basic_extension/index.rhtml)
trunk/radiant/test/fixtures/extensions/basic/app/views/basic_extension/override.rhtml (copied) (copied from branches/mental/radiant/test/fixtures/extensions/basic/app/views/basic_extension/override.rhtml)
trunk/radiant/test/fixtures/extensions/basic/app/views/basic_extension_mailer (copied) (copied from branches/mental/radiant/test/fixtures/extensions/basic/app/views/basic_extension_mailer)
trunk/radiant/test/fixtures/extensions/basic/app/views/basic_extension_mailer/message.rhtml (copied) (copied from branches/mental/radiant/test/fixtures/extensions/basic/app/views/basic_extension_mailer/message.rhtml)
trunk/radiant/test/fixtures/extensions/basic/basic_extension.rb (copied) (copied from branches/mental/radiant/test/fixtures/extensions/basic/basic_extension.rb)
trunk/radiant/test/fixtures/extensions/basic/db (copied) (copied from branches/mental/radiant/test/fixtures/extensions/basic/db)
trunk/radiant/test/fixtures/extensions/basic/db/migrate (copied) (copied from branches/mental/radiant/test/fixtures/extensions/basic/db/migrate)
trunk/radiant/test/fixtures/extensions/basic/db/migrate/001_create_initial_schema.rb (copied) (copied from branches/mental/radiant/test/fixtures/extensions/basic/db/migrate/001_create_initial_schema.rb)
trunk/radiant/test/fixtures/extensions/basic/db/migrate/002_modify_initial_schema.rb (copied) (copied from branches/mental/radiant/test/fixtures/extensions/basic/db/migrate/002_modify_initial_schema.rb)
trunk/radiant/test/fixtures/extensions/basic/lib (copied) (copied from branches/mental/radiant/test/fixtures/extensions/basic/lib)
trunk/radiant/test/fixtures/extensions/basic/lib/tasks (copied) (copied from branches/mental/radiant/test/fixtures/extensions/basic/lib/tasks)
trunk/radiant/test/fixtures/extensions/overriding (copied) (copied from branches/mental/radiant/test/fixtures/extensions/overriding)
trunk/radiant/test/fixtures/extensions/overriding/app (copied) (copied from branches/mental/radiant/test/fixtures/extensions/overriding/app)
trunk/radiant/test/fixtures/extensions/overriding/app/views (copied) (copied from branches/mental/radiant/test/fixtures/extensions/overriding/app/views)
trunk/radiant/test/fixtures/extensions/overriding/app/views/basic_extension (copied) (copied from branches/mental/radiant/test/fixtures/extensions/overriding/app/views/basic_extension)
trunk/radiant/test/fixtures/extensions/overriding/app/views/basic_extension/override.rhtml (copied) (copied from branches/mental/radiant/test/fixtures/extensions/overriding/app/views/basic_extension/override.rhtml)
trunk/radiant/test/fixtures/extensions/overriding/overriding_extension.rb (copied) (copied from branches/mental/radiant/test/fixtures/extensions/overriding/overriding_extension.rb)
trunk/radiant/test/fixtures/pages.yml (modified) (8 diffs)
trunk/radiant/test/fixtures/sample.txt (copied) (copied from branches/mental/radiant/test/fixtures/sample.txt)
trunk/radiant/test/fixtures/snippets.yml (modified) (1 diff)
trunk/radiant/test/functional/admin/abstract_model_controller_test.rb (copied) (copied from branches/mental/radiant/test/functional/admin/abstract_model_controller_test.rb)
trunk/radiant/test/functional/admin/export_controller_test.rb (modified) (2 diffs)
trunk/radiant/test/functional/admin/extension_controller_test.rb (copied) (copied from branches/mental/radiant/test/functional/admin/extension_controller_test.rb)
trunk/radiant/test/functional/admin/layout_controller_test.rb (modified) (3 diffs)
trunk/radiant/test/functional/admin/model_controller_test.rb (deleted)
trunk/radiant/test/functional/admin/page_controller_test.rb (modified) (8 diffs)
trunk/radiant/test/functional/admin/user_controller_test.rb (modified) (5 diffs)
trunk/radiant/test/functional/admin/welcome_controller_test.rb (modified) (1 diff)
trunk/radiant/test/functional/application_controller_test.rb (modified) (3 diffs)
trunk/radiant/test/functional/extension_initialization_test.rb (copied) (copied from branches/mental/radiant/test/functional/extension_initialization_test.rb)
trunk/radiant/test/functional/login_system_test.rb (modified) (3 diffs)
trunk/radiant/test/functional/site_controller_test.rb (modified) (5 diffs)
trunk/radiant/test/helpers/archive_index_test_helper.rb (modified) (2 diffs)
trunk/radiant/test/helpers/behavior_render_test_helper.rb (deleted)
trunk/radiant/test/helpers/behavior_test_helper.rb (deleted)
trunk/radiant/test/helpers/extension_fixture_test_helper.rb (copied) (copied from branches/mental/radiant/test/helpers/extension_fixture_test_helper.rb)
trunk/radiant/test/helpers/extension_tag_test_helper.rb (copied) (copied from branches/mental/radiant/test/helpers/extension_tag_test_helper.rb)
trunk/radiant/test/helpers/page_test_helper.rb (modified) (2 diffs)
trunk/radiant/test/helpers/render_test_helper.rb (copied) (copied from branches/mental/radiant/test/helpers/render_test_helper.rb)
trunk/radiant/test/helpers/routing_test_helper.rb (copied) (copied from branches/mental/radiant/test/helpers/routing_test_helper.rb)
trunk/radiant/test/test_helper.rb (modified) (3 diffs)
trunk/radiant/test/unit/admin_ui_test.rb (copied) (copied from branches/mental/radiant/test/unit/admin_ui_test.rb)
trunk/radiant/test/unit/annotatable_test.rb (copied) (copied from branches/mental/radiant/test/unit/annotatable_test.rb)
trunk/radiant/test/unit/archive_day_index_page_test.rb (copied) (copied from branches/mental/radiant/test/unit/archive_day_index_page_test.rb)
trunk/radiant/test/unit/archive_month_index_page_test.rb (copied) (copied from