Changeset [b7d9601fae3f0f79fe92b4f90345dad4b558003e] by Marnen Laibow-Koser
Revision b7d9601fae3f0f79fe92b4f90345dad4b558003e,
committed by Marnen Laibow-Koser
· December 3rd, 2013 @ 10:57 AM
Merge branch 'master' into 66-ruby-1.9.3
Conflicts:
.rvmrc
https://github.com/marnen/quorum2/commit/b7d9601fae3f0f79fe92b4f903...
191 changed files
-
A
.rspec.travis -
A
.ruby-gemset -
A
.ruby-version -
A
.travis.yml -
A
README.md -
A
app/helpers/gmaps_helper.rb -
A
app/views/calendars/_form.html.haml -
A
app/views/calendars/new.html.haml -
A
app/views/events/_comment.html.haml -
A
app/views/events/_form.html.haml -
A
app/views/events/edit.html.haml -
A
app/views/layouts/_flash.html.haml -
A
app/views/layouts/_head.html.haml -
A
app/views/layouts/application.html.haml -
A
ci/before_script.sh -
A
ci/create_config_files.sh -
A
ci/install_postgis.sh -
A
config.ru -
A
config/initializers/action_mailer_patch.rb -
A
db/migrate/20120308160523_add_comment_to_commitments.rb -
A
db/migrate/20130803025446_change_geometry_columns_to_new_format.rb -
A
features/commitments/add_comment_to_commitment.feature -
A
features/commitments/update_commitment_status.feature -
A
features/step_definitions/comment_steps.rb -
A
features/support/fetch_helpers.rb -
A
features/support/geocoder.rb -
A
lib/acts/geocoded.rb -
A
lib/tasks/ci.rake -
A
public/stylesheets/sass/_icon.scss -
A
spec/helpers/gmaps_helper_spec.rb -
A
spec/lib/acts/geocoded_spec.rb -
A
spec/support/geocoder.rb -
A
spec/support/geocoder_helpers.rb -
R
.rvmrc -
R
README -
R
features/commitment.feature -
R
lib/geocoding_utilities.rb -
R
lib/tasks/databases.rake -
R
lib/tasks/rspec.rake -
R
vendor/plugins/make_resourceful/DEFAULTS -
R
vendor/plugins/make_resourceful/LICENSE -
R
vendor/plugins/make_resourceful/README -
R
vendor/plugins/make_resourceful/Rakefile -
R
vendor/plugins/make_resourceful/VERSION -
R
vendor/plugins/make_resourceful/generators/resourceful_scaffold/resourceful_scaffold_generator.rb -
R
vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/controller.rb -
R
vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/fixtures.yml -
R
vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/functional_test.rb -
R
vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/helper.rb -
R
vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/migration.rb -
R
vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/model.rb -
R
vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/unit_test.rb -
R
vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/view__form.haml -
R
vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/view_edit.haml -
R
vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/view_index.haml -
R
vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/view_new.haml -
R
vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/view_partial.haml -
R
vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/view_show.haml -
R
vendor/plugins/make_resourceful/init.rb -
R
vendor/plugins/make_resourceful/lib/resourceful/base.rb -
R
vendor/plugins/make_resourceful/lib/resourceful/builder.rb -
R
vendor/plugins/make_resourceful/lib/resourceful/default/accessors.rb -
R
vendor/plugins/make_resourceful/lib/resourceful/default/actions.rb -
R
vendor/plugins/make_resourceful/lib/resourceful/default/callbacks.rb -
R
vendor/plugins/make_resourceful/lib/resourceful/default/responses.rb -
R
vendor/plugins/make_resourceful/lib/resourceful/default/urls.rb -
R
vendor/plugins/make_resourceful/lib/resourceful/maker.rb -
R
vendor/plugins/make_resourceful/lib/resourceful/response.rb -
R
vendor/plugins/make_resourceful/lib/resourceful/serialize.rb -
R
vendor/plugins/make_resourceful/spec/accessors_spec.rb -
R
vendor/plugins/make_resourceful/spec/actions_spec.rb -
R
vendor/plugins/make_resourceful/spec/base_spec.rb -
R
vendor/plugins/make_resourceful/spec/builder_spec.rb -
R
vendor/plugins/make_resourceful/spec/callbacks_spec.rb -
R
vendor/plugins/make_resourceful/spec/integration_spec.rb -
R
vendor/plugins/make_resourceful/spec/maker_spec.rb -
R
vendor/plugins/make_resourceful/spec/response_spec.rb -
R
vendor/plugins/make_resourceful/spec/responses_spec.rb -
R
vendor/plugins/make_resourceful/spec/rspec_on_rails/LICENSE -
R
vendor/plugins/make_resourceful/spec/rspec_on_rails/redirect_to.rb -
R
vendor/plugins/make_resourceful/spec/rspec_on_rails/render_template.rb -
R
vendor/plugins/make_resourceful/spec/serialize_spec.rb -
R
vendor/plugins/make_resourceful/spec/spec_helper.rb -
R
vendor/plugins/make_resourceful/spec/urls_spec.rb -
R
vendor/plugins/spatial_adapter/MIT-LICENSE -
R
vendor/plugins/spatial_adapter/README.rdoc -
R
vendor/plugins/spatial_adapter/init.rb -
R
vendor/plugins/spatial_adapter/lib/common_spatial_adapter.rb -
R
vendor/plugins/spatial_adapter/lib/mysql_spatial_adapter.rb -
R
vendor/plugins/spatial_adapter/lib/post_gis_adapter.rb -
R
vendor/plugins/spatial_adapter/rakefile.rb -
R
vendor/plugins/spatial_adapter/test/access_mysql_test.rb -
R
vendor/plugins/spatial_adapter/test/access_postgis_test.rb -
R
vendor/plugins/spatial_adapter/test/common/common_mysql.rb -
R
vendor/plugins/spatial_adapter/test/common/common_postgis.rb -
R
vendor/plugins/spatial_adapter/test/db/database_mysql.yml -
R
vendor/plugins/spatial_adapter/test/db/database_postgis.yml -
R
vendor/plugins/spatial_adapter/test/find_mysql_test.rb -
R
vendor/plugins/spatial_adapter/test/find_postgis_test.rb -
R
vendor/plugins/spatial_adapter/test/fixture_mysql_test.rb -
R
vendor/plugins/spatial_adapter/test/fixture_postgis_test.rb -
R
vendor/plugins/spatial_adapter/test/migration_mysql_test.rb -
R
vendor/plugins/spatial_adapter/test/migration_postgis_test.rb -
R
vendor/plugins/spatial_adapter/test/models/models_mysql.rb -
R
vendor/plugins/spatial_adapter/test/models/models_postgis.rb -
R
vendor/plugins/spatial_adapter/test/schema/schema_mysql.rb -
R
vendor/plugins/spatial_adapter/test/schema/schema_postgis.rb -
R
vendor/plugins/ym4r_gm/README -
R
vendor/plugins/ym4r_gm/gmaps_api_key.yml.sample -
R
vendor/plugins/ym4r_gm/init.rb -
R
vendor/plugins/ym4r_gm/install.rb -
R
vendor/plugins/ym4r_gm/javascript/clusterer.js -
R
vendor/plugins/ym4r_gm/javascript/geoRssOverlay.js -
R
vendor/plugins/ym4r_gm/javascript/markerGroup.js -
R
vendor/plugins/ym4r_gm/javascript/wms-gs.js -
R
vendor/plugins/ym4r_gm/javascript/ym4r-gm.js -
R
vendor/plugins/ym4r_gm/lib/gm_plugin/control.rb -
R
vendor/plugins/ym4r_gm/lib/gm_plugin/geocoding.rb -
R
vendor/plugins/ym4r_gm/lib/gm_plugin/helper.rb -
R
vendor/plugins/ym4r_gm/lib/gm_plugin/key.rb -
R
vendor/plugins/ym4r_gm/lib/gm_plugin/layer.rb -
R
vendor/plugins/ym4r_gm/lib/gm_plugin/map.rb -
R
vendor/plugins/ym4r_gm/lib/gm_plugin/mapping.rb -
R
vendor/plugins/ym4r_gm/lib/gm_plugin/overlay.rb -
R
vendor/plugins/ym4r_gm/lib/gm_plugin/point.rb -
R
vendor/plugins/ym4r_gm/lib/ym4r_gm.rb -
R
vendor/plugins/ym4r_gm/rakefile.rb -
R
vendor/plugins/ym4r_gm/tasks/gm_tasks.rake -
R
vendor/plugins/ym4r_gm/test/gm_test.rb -
M
.autotest -
M
.gitignore -
M
CHANGELOG.md -
M
Gemfile -
M
Gemfile.lock -
M
app/controllers/calendars_controller.rb -
M
app/controllers/events_controller.rb -
M
app/controllers/permissions_controller.rb -
M
app/helpers/events_helper.rb -
M
app/models/calendar.rb -
M
app/models/commitment.rb -
M
app/models/event.rb -
M
app/models/user.rb -
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/_names.html.haml -
M
app/views/events/feed.rss.haml -
M
app/views/events/ical.ics.erb -
M
app/views/events/index.html.haml -
M
app/views/events/map.html.haml -
M
app/views/events/new.html.haml -
M
app/views/events/show.html.haml -
M
app/views/layouts/standard.html.haml -
M
app/views/layouts/unauthenticated.html.haml -
M
config/database-orig.yml -
M
config/deploy-orig.rb -
M
config/initializers/app_globals.rb -
M
config/initializers/haml.rb -
M
db/migrate/20090508200432_restore_srid.rb -
M
db/schema.rb -
M
features/calendars/administer_calendars.feature -
M
features/events/event_map.feature -
M
features/events/list_events.feature -
M
features/manage_subscriptions.feature -
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/selectors.rb -
M
public/javascripts/events/index.js -
M
public/javascripts/events/map.js -
M
public/stylesheets/sass/quorum.scss -
M
spec/controllers/application_controller_spec.rb -
M
spec/controllers/events_controller_spec.rb -
M
spec/factories.rb -
M
spec/helpers/events_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/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