Changeset [4c740b4ef24573c090346eaa03dccb1d4c1ed79d] by Stephen Anderson

Revision 4c740b4ef24573c090346eaa03dccb1d4c1ed79d, committed by Stephen Anderson · January 15th, 2009 @ 01:07 PM

Merge branch 'master' of git@github.com:vegantech/sims

Conflicts:

app/views/layouts/_menu.html.erb

http://github.com/vegantech/sims...

236 changed files

M app/cells/administration_cell.rb
M app/cells/news_cell.rb
M app/controllers/application.rb
M app/controllers/checklist_builder/checklists_controller.rb
M app/controllers/district/flag_categories_controller.rb
M app/controllers/students_controller.rb
M app/helpers/application_helper.rb
M app/helpers/flags_helper.rb
M app/models/checklist_definition.rb
M app/models/district.rb
M app/models/enrollment.rb
M app/models/flag.rb
M app/models/flag_category.rb
M app/models/intervention.rb
M app/models/right.rb
M app/models/role.rb
M app/models/student.rb
M app/models/system.rb
M app/models/tier.rb
M app/models/user.rb
M app/views/checklist_builder/checklists/_form.html.erb
M app/views/checklist_builder/checklists/_rjs_edit_form.html.erb
M app/views/checklist_builder/checklists/_rjs_new_form.html.erb
M app/views/checklist_builder/checklists/_show.html.erb
M app/views/checklist_builder/checklists/create.js.rjs
M app/views/checklist_builder/checklists/edit.html.erb
M app/views/checklist_builder/checklists/edit.js.rjs
M app/views/checklist_builder/checklists/index.html.erb
M app/views/checklist_builder/checklists/new.html.erb
M app/views/checklist_builder/checklists/new.js.rjs
M app/views/checklist_builder/checklists/update.js.rjs
M app/views/district/flag_categories/edit.html.erb
M app/views/district/flag_categories/index.html.erb
M app/views/district/flag_categories/new.html.erb
M app/views/district/flag_categories/show.html.erb
M app/views/district/students/_form.html.erb
M app/views/districts/edit.html.erb
M app/views/layouts/_intervention_pdf_html_list.html.erb
M app/views/layouts/_menu.html.erb
M app/views/layouts/application.html.erb
M app/views/main/index.html.erb
M app/views/quicklist_items/index.html.erb
M app/views/students/_enrolled_student.html.erb
M app/views/students/_flags.html.erb
M app/views/students/_student.html.erb
M app/views/students/index.html.erb
M app/views/students/search.html.erb
M app/views/students/show.html.erb
M config/deploy.rb
M config/environment.rb
M config/environments/production.rb
M config/newrelic.yml
M config/routes.rb
M db/migrate/20081106215957_add_railmail_table.rb
M db/migrate/20090109224200_rename_right_read_and_write_columns.rb
M db/migrate/20090110205335_add_es_land_special_ed_to_students.rb
M db/migrate/20090112223608_add_attachments_document_to_checklist_definition.rb
M db/migrate/20090115060535_create_district_flag_categories.rb
M db/schema.rb
M features/login.feature
M features/step_definitions/sims_steps.rb
M features/support/step_helpers.rb
M lib/controller_rights.rb
M lib/create_intervention_pdfs.rb
M lib/daily_jobs.rb
M lib/tasks/verify_rcov.rake
M public/.gitignore
M public/images/icon_doc.gif
M public/images/icon_htm.gif
M public/images/icon_html.gif
M public/images/icon_pdf.gif
M public/images/icon_ppt.gif
M public/images/icon_swf.gif
M public/images/icon_xls.gif
M public/javascripts/application.js
M public/javascripts/tablesort.js
M public/stylesheets/default.css
M spec/controllers/application_controller_spec.rb
M spec/controllers/district/flag_categories_controller_spec.rb
M spec/controllers/district/flag_categories_routing_spec.rb
M spec/fixtures/flag_categories.yml
M spec/helpers/application_helper_spec.rb
M spec/helpers/flags_helper_spec.rb
M spec/lib/all_controllers_spec.rb
M spec/models/enrollment_spec.rb
M spec/models/flag_category_spec.rb
M spec/models/right_spec.rb
M spec/models/role_spec.rb
M spec/models/user_spec.rb
M test/fixtures/rights.yml
M vendor/plugins/attachment_fu/CHANGELOG
M vendor/plugins/attachment_fu/README
M vendor/plugins/attachment_fu/Rakefile
M vendor/plugins/attachment_fu/amazon_s3.yml.tpl
M vendor/plugins/attachment_fu/init.rb
M vendor/plugins/attachment_fu/install.rb
M vendor/plugins/attachment_fu/lib/geometry.rb
M vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu.rb
M vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/db_file_backend.rb
M vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/file_system_backend.rb
M vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/s3_backend.rb
M vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/core_image_processor.rb
M vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/gd2_processor.rb
M vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/image_science_processor.rb
M vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/mini_magick_processor.rb
M vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/rmagick_processor.rb
M vendor/plugins/attachment_fu/test/backends/db_file_test.rb
M vendor/plugins/attachment_fu/test/backends/file_system_test.rb
M vendor/plugins/attachment_fu/test/backends/remote/s3_test.rb
M vendor/plugins/attachment_fu/test/base_attachment_tests.rb
M vendor/plugins/attachment_fu/test/basic_test.rb
M vendor/plugins/attachment_fu/test/database.yml
M vendor/plugins/attachment_fu/test/extra_attachment_test.rb
M vendor/plugins/attachment_fu/test/fixtures/attachment.rb
M vendor/plugins/attachment_fu/test/fixtures/files/fake/rails.png
M vendor/plugins/attachment_fu/test/fixtures/files/foo.txt
M vendor/plugins/attachment_fu/test/fixtures/files/rails.png
M vendor/plugins/attachment_fu/test/geometry_test.rb
M vendor/plugins/attachment_fu/test/processors/core_image_test.rb
M vendor/plugins/attachment_fu/test/processors/gd2_test.rb
M vendor/plugins/attachment_fu/test/processors/image_science_test.rb
M vendor/plugins/attachment_fu/test/processors/mini_magick_test.rb
M vendor/plugins/attachment_fu/test/processors/rmagick_test.rb
M vendor/plugins/attachment_fu/test/schema.rb
M vendor/plugins/attachment_fu/test/test_helper.rb
M vendor/plugins/attachment_fu/test/validation_test.rb
M vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/color.rb
M vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/effects.rb
M vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/perspective.rb
M vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/quality.rb
M vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/scale.rb
M vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/watermark.rb
M vendor/plugins/attachment_fu/vendor/red_artisan/core_image/processor.rb
M vendor/plugins/newrelic_rpm/LICENSE
M vendor/plugins/newrelic_rpm/README
M vendor/plugins/newrelic_rpm/Rakefile
M vendor/plugins/newrelic_rpm/init.rb
M vendor/plugins/newrelic_rpm/install.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/agent.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/agent/agent.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/agent/chained_call.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/agent/collection_helper.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/agent/error_collector.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/action_controller_instrumentation.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/active_record_instrumentation.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/dispatcher_instrumentation.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/memcache.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/memcached.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/merb/controller.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/merb/dispatcher.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/merb/errors.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/rails/action_controller.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/rails/action_web_service.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/rails/dispatcher.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/rails/errors.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/rails/rails.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/agent/method_tracer.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/agent/patch_const_missing.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/agent/samplers/cpu.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/agent/samplers/memory.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/agent/samplers/mongrel.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/agent/stats_engine.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/agent/synchronize.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/agent/transaction_sampler.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/agent/worker_loop.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/config.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/config/merb.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/config/rails.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/config/ruby.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/local_environment.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/merbtasks.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/metric_data.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/metric_spec.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/metrics.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/noticed_error.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/shim_agent.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/stats.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/transaction_analysis.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/transaction_sample.rb
M vendor/plugins/newrelic_rpm/lib/new_relic/version.rb
M vendor/plugins/newrelic_rpm/lib/newrelic.rb
M vendor/plugins/newrelic_rpm/newrelic.yml
M vendor/plugins/newrelic_rpm/newrelic_spec.rb
M vendor/plugins/newrelic_rpm/spec_helper.rb
M vendor/plugins/newrelic_rpm/tasks/agent_tests.rake
M vendor/plugins/newrelic_rpm/tasks/install.rake
M vendor/plugins/newrelic_rpm/test/config/newrelic.yml
M vendor/plugins/newrelic_rpm/test/config/test_config.rb
M vendor/plugins/newrelic_rpm/test/new_relic/agent/mock_ar_connection.rb
M vendor/plugins/newrelic_rpm/test/new_relic/agent/mock_scope_listener.rb
M vendor/plugins/newrelic_rpm/test/new_relic/agent/model_fixture.rb
M vendor/plugins/newrelic_rpm/test/new_relic/agent/tc_active_record.rb
M vendor/plugins/newrelic_rpm/test/new_relic/agent/tc_agent.rb
M vendor/plugins/newrelic_rpm/test/new_relic/agent/tc_collection_helper.rb
M vendor/plugins/newrelic_rpm/test/new_relic/agent/tc_controller.rb
M vendor/plugins/newrelic_rpm/test/new_relic/agent/tc_error_collector.rb
M vendor/plugins/newrelic_rpm/test/new_relic/agent/tc_method_tracer.rb
M vendor/plugins/newrelic_rpm/test/new_relic/agent/tc_stats_engine.rb
M vendor/plugins/newrelic_rpm/test/new_relic/agent/tc_synchronize.rb
M vendor/plugins/newrelic_rpm/test/new_relic/agent/tc_transaction_sample.rb
M vendor/plugins/newrelic_rpm/test/new_relic/agent/tc_transaction_sample_builder.rb
M vendor/plugins/newrelic_rpm/test/new_relic/agent/tc_transaction_sampler.rb
M vendor/plugins/newrelic_rpm/test/new_relic/agent/tc_worker_loop.rb
M vendor/plugins/newrelic_rpm/test/new_relic/agent/testable_agent.rb
M vendor/plugins/newrelic_rpm/test/new_relic/tc_config.rb
M vendor/plugins/newrelic_rpm/test/new_relic/tc_environment.rb
M vendor/plugins/newrelic_rpm/test/new_relic/tc_metric_spec.rb
M vendor/plugins/newrelic_rpm/test/new_relic/tc_stats.rb
M vendor/plugins/newrelic_rpm/test/test_helper.rb
M vendor/plugins/newrelic_rpm/test/ui/tc_newrelic_helper.rb
M vendor/plugins/newrelic_rpm/ui/controllers/newrelic_controller.rb
M vendor/plugins/newrelic_rpm/ui/helpers/google_pie_chart.rb
M vendor/plugins/newrelic_rpm/ui/helpers/newrelic_helper.rb
M vendor/plugins/newrelic_rpm/ui/views/layouts/newrelic_default.rhtml
M vendor/plugins/newrelic_rpm/ui/views/newrelic/_explain_plans.rhtml
M vendor/plugins/newrelic_rpm/ui/views/newrelic/_sample.rhtml
M vendor/plugins/newrelic_rpm/ui/views/newrelic/_segment.rhtml
M vendor/plugins/newrelic_rpm/ui/views/newrelic/_segment_row.rhtml
M vendor/plugins/newrelic_rpm/ui/views/newrelic/_show_sample_detail.rhtml
M vendor/plugins/newrelic_rpm/ui/views/newrelic/_show_sample_sql.rhtml
M vendor/plugins/newrelic_rpm/ui/views/newrelic/_show_sample_summary.rhtml
M vendor/plugins/newrelic_rpm/ui/views/newrelic/_sql_row.rhtml
M vendor/plugins/newrelic_rpm/ui/views/newrelic/_stack_trace.rhtml
M vendor/plugins/newrelic_rpm/ui/views/newrelic/_table.rhtml
M vendor/plugins/newrelic_rpm/ui/views/newrelic/explain_sql.rhtml
M vendor/plugins/newrelic_rpm/ui/views/newrelic/images/16-arrow-down.png
M vendor/plugins/newrelic_rpm/ui/views/newrelic/images/16-arrow-right.png
M vendor/plugins/newrelic_rpm/ui/views/newrelic/images/blue_bar.gif
M vendor/plugins/newrelic_rpm/ui/views/newrelic/images/gray_bar.gif
M vendor/plugins/newrelic_rpm/ui/views/newrelic/index.rhtml
M vendor/plugins/newrelic_rpm/ui/views/newrelic/javascript/transaction_sample.js
M vendor/plugins/newrelic_rpm/ui/views/newrelic/sample_not_found.rhtml
M vendor/plugins/newrelic_rpm/ui/views/newrelic/show_sample.rhtml
M vendor/plugins/newrelic_rpm/ui/views/newrelic/show_source.rhtml
M vendor/plugins/newrelic_rpm/ui/views/newrelic/stylesheets/style.css
M vendor/plugins/newrelic_rpm/version.txt