Changeset [3a42388be9d888bd709cdf4004318aca72f32eef] by Marnen Laibow-Koser

September 9th, 2011 @ 07:20 PM

Merge branch 'master' into 57-fix-html-escaping

Conflicts:

spec/views/events/map.html.haml_spec.rb

https://github.com/marnen/quorum2/commit/3a42388be9d888bd709cdf4004...

Committed by Marnen Laibow-Koser

  • A lib/tasks/utf8encode.rake
  • M .rvmrc
  • M Gemfile
  • M Gemfile.lock
  • M app/controllers/admin_controller.rb
  • M app/controllers/application_controller.rb
  • M app/controllers/calendars_controller.rb
  • M app/controllers/events_controller.rb
  • M app/controllers/permissions_controller.rb
  • M app/controllers/user_sessions_controller.rb
  • M app/controllers/users_controller.rb
  • M app/helpers/admin_helper.rb
  • M app/helpers/application_helper.rb
  • M app/helpers/calendars_helper.rb
  • M app/helpers/events_helper.rb
  • M app/helpers/permissions_helper.rb
  • M app/helpers/sessions_helper.rb
  • M app/helpers/users_helper.rb
  • M app/models/calendar.rb
  • M app/models/commitment.rb
  • M app/models/event.rb
  • M app/models/permission.rb
  • M app/models/role.rb
  • M app/models/search.rb
  • M app/models/user.rb
  • M app/models/user_mailer.rb
  • M app/models/user_session.rb
  • M config/application.rb
  • M config/boot.rb
  • M config/deploy-orig.rb
  • M config/environment.rb
  • M config/environments/cucumber.rb
  • M config/environments/development.rb
  • M config/environments/production.rb
  • M config/environments/test.rb
  • M config/initializers/app_globals.rb
  • M config/initializers/fast_gettext.rb
  • M config/initializers/haml.rb
  • M config/initializers/inflections.rb
  • M config/initializers/mail_setup.rb
  • M config/initializers/mime_types.rb
  • M config/preinitializer.rb
  • M config/routes.rb
  • M db/migrate/001_create_events.rb
  • M db/migrate/002_remove_country_id_from_events.rb
  • M db/migrate/003_create_attendance_schema.rb
  • M db/migrate/004_create_states_and_countries.rb
  • M db/migrate/005_create_users.rb
  • M db/migrate/006_rename_attendance_table.rb
  • M db/migrate/007_add_created_by_id_to_events.rb
  • M db/migrate/008_add_deleted_to_events.rb
  • M db/migrate/009_create_roles.rb
  • M db/migrate/010_add_show_contact_to_users.rb
  • M db/migrate/011_add_description_to_events.rb
  • M db/migrate/012_add_feed_key_to_users.rb
  • M db/migrate/013_create_calendars.rb
  • M db/migrate/20081111034201_add_report_flag_to_permissions.rb
  • M db/migrate/20090508200432_restore_srid.rb
  • M db/migrate/20091012223503_transition_to_authlogic.rb
  • M db/migrate/20091020154940_add_unique_index_to_permissions.rb
  • M db/schema.rb
  • M features/step_definitions/calendar_steps.rb
  • M features/step_definitions/event_steps.rb
  • M features/step_definitions/extra_web_steps.rb
  • M features/step_definitions/user_steps.rb
  • M features/step_definitions/web_steps.rb
  • M features/support/additional_cucumber_setup.rb
  • M features/support/env.rb
  • M features/support/paths.rb
  • M features/support/selectors.rb
  • M lib/geocoding_utilities.rb
  • M lib/haml_parser.rb
  • M lib/tasks/cucumber.rake
  • M lib/tasks/databases.rake
  • M lib/tasks/rspec.rake
  • M public/dispatch.rb
  • M spec/controllers/admin_controller_spec.rb
  • M spec/controllers/application_controller_spec.rb
  • M spec/controllers/calendars_controller_spec.rb
  • M spec/controllers/events_controller_spec.rb
  • M spec/controllers/permissions_controller_spec.rb
  • M spec/controllers/user_sessions_controller_spec.rb
  • M spec/controllers/users_controller_spec.rb
  • M spec/factories.rb
  • M spec/helpers/admin_helper_spec.rb
  • M spec/helpers/calendars_helper_spec.rb
  • M spec/helpers/events_helper_spec.rb
  • M spec/helpers/permissions_helper_spec.rb
  • M spec/helpers/users_helper_spec.rb
  • M spec/models/calendar_spec.rb
  • M spec/models/commitment_spec.rb
  • M spec/models/event_spec.rb
  • M spec/models/permission_spec.rb
  • M spec/models/role_spec.rb
  • M spec/models/search_spec.rb
  • M spec/models/user_spec.rb
  • M spec/spec_helper.rb
  • M spec/support/authlogic.rb
  • M spec/views/calendars/users.html.haml_spec.rb
  • M spec/views/events/_attendance.html.haml_spec.rb
  • M spec/views/events/_event.html.haml_spec.rb
  • M spec/views/events/ical.ics.erb_spec.rb
  • M spec/views/events/index.html.haml_spec.rb
  • M spec/views/events/new.html.haml_spec.rb
  • M spec/views/events/show.html.haml_spec.rb
  • M spec/views/users/new.html.haml_spec.rb
  • M test/test_helper.rb
  • M vendor/plugins/acts_as_addressed/init.rb
  • M vendor/plugins/acts_as_addressed/install.rb
  • M vendor/plugins/acts_as_addressed/lib/acts/addressed/address.rb
  • M vendor/plugins/acts_as_addressed/lib/acts/addressed/country.rb
  • M vendor/plugins/acts_as_addressed/lib/acts/addressed/quiet_nil.rb
  • M vendor/plugins/acts_as_addressed/lib/acts/addressed/state.rb
  • M vendor/plugins/acts_as_addressed/lib/acts_as_addressed.rb
  • M vendor/plugins/acts_as_addressed/spec/acts/addressed/address_spec.rb
  • M vendor/plugins/acts_as_addressed/spec/acts/addressed/country_spec.rb
  • M vendor/plugins/acts_as_addressed/spec/acts/addressed/quiet_nil_spec.rb
  • M vendor/plugins/acts_as_addressed/spec/acts/addressed/state_spec.rb
  • M vendor/plugins/acts_as_addressed/spec/acts_as_addressed_spec.rb
  • M vendor/plugins/acts_as_addressed/spec/blueprints.rb
  • M vendor/plugins/acts_as_addressed/spec/spec_helper.rb
  • M vendor/plugins/acts_as_addressed/tasks/acts_as_addressed_tasks.rake
  • M vendor/plugins/acts_as_addressed/uninstall.rb
New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป

<p>This is the issue tracker for the Quorum calendar system. Also see our <a href="http://github.com/marnen/quorum2">Github repository</a> and our <a href="http://quorum2.sourceforge.net">project website</a>.</p>
<p>Please tag bug reports with <strong>bug</strong> and feature requests with <strong>feature</strong>. Use additional descriptive tags as necessary.</p>

Shared Ticket Bins