Changeset [3f29f59deb21f414d64142bd7520b5c117bd8876] by Marnen Laibow-Koser
Revision 3f29f59deb21f414d64142bd7520b5c117bd8876,
committed by Marnen Laibow-Koser
· September 21st, 2011 @ 03:10 PM
Merge branch 'master' into deploy
https://github.com/marnen/quorum2/commit/3f29f59deb21f414d64142bd75...
251 changed files
-
A
.rspec -
A
CHANGELOG.md -
A
app/views/events/feed.rss.haml -
A
config/application.rb -
A
config/cucumber.yml -
A
config/database-orig.yml -
A
config/initializers/exception_notifier.rb -
A
config/initializers/fast_gettext.rb -
A
config/initializers/haml.rb -
A
config/initializers/mail_setup.rb -
A
features/events/event_map.feature -
A
features/step_definitions/pickle_steps.rb -
A
features/step_definitions/web_steps.rb -
A
features/support/pickle.rb -
A
features/support/selectors.rb -
A
lib/tasks/utf8encode.rake -
A
public/javascripts/rails.js -
A
script/rails -
A
spec/controllers/application_controller_spec.rb -
A
spec/factories.rb -
A
spec/support/authlogic.rb -
A
vendor/plugins/make_resourceful/DEFAULTS -
A
vendor/plugins/make_resourceful/LICENSE -
A
vendor/plugins/make_resourceful/README -
A
vendor/plugins/make_resourceful/Rakefile -
A
vendor/plugins/make_resourceful/VERSION -
A
vendor/plugins/make_resourceful/generators/resourceful_scaffold/resourceful_scaffold_generator.rb -
A
vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/controller.rb -
A
vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/fixtures.yml -
A
vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/functional_test.rb -
A
vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/helper.rb -
A
vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/migration.rb -
A
vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/model.rb -
A
vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/unit_test.rb -
A
vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/view__form.haml -
A
vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/view_edit.haml -
A
vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/view_index.haml -
A
vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/view_new.haml -
A
vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/view_partial.haml -
A
vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/view_show.haml -
A
vendor/plugins/make_resourceful/init.rb -
A
vendor/plugins/make_resourceful/lib/resourceful/base.rb -
A
vendor/plugins/make_resourceful/lib/resourceful/builder.rb -
A
vendor/plugins/make_resourceful/lib/resourceful/default/accessors.rb -
A
vendor/plugins/make_resourceful/lib/resourceful/default/actions.rb -
A
vendor/plugins/make_resourceful/lib/resourceful/default/callbacks.rb -
A
vendor/plugins/make_resourceful/lib/resourceful/default/responses.rb -
A
vendor/plugins/make_resourceful/lib/resourceful/default/urls.rb -
A
vendor/plugins/make_resourceful/lib/resourceful/maker.rb -
A
vendor/plugins/make_resourceful/lib/resourceful/response.rb -
A
vendor/plugins/make_resourceful/lib/resourceful/serialize.rb -
A
vendor/plugins/make_resourceful/spec/accessors_spec.rb -
A
vendor/plugins/make_resourceful/spec/actions_spec.rb -
A
vendor/plugins/make_resourceful/spec/base_spec.rb -
A
vendor/plugins/make_resourceful/spec/builder_spec.rb -
A
vendor/plugins/make_resourceful/spec/callbacks_spec.rb -
A
vendor/plugins/make_resourceful/spec/integration_spec.rb -
A
vendor/plugins/make_resourceful/spec/maker_spec.rb -
A
vendor/plugins/make_resourceful/spec/response_spec.rb -
A
vendor/plugins/make_resourceful/spec/responses_spec.rb -
A
vendor/plugins/make_resourceful/spec/rspec_on_rails/LICENSE -
A
vendor/plugins/make_resourceful/spec/rspec_on_rails/redirect_to.rb -
A
vendor/plugins/make_resourceful/spec/rspec_on_rails/render_template.rb -
A
vendor/plugins/make_resourceful/spec/serialize_spec.rb -
A
vendor/plugins/make_resourceful/spec/spec_helper.rb -
A
vendor/plugins/make_resourceful/spec/urls_spec.rb -
A
vendor/plugins/rails_upgrade/MIT-LICENSE -
A
vendor/plugins/rails_upgrade/README -
A
vendor/plugins/rails_upgrade/Rakefile -
A
vendor/plugins/rails_upgrade/init.rb -
A
vendor/plugins/rails_upgrade/install.rb -
A
vendor/plugins/rails_upgrade/lib/application_checker.rb -
A
vendor/plugins/rails_upgrade/lib/gemfile_generator.rb -
A
vendor/plugins/rails_upgrade/lib/new_configuration_generator.rb -
A
vendor/plugins/rails_upgrade/lib/rails_upgrade.rb -
A
vendor/plugins/rails_upgrade/lib/routes_upgrader.rb -
A
vendor/plugins/rails_upgrade/lib/tasks/rails_upgrade_tasks.rake -
A
vendor/plugins/rails_upgrade/test/application_checker_test.rb -
A
vendor/plugins/rails_upgrade/test/gemfile_generator_test.rb -
A
vendor/plugins/rails_upgrade/test/new_configuration_generator_test.rb -
A
vendor/plugins/rails_upgrade/test/routes_upgrader_test.rb -
A
vendor/plugins/rails_upgrade/test/test_helper.rb -
A
vendor/plugins/rails_upgrade/uninstall.rb -
R
app/views/events/feed.rss.builder -
R
config/database.yml.orig -
R
features/step_definitions/webrat_steps.rb -
R
spec/blueprints.rb -
R
spec/controllers/application_spec.rb -
R
spec/spec.opts -
R
spec/views/events/map.html.haml_spec.rb -
R
vendor/plugins/exception_notification -
R
vendor/plugins/gettext_i18n_rails/README.markdown -
R
vendor/plugins/gettext_i18n_rails/Rakefile -
R
vendor/plugins/gettext_i18n_rails/init.rb -
R
vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails.rb -
R
vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/action_controller.rb -
R
vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/active_record.rb -
R
vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/haml_parser.rb -
R
vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/haml_translation_extractor.rb -
R
vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/i18n_hacks.rb -
R
vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/model_attributes_finder.rb -
R
vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails/action_controller_spec.rb -
R
vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails/active_record_spec.rb -
R
vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails/haml_translation_extractor_spec.rb -
R
vendor/plugins/gettext_i18n_rails/spec/gettext_i18n_rails_spec.rb -
R
vendor/plugins/gettext_i18n_rails/spec/spec_helper.rb -
R
vendor/plugins/gettext_i18n_rails/tasks/gettext_rails_i18n.rake -
R
vendor/plugins/javascript_test -
R
vendor/plugins/make_resourceful -
M
.autotest -
M
.gitignore -
M
.rvmrc -
M
Gemfile -
M
Gemfile.lock -
M
README -
M
Rakefile -
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
app/views/admin/index.html.haml -
M
app/views/calendars/edit.html.haml -
M
app/views/calendars/users.html.haml -
M
app/views/events/_attendance.html.haml -
M
app/views/events/_event.html.haml -
M
app/views/events/_table_header.html.haml -
M
app/views/events/index.html.haml -
M
app/views/events/index.pdf.prawn -
M
app/views/events/new.html.haml -
M
app/views/layouts/standard.html.haml -
M
app/views/layouts/unauthenticated.html.haml -
M
app/views/user_sessions/new.html.haml -
M
app/views/users/new.html.haml -
M
app/views/users/reset.html.haml -
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/inflections.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/support/additional_cucumber_setup.rb -
M
features/support/env.rb -
M
features/support/paths.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/404.html -
M
public/422.html -
M
public/500.html -
M
public/dispatch.rb -
M
public/images/rails.png -
M
public/javascripts/controls.js -
M
public/javascripts/dragdrop.js -
M
public/javascripts/effects.js -
M
public/javascripts/prototype.js -
M
public/stylesheets/sass/quorum.scss -
M
script/cucumber -
M
spec/controllers/admin_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/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/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 -
M
vendor/plugins/ym4r_gm/lib/gm_plugin/map.rb