Changeset [b2960d5908d5a69031e41f1cf2ab59b8cf7573e7] by Graeme Worthy
May 18th, 2009 @ 03:20 AM
Merge git://github.com/krrh/greenbuildingbrain into krh-merge
- git://github.com/krrh/greenbuildingbrain: update new item form updated header so that new button works changes to cap recipes for acts_as_ferret so deploy works updated ferret settings to work on DH, fixed a seeminly important bug on editors, require presense of editor on Item save fixed deprecation warning on truncate in dashboard fixed specs to work with search and pagination, one is on hold added search functionality to items controller view and model, no tests clear code for pagination added pagination to items/ using will paginate gem, 30 items per page adding new model files for different content_types, various ui fixes, esp in items/index some refactoring, added other content_types, lots of ui improvements on dashboard updated news feeds to include authors fixed up homepage controllers to handle rss from new blog and wiki updated urls to include wiki activity updated text on landing page, and updated discussion and announcement url feeds to point to the correct places
Conflicts:
app/controllers/items_controller.rb
Committed by Graeme Worthy
- M app/controllers/application_controller.rb
- M app/controllers/dashboard_controller.rb
- M app/controllers/homepage_controller.rb
- M app/controllers/items_controller.rb
- M app/controllers/map_controller.rb
- M app/models/building.rb
- M app/models/company.rb
- M app/models/item.rb
- M app/models/page.rb
- M app/models/product.rb
- M app/models/strategy.rb
- M app/views/dashboard/index.html.erb
- M app/views/homepage/index.html.erb
- M app/views/items/index.html.erb
- M app/views/items/new.html.erb
- M app/views/layouts/_header.html.erb
- M app/views/layouts/application.html.erb
- M app/views/layouts/map.html.erb
- M app/views/map/index.html.erb
- M app/views/users/new.html.erb
- M config/environment.rb
- M config/environments/development.rb
- M config/ferret_server.yml
- M lib/tasks/ferret_index.rake
- M public/stylesheets/greenbuildingmap.css
- M script/ferret_server
- M spec/controllers/dashboard_controller_spec.rb
- M spec/controllers/items_controller_spec.rb
- M spec/fixtures/companies.yml
- M spec/fixtures/products.yml
- M spec/fixtures/strategies.yml
- M spec/models/building_spec.rb
- M spec/models/company_spec.rb
- M spec/models/item_spec.rb
- M spec/models/page_spec.rb
- M spec/models/product_spec.rb
- M spec/models/strategy_spec.rb
- M spec/views/homepage/index.html.erb_spec.rb
- M spec/views/items/index.html.erb_spec.rb
- M vendor/gems/mislav-will_paginate-2.3.8/.specification
- M vendor/gems/mislav-will_paginate-2.3.8/CHANGELOG.rdoc
- M vendor/gems/mislav-will_paginate-2.3.8/LICENSE
- M vendor/gems/mislav-will_paginate-2.3.8/README.rdoc
- M vendor/gems/mislav-will_paginate-2.3.8/Rakefile
- M vendor/gems/mislav-will_paginate-2.3.8/examples/apple-circle.gif
- M vendor/gems/mislav-will_paginate-2.3.8/examples/index.haml
- M vendor/gems/mislav-will_paginate-2.3.8/examples/index.html
- M vendor/gems/mislav-will_paginate-2.3.8/examples/pagination.css
- M vendor/gems/mislav-will_paginate-2.3.8/examples/pagination.sass
- M vendor/gems/mislav-will_paginate-2.3.8/init.rb
- M vendor/gems/mislav-will_paginate-2.3.8/lib/will_paginate.rb
- M vendor/gems/mislav-will_paginate-2.3.8/lib/will_paginate/array.rb
- M vendor/gems/mislav-will_paginate-2.3.8/lib/will_paginate/collection.rb
- M vendor/gems/mislav-will_paginate-2.3.8/lib/will_paginate/core_ext.rb
- M vendor/gems/mislav-will_paginate-2.3.8/lib/will_paginate/finder.rb
- M vendor/gems/mislav-will_paginate-2.3.8/lib/will_paginate/named_scope.rb
- M vendor/gems/mislav-will_paginate-2.3.8/lib/will_paginate/named_scope_patch.rb
- M vendor/gems/mislav-will_paginate-2.3.8/lib/will_paginate/version.rb
- M vendor/gems/mislav-will_paginate-2.3.8/lib/will_paginate/view_helpers.rb
- M vendor/gems/mislav-will_paginate-2.3.8/test/boot.rb
- M vendor/gems/mislav-will_paginate-2.3.8/test/collection_test.rb
- M vendor/gems/mislav-will_paginate-2.3.8/test/console
- M vendor/gems/mislav-will_paginate-2.3.8/test/database.yml
- M vendor/gems/mislav-will_paginate-2.3.8/test/finder_test.rb
- M vendor/gems/mislav-will_paginate-2.3.8/test/fixtures/admin.rb
- M vendor/gems/mislav-will_paginate-2.3.8/test/fixtures/developer.rb
- M vendor/gems/mislav-will_paginate-2.3.8/test/fixtures/developers_projects.yml
- M vendor/gems/mislav-will_paginate-2.3.8/test/fixtures/project.rb
- M vendor/gems/mislav-will_paginate-2.3.8/test/fixtures/projects.yml
- M vendor/gems/mislav-will_paginate-2.3.8/test/fixtures/replies.yml
- M vendor/gems/mislav-will_paginate-2.3.8/test/fixtures/reply.rb
- M vendor/gems/mislav-will_paginate-2.3.8/test/fixtures/schema.rb
- M vendor/gems/mislav-will_paginate-2.3.8/test/fixtures/topic.rb
- M vendor/gems/mislav-will_paginate-2.3.8/test/fixtures/topics.yml
- M vendor/gems/mislav-will_paginate-2.3.8/test/fixtures/user.rb
- M vendor/gems/mislav-will_paginate-2.3.8/test/fixtures/users.yml
- M vendor/gems/mislav-will_paginate-2.3.8/test/helper.rb
- M vendor/gems/mislav-will_paginate-2.3.8/test/lib/activerecord_test_case.rb
- M vendor/gems/mislav-will_paginate-2.3.8/test/lib/activerecord_test_connector.rb
- M vendor/gems/mislav-will_paginate-2.3.8/test/lib/load_fixtures.rb
- M vendor/gems/mislav-will_paginate-2.3.8/test/lib/view_test_process.rb
- M vendor/gems/mislav-will_paginate-2.3.8/test/tasks.rake
- M vendor/gems/mislav-will_paginate-2.3.8/test/view_test.rb
- M vendor/plugins/acts_as_ferret/LICENSE
- M vendor/plugins/acts_as_ferret/README
- M vendor/plugins/acts_as_ferret/bin/aaf_install
- M vendor/plugins/acts_as_ferret/config/ferret_server.yml
- M vendor/plugins/acts_as_ferret/doc/README.win32
- M vendor/plugins/acts_as_ferret/doc/demo/README
- M vendor/plugins/acts_as_ferret/doc/demo/README_DEMO
- M vendor/plugins/acts_as_ferret/doc/demo/Rakefile
- M vendor/plugins/acts_as_ferret/doc/demo/app/controllers/admin/backend_controller.rb
- M vendor/plugins/acts_as_ferret/doc/demo/app/controllers/admin_area_controller.rb
- M vendor/plugins/acts_as_ferret/doc/demo/app/controllers/application.rb
- M vendor/plugins/acts_as_ferret/doc/demo/app/controllers/contents_controller.rb
- M vendor/plugins/acts_as_ferret/doc/demo/app/controllers/searches_controller.rb
- M vendor/plugins/acts_as_ferret/doc/demo/app/helpers/admin/backend_helper.rb
- M vendor/plugins/acts_as_ferret/doc/demo/app/helpers/application_helper.rb
- M vendor/plugins/acts_as_ferret/doc/demo/app/helpers/content_helper.rb
- M vendor/plugins/acts_as_ferret/doc/demo/app/helpers/search_helper.rb
- M vendor/plugins/acts_as_ferret/doc/demo/app/models/comment.rb
- M vendor/plugins/acts_as_ferret/doc/demo/app/models/content.rb
- M vendor/plugins/acts_as_ferret/doc/demo/app/models/content_base.rb
- M vendor/plugins/acts_as_ferret/doc/demo/app/models/search.rb
- M vendor/plugins/acts_as_ferret/doc/demo/app/models/shared_index1.rb
- M vendor/plugins/acts_as_ferret/doc/demo/app/models/shared_index2.rb
- M vendor/plugins/acts_as_ferret/doc/demo/app/models/special_content.rb
- M vendor/plugins/acts_as_ferret/doc/demo/app/models/stats.rb
- M vendor/plugins/acts_as_ferret/doc/demo/app/views/admin/backend/search.rhtml
- M vendor/plugins/acts_as_ferret/doc/demo/app/views/contents/_form.rhtml
- M vendor/plugins/acts_as_ferret/doc/demo/app/views/contents/edit.rhtml
- M vendor/plugins/acts_as_ferret/doc/demo/app/views/contents/index.rhtml
- M vendor/plugins/acts_as_ferret/doc/demo/app/views/contents/new.rhtml
- M vendor/plugins/acts_as_ferret/doc/demo/app/views/contents/show.rhtml
- M vendor/plugins/acts_as_ferret/doc/demo/app/views/layouts/application.html.erb
- M vendor/plugins/acts_as_ferret/doc/demo/app/views/searches/_content.html.erb
- M vendor/plugins/acts_as_ferret/doc/demo/app/views/searches/search.html.erb
- M vendor/plugins/acts_as_ferret/doc/demo/config/boot.rb
- M vendor/plugins/acts_as_ferret/doc/demo/config/database.yml
- M vendor/plugins/acts_as_ferret/doc/demo/config/environment.rb
- M vendor/plugins/acts_as_ferret/doc/demo/config/environments/development.rb
- M vendor/plugins/acts_as_ferret/doc/demo/config/environments/production.rb
- M vendor/plugins/acts_as_ferret/doc/demo/config/environments/test.rb
- M vendor/plugins/acts_as_ferret/doc/demo/config/ferret_server.yml
- M vendor/plugins/acts_as_ferret/doc/demo/config/lighttpd.conf
- M vendor/plugins/acts_as_ferret/doc/demo/config/routes.rb
- M vendor/plugins/acts_as_ferret/doc/demo/db/development_structure.sql
- M vendor/plugins/acts_as_ferret/doc/demo/db/migrate/001_initial_migration.rb
- M vendor/plugins/acts_as_ferret/doc/demo/db/migrate/002_add_type_to_contents.rb
- M vendor/plugins/acts_as_ferret/doc/demo/db/migrate/003_create_shared_index1s.rb
- M vendor/plugins/acts_as_ferret/doc/demo/db/migrate/004_create_shared_index2s.rb
- M vendor/plugins/acts_as_ferret/doc/demo/db/migrate/005_special_field.rb
- M vendor/plugins/acts_as_ferret/doc/demo/db/migrate/006_create_stats.rb
- M vendor/plugins/acts_as_ferret/doc/demo/db/schema.sql
- M vendor/plugins/acts_as_ferret/doc/demo/db/schema.sqlite
- M vendor/plugins/acts_as_ferret/doc/demo/doc/README_FOR_APP
- M vendor/plugins/acts_as_ferret/doc/demo/doc/howto.txt
- M vendor/plugins/acts_as_ferret/doc/demo/public/.htaccess
- M vendor/plugins/acts_as_ferret/doc/demo/public/404.html
- M vendor/plugins/acts_as_ferret/doc/demo/public/500.html
- M vendor/plugins/acts_as_ferret/doc/demo/public/dispatch.cgi
- M vendor/plugins/acts_as_ferret/doc/demo/public/dispatch.fcgi
- M vendor/plugins/acts_as_ferret/doc/demo/public/dispatch.rb
- M vendor/plugins/acts_as_ferret/doc/demo/public/images/rails.png
- M vendor/plugins/acts_as_ferret/doc/demo/public/index.html
- M vendor/plugins/acts_as_ferret/doc/demo/public/robots.txt
- M vendor/plugins/acts_as_ferret/doc/demo/public/stylesheets/scaffold.css
- M vendor/plugins/acts_as_ferret/doc/demo/script/about
- M vendor/plugins/acts_as_ferret/doc/demo/script/breakpointer
- M vendor/plugins/acts_as_ferret/doc/demo/script/console
- M vendor/plugins/acts_as_ferret/doc/demo/script/destroy
- M vendor/plugins/acts_as_ferret/doc/demo/script/ferret_server
- M vendor/plugins/acts_as_ferret/doc/demo/script/generate
- M vendor/plugins/acts_as_ferret/doc/demo/script/performance/benchmarker
- M vendor/plugins/acts_as_ferret/doc/demo/script/performance/profiler
- M vendor/plugins/acts_as_ferret/doc/demo/script/plugin
- M vendor/plugins/acts_as_ferret/doc/demo/script/process/inspector
- M vendor/plugins/acts_as_ferret/doc/demo/script/process/reaper
- M vendor/plugins/acts_as_ferret/doc/demo/script/process/spawner
- M vendor/plugins/acts_as_ferret/doc/demo/script/process/spinner
- M vendor/plugins/acts_as_ferret/doc/demo/script/runner
- M vendor/plugins/acts_as_ferret/doc/demo/script/server
- M vendor/plugins/acts_as_ferret/doc/demo/test/fixtures/comments.yml
- M vendor/plugins/acts_as_ferret/doc/demo/test/fixtures/contents.yml
- M vendor/plugins/acts_as_ferret/doc/demo/test/fixtures/remote_contents.yml
- M vendor/plugins/acts_as_ferret/doc/demo/test/fixtures/shared_index1s.yml
- M vendor/plugins/acts_as_ferret/doc/demo/test/fixtures/shared_index2s.yml
- M vendor/plugins/acts_as_ferret/doc/demo/test/functional/admin/backend_controller_test.rb
- M vendor/plugins/acts_as_ferret/doc/demo/test/functional/contents_controller_test.rb
- M vendor/plugins/acts_as_ferret/doc/demo/test/functional/searches_controller_test.rb
- M vendor/plugins/acts_as_ferret/doc/demo/test/smoke/drb_smoke_test.rb
- M vendor/plugins/acts_as_ferret/doc/demo/test/smoke/process_stats.rb
- M vendor/plugins/acts_as_ferret/doc/demo/test/test_helper.rb
- M vendor/plugins/acts_as_ferret/doc/demo/test/unit/comment_test.rb
- M vendor/plugins/acts_as_ferret/doc/demo/test/unit/content_test.rb
- M vendor/plugins/acts_as_ferret/doc/demo/test/unit/ferret_result_test.rb
- M vendor/plugins/acts_as_ferret/doc/demo/test/unit/multi_index_test.rb
- M vendor/plugins/acts_as_ferret/doc/demo/test/unit/remote_index_test.rb
- M vendor/plugins/acts_as_ferret/doc/demo/test/unit/shared_index1_test.rb
- M vendor/plugins/acts_as_ferret/doc/demo/test/unit/shared_index2_test.rb
- M vendor/plugins/acts_as_ferret/doc/demo/test/unit/sort_test.rb
- M vendor/plugins/acts_as_ferret/doc/demo/test/unit/special_content_test.rb
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/LICENSE
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/README
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/Rakefile
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/init.rb
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/lib/will_paginate/collection.rb
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/lib/will_paginate/core_ext.rb
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/lib/will_paginate/finder.rb
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/lib/will_paginate/view_helpers.rb
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/test/array_pagination_test.rb
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/test/boot.rb
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/test/console
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/test/finder_test.rb
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/test/fixtures/admin.rb
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/test/fixtures/companies.yml
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/test/fixtures/company.rb
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/test/fixtures/developer.rb
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/test/fixtures/developers_projects.yml
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/test/fixtures/project.rb
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/test/fixtures/projects.yml
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/test/fixtures/replies.yml
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/test/fixtures/reply.rb
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/test/fixtures/schema.sql
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/test/fixtures/topic.rb
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/test/fixtures/topics.yml
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/test/fixtures/user.rb
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/test/fixtures/users.yml
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/test/helper.rb
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/test/lib/activerecord_test_connector.rb
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/test/lib/load_fixtures.rb
- M vendor/plugins/acts_as_ferret/doc/demo/vendor/plugins/will_paginate/test/pagination_test.rb
- M vendor/plugins/acts_as_ferret/doc/monit-example
- M vendor/plugins/acts_as_ferret/init.rb
- M vendor/plugins/acts_as_ferret/install.rb
- M vendor/plugins/acts_as_ferret/lib/act_methods.rb
- M vendor/plugins/acts_as_ferret/lib/acts_as_ferret.rb
- M vendor/plugins/acts_as_ferret/lib/ar_mysql_auto_reconnect_patch.rb
- M vendor/plugins/acts_as_ferret/lib/blank_slate.rb
- M vendor/plugins/acts_as_ferret/lib/bulk_indexer.rb
- M vendor/plugins/acts_as_ferret/lib/class_methods.rb
- M vendor/plugins/acts_as_ferret/lib/ferret_extensions.rb
- M vendor/plugins/acts_as_ferret/lib/ferret_find_methods.rb
- M vendor/plugins/acts_as_ferret/lib/ferret_result.rb
- M vendor/plugins/acts_as_ferret/lib/ferret_server.rb
- M vendor/plugins/acts_as_ferret/lib/index.rb
- M vendor/plugins/acts_as_ferret/lib/instance_methods.rb
- M vendor/plugins/acts_as_ferret/lib/local_index.rb
- M vendor/plugins/acts_as_ferret/lib/more_like_this.rb
- M vendor/plugins/acts_as_ferret/lib/multi_index.rb
- M vendor/plugins/acts_as_ferret/lib/rdig_adapter.rb
- M vendor/plugins/acts_as_ferret/lib/remote_functions.rb
- M vendor/plugins/acts_as_ferret/lib/remote_index.rb
- M vendor/plugins/acts_as_ferret/lib/remote_multi_index.rb
- M vendor/plugins/acts_as_ferret/lib/search_results.rb
- M vendor/plugins/acts_as_ferret/lib/server_manager.rb
- M vendor/plugins/acts_as_ferret/lib/unix_daemon.rb
- M vendor/plugins/acts_as_ferret/lib/without_ar.rb
- M vendor/plugins/acts_as_ferret/rakefile
- M vendor/plugins/acts_as_ferret/recipes/aaf_recipes.rb
- M vendor/plugins/acts_as_ferret/script/ferret_daemon
- M vendor/plugins/acts_as_ferret/script/ferret_server
- M vendor/plugins/acts_as_ferret/script/ferret_service
- M vendor/plugins/acts_as_ferret/tasks/ferret.rake
- M vendor/plugins/gravatar-plugin/lib/gravatar.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 ยป
The Green Building Brain is an open source and open content tool for collaboration and resource sharing between green building professionals and amateurs.