Changeset [3f791414859077f407bb6aa8c12d1ab57a6eb580] by Ben Tillman
August 19th, 2010 @ 04:53 AM
Merge branch 'master' into rails3
https://github.com/michaeldv/fat_free_crm/commit/3f791414859077f407...
Committed by Ben Tillman
- A .gitmodules
- A app/views/common/_select_popup.html.haml
- A app/views/common/attach.js.rjs
- A app/views/common/discard.rjs
- A app/views/tasks/discard.rjs
- A config/cucumber.yml
- A config/database.mysql.linux.yml
- A config/environments/cucumber.rb
- A db/migrate/030_acts_as_taggable_on_migration.rb
- A features/contacts.feature
- A features/opportunities.feature
- A features/step_definitions/contact_steps.rb
- A features/step_definitions/opportunity_steps.rb
- A features/step_definitions/user_steps.rb
- A features/step_definitions/web_ext_steps.rb
- A features/step_definitions/web_steps.rb
- A features/support/custom.rb
- A features/support/env.rb
- A features/support/paths.rb
- A features/users.feature
- A lib/tasks/cucumber.rake
- A lib/tasks/git.rake
- A lib/tasks/passenger.rake
- A script/cucumber
- A vendor/gems/faker-0.3.1/.specification
- A vendor/gems/faker-0.3.1/History.txt
- A vendor/gems/faker-0.3.1/License.txt
- A vendor/gems/faker-0.3.1/Manifest.txt
- A vendor/gems/faker-0.3.1/README.txt
- A vendor/gems/faker-0.3.1/Rakefile
- A vendor/gems/faker-0.3.1/config/hoe.rb
- A vendor/gems/faker-0.3.1/config/requirements.rb
- A vendor/gems/faker-0.3.1/faker.tmproj
- A vendor/gems/faker-0.3.1/lib/extensions/array.rb
- A vendor/gems/faker-0.3.1/lib/extensions/object.rb
- A vendor/gems/faker-0.3.1/lib/faker.rb
- A vendor/gems/faker-0.3.1/lib/faker/address.rb
- A vendor/gems/faker-0.3.1/lib/faker/company.rb
- A vendor/gems/faker-0.3.1/lib/faker/internet.rb
- A vendor/gems/faker-0.3.1/lib/faker/lorem.rb
- A vendor/gems/faker-0.3.1/lib/faker/name.rb
- A vendor/gems/faker-0.3.1/lib/faker/phone_number.rb
- A vendor/gems/faker-0.3.1/lib/faker/version.rb
- A vendor/gems/faker-0.3.1/script/destroy
- A vendor/gems/faker-0.3.1/script/generate
- A vendor/gems/faker-0.3.1/script/txt2html
- A vendor/gems/faker-0.3.1/setup.rb
- A vendor/gems/faker-0.3.1/tasks/deployment.rake
- A vendor/gems/faker-0.3.1/tasks/environment.rake
- A vendor/gems/faker-0.3.1/tasks/website.rake
- A vendor/gems/faker-0.3.1/test/test_faker.rb
- A vendor/gems/faker-0.3.1/test/test_faker_internet.rb
- A vendor/gems/faker-0.3.1/test/test_faker_name.rb
- A vendor/gems/faker-0.3.1/test/test_helper.rb
- A vendor/gems/will_paginate-2.3.14/.specification
- A vendor/gems/will_paginate-2.3.14/CHANGELOG.rdoc
- A vendor/gems/will_paginate-2.3.14/LICENSE
- A vendor/gems/will_paginate-2.3.14/README.rdoc
- A vendor/gems/will_paginate-2.3.14/Rakefile
- A vendor/gems/will_paginate-2.3.14/lib/will_paginate.rb
- A vendor/gems/will_paginate-2.3.14/lib/will_paginate/array.rb
- A vendor/gems/will_paginate-2.3.14/lib/will_paginate/collection.rb
- A vendor/gems/will_paginate-2.3.14/lib/will_paginate/core_ext.rb
- A vendor/gems/will_paginate-2.3.14/lib/will_paginate/finder.rb
- A vendor/gems/will_paginate-2.3.14/lib/will_paginate/named_scope.rb
- A vendor/gems/will_paginate-2.3.14/lib/will_paginate/named_scope_patch.rb
- A vendor/gems/will_paginate-2.3.14/lib/will_paginate/version.rb
- A vendor/gems/will_paginate-2.3.14/lib/will_paginate/view_helpers.rb
- A vendor/gems/will_paginate-2.3.14/test/boot.rb
- A vendor/gems/will_paginate-2.3.14/test/collection_test.rb
- A vendor/gems/will_paginate-2.3.14/test/console
- A vendor/gems/will_paginate-2.3.14/test/database.yml
- A vendor/gems/will_paginate-2.3.14/test/finder_test.rb
- A vendor/gems/will_paginate-2.3.14/test/fixtures/admin.rb
- A vendor/gems/will_paginate-2.3.14/test/fixtures/developer.rb
- A vendor/gems/will_paginate-2.3.14/test/fixtures/developers_projects.yml
- A vendor/gems/will_paginate-2.3.14/test/fixtures/project.rb
- A vendor/gems/will_paginate-2.3.14/test/fixtures/projects.yml
- A vendor/gems/will_paginate-2.3.14/test/fixtures/replies.yml
- A vendor/gems/will_paginate-2.3.14/test/fixtures/reply.rb
- A vendor/gems/will_paginate-2.3.14/test/fixtures/schema.rb
- A vendor/gems/will_paginate-2.3.14/test/fixtures/topic.rb
- A vendor/gems/will_paginate-2.3.14/test/fixtures/topics.yml
- A vendor/gems/will_paginate-2.3.14/test/fixtures/user.rb
- A vendor/gems/will_paginate-2.3.14/test/fixtures/users.yml
- A vendor/gems/will_paginate-2.3.14/test/helper.rb
- A vendor/gems/will_paginate-2.3.14/test/lib/activerecord_test_case.rb
- A vendor/gems/will_paginate-2.3.14/test/lib/activerecord_test_connector.rb
- A vendor/gems/will_paginate-2.3.14/test/lib/load_fixtures.rb
- A vendor/gems/will_paginate-2.3.14/test/lib/view_test_process.rb
- A vendor/gems/will_paginate-2.3.14/test/tasks.rake
- A vendor/gems/will_paginate-2.3.14/test/view_test.rb
- A vendor/plugins/acts-as-taggable-on/.rspec
- A vendor/plugins/acts-as-taggable-on/CHANGELOG
- A vendor/plugins/acts-as-taggable-on/Gemfile
- A vendor/plugins/acts-as-taggable-on/MIT-LICENSE
- A vendor/plugins/acts-as-taggable-on/README.rdoc
- A vendor/plugins/acts-as-taggable-on/Rakefile
- A vendor/plugins/acts-as-taggable-on/VERSION
- A vendor/plugins/acts-as-taggable-on/acts-as-taggable-on.gemspec
- A vendor/plugins/acts-as-taggable-on/generators/acts_as_taggable_on_migration/acts_as_taggable_on_migration_generator.rb
- A vendor/plugins/acts-as-taggable-on/generators/acts_as_taggable_on_migration/templates/migration.rb
- A vendor/plugins/acts-as-taggable-on/lib/acts-as-taggable-on.rb
- A vendor/plugins/acts-as-taggable-on/lib/acts_as_taggable_on/acts_as_taggable_on.rb
- A vendor/plugins/acts-as-taggable-on/lib/acts_as_taggable_on/acts_as_taggable_on/cache.rb
- A vendor/plugins/acts-as-taggable-on/lib/acts_as_taggable_on/acts_as_taggable_on/collection.rb
- A vendor/plugins/acts-as-taggable-on/lib/acts_as_taggable_on/acts_as_taggable_on/core.rb
- A vendor/plugins/acts-as-taggable-on/lib/acts_as_taggable_on/acts_as_taggable_on/ownership.rb
- A vendor/plugins/acts-as-taggable-on/lib/acts_as_taggable_on/acts_as_taggable_on/related.rb
- A vendor/plugins/acts-as-taggable-on/lib/acts_as_taggable_on/acts_as_tagger.rb
- A vendor/plugins/acts-as-taggable-on/lib/acts_as_taggable_on/compatibility/Gemfile
- A vendor/plugins/acts-as-taggable-on/lib/acts_as_taggable_on/compatibility/active_record_backports.rb
- A vendor/plugins/acts-as-taggable-on/lib/acts_as_taggable_on/tag.rb
- A vendor/plugins/acts-as-taggable-on/lib/acts_as_taggable_on/tag_list.rb
- A vendor/plugins/acts-as-taggable-on/lib/acts_as_taggable_on/tagging.rb
- A vendor/plugins/acts-as-taggable-on/lib/acts_as_taggable_on/tags_helper.rb
- A vendor/plugins/acts-as-taggable-on/lib/generators/acts_as_taggable_on/migration/migration_generator.rb
- A vendor/plugins/acts-as-taggable-on/lib/generators/acts_as_taggable_on/migration/templates/active_record/migration.rb
- A vendor/plugins/acts-as-taggable-on/rails/init.rb
- A vendor/plugins/acts-as-taggable-on/spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb
- A vendor/plugins/acts-as-taggable-on/spec/acts_as_taggable_on/acts_as_tagger_spec.rb
- A vendor/plugins/acts-as-taggable-on/spec/acts_as_taggable_on/tag_list_spec.rb
- A vendor/plugins/acts-as-taggable-on/spec/acts_as_taggable_on/tag_spec.rb
- A vendor/plugins/acts-as-taggable-on/spec/acts_as_taggable_on/taggable_spec.rb
- A vendor/plugins/acts-as-taggable-on/spec/acts_as_taggable_on/tagger_spec.rb
- A vendor/plugins/acts-as-taggable-on/spec/acts_as_taggable_on/tagging_spec.rb
- A vendor/plugins/acts-as-taggable-on/spec/acts_as_taggable_on/tags_helper_spec.rb
- A vendor/plugins/acts-as-taggable-on/spec/bm.rb
- A vendor/plugins/acts-as-taggable-on/spec/database.yml.sample
- A vendor/plugins/acts-as-taggable-on/spec/models.rb
- A vendor/plugins/acts-as-taggable-on/spec/schema.rb
- A vendor/plugins/acts-as-taggable-on/spec/spec_helper.rb
- A vendor/plugins/acts-as-taggable-on/uninstall.rb
- A vendor/plugins/crm_merge_contacts
- A vendor/plugins/prepend_engine_views/init.rb
- A vendor/plugins/rspec-plugin-generator/MIT-LICENSE
- A vendor/plugins/rspec-plugin-generator/README.rdoc
- A vendor/plugins/rspec-plugin-generator/generators/rspec_plugin/USAGE
- A vendor/plugins/rspec-plugin-generator/generators/rspec_plugin/rspec_plugin_generator.rb
- A vendor/plugins/rspec-plugin-generator/generators/rspec_plugin/templates/Rakefile
- A vendor/plugins/rspec-plugin-generator/generators/rspec_plugin/templates/database.yml
- A vendor/plugins/rspec-plugin-generator/generators/rspec_plugin/templates/schema.rb
- A vendor/plugins/rspec-plugin-generator/generators/rspec_plugin/templates/spec.rb
- A vendor/plugins/rspec-plugin-generator/generators/rspec_plugin/templates/spec_helper.rb
- R test/performance/browsing_test.rb
- R test/test_helper.rb
- R test/unit/activity_observer_test.rb
- R test/unit/notifier_test.rb
- R vendor/plugins/will_paginate/CHANGELOG.rdoc
- R vendor/plugins/will_paginate/LICENSE
- R vendor/plugins/will_paginate/README.rdoc
- R vendor/plugins/will_paginate/Rakefile
- R vendor/plugins/will_paginate/lib/will_paginate.rb
- R vendor/plugins/will_paginate/lib/will_paginate/array.rb
- R vendor/plugins/will_paginate/lib/will_paginate/collection.rb
- R vendor/plugins/will_paginate/lib/will_paginate/core_ext.rb
- R vendor/plugins/will_paginate/lib/will_paginate/finder.rb
- R vendor/plugins/will_paginate/lib/will_paginate/named_scope.rb
- R vendor/plugins/will_paginate/lib/will_paginate/named_scope_patch.rb
- R vendor/plugins/will_paginate/lib/will_paginate/version.rb
- R vendor/plugins/will_paginate/lib/will_paginate/view_helpers.rb
- R vendor/plugins/will_paginate/test/boot.rb
- R vendor/plugins/will_paginate/test/collection_test.rb
- R vendor/plugins/will_paginate/test/console
- R vendor/plugins/will_paginate/test/database.yml
- R vendor/plugins/will_paginate/test/finder_test.rb
- R vendor/plugins/will_paginate/test/fixtures/admin.rb
- R vendor/plugins/will_paginate/test/fixtures/developer.rb
- R vendor/plugins/will_paginate/test/fixtures/developers_projects.yml
- R vendor/plugins/will_paginate/test/fixtures/project.rb
- R vendor/plugins/will_paginate/test/fixtures/projects.yml
- R vendor/plugins/will_paginate/test/fixtures/replies.yml
- R vendor/plugins/will_paginate/test/fixtures/reply.rb
- R vendor/plugins/will_paginate/test/fixtures/schema.rb
- R vendor/plugins/will_paginate/test/fixtures/topic.rb
- R vendor/plugins/will_paginate/test/fixtures/topics.yml
- R vendor/plugins/will_paginate/test/fixtures/user.rb
- R vendor/plugins/will_paginate/test/fixtures/users.yml
- R vendor/plugins/will_paginate/test/helper.rb
- R vendor/plugins/will_paginate/test/lib/activerecord_test_case.rb
- R vendor/plugins/will_paginate/test/lib/activerecord_test_connector.rb
- R vendor/plugins/will_paginate/test/lib/load_fixtures.rb
- R vendor/plugins/will_paginate/test/lib/view_test_process.rb
- R vendor/plugins/will_paginate/test/tasks.rake
- R vendor/plugins/will_paginate/test/view_test.rb
- R vendor/plugins/will_paginate/.gitignore
- R vendor/plugins/will_paginate/.manifest
- R vendor/plugins/will_paginate/examples/apple-circle.gif
- R vendor/plugins/will_paginate/examples/index.haml
- R vendor/plugins/will_paginate/examples/index.html
- R vendor/plugins/will_paginate/examples/pagination.css
- R vendor/plugins/will_paginate/examples/pagination.sass
- R vendor/plugins/will_paginate/init.rb
- R vendor/plugins/will_paginate/will_paginate.gemspec
- M .gitignore
- M README.rdoc
- M app/controllers/accounts_controller.rb
- M app/controllers/admin/application_controller.rb
- M app/controllers/application_controller.rb
- M app/controllers/campaigns_controller.rb
- M app/controllers/contacts_controller.rb
- M app/controllers/leads_controller.rb
- M app/controllers/opportunities_controller.rb
- M app/controllers/tasks_controller.rb
- M app/helpers/admin/application_helper.rb
- M app/helpers/application_helper.rb
- M app/helpers/leads_helper.rb
- M app/models/account.rb
- M app/models/campaign.rb
- M app/models/contact.rb
- M app/models/lead.rb
- M app/models/opportunity.rb
- M app/models/task.rb
- M app/stylesheets/common.sass
- M app/stylesheets/header.sass
- M app/stylesheets/rails.sass
- M app/views/accounts/_account.html.haml
- M app/views/accounts/_top_section.html.haml
- M app/views/accounts/show.html.haml
- M app/views/admin/users/_confirm.html.haml
- M app/views/admin/users/_create.html.haml
- M app/views/admin/users/_edit.html.haml
- M app/views/admin/users/_user.html.haml
- M app/views/campaigns/_campaign.html.haml
- M app/views/campaigns/show.html.haml
- M app/views/comments/_comment.html.haml
- M app/views/comments/_new.html.haml
- M app/views/common/_comment.html.haml
- M app/views/common/_empty.html.haml
- M app/views/common/_inline_styles.html.haml
- M app/views/common/auto_complete.html.haml
- M app/views/contacts/_contact.html.haml
- M app/views/contacts/_top_section.html.haml
- M app/views/contacts/show.html.haml
- M app/views/emails/_email.html.haml
- M app/views/home/_activity.html.haml
- M app/views/layouts/_jumpbox.html.haml
- M app/views/layouts/_sidebar.html.haml
- M app/views/leads/_lead.html.haml
- M app/views/leads/_status.html.haml
- M app/views/leads/_top_section.html.haml
- M app/views/leads/show.html.haml
- M app/views/opportunities/_opportunity.html.haml
- M app/views/opportunities/_top_section.html.haml
- M app/views/opportunities/show.html.haml
- M app/views/tasks/_assigned.html.haml
- M app/views/tasks/_completed.html.haml
- M app/views/tasks/_pending.html.haml
- M app/views/tasks/_title.html.haml
- M config/database.mysql.yml
- M config/database.sqlite.yml
- M config/environment.rb
- M config/environments/development.rb
- M config/environments/test.rb
- M config/locales/de.yml
- M config/locales/de_fat_free_crm.yml
- M config/locales/en-US.yml
- M config/locales/en-US_fat_free_crm.yml
- M config/locales/es-ES_fat_free_crm.yml
- M config/locales/fr_fat_free_crm.yml
- M config/locales/ja_fat_free_crm.yml
- M config/locales/pl_fat_free_crm.yml
- M config/locales/pt-BR_fat_free_crm.yml
- M config/locales/ru_fat_free_crm.yml
- M config/locales/th_fat_free_crm.yml
- M config/locales/zh-CN_fat_free_crm.yml
- M config/routes.rb
- M config/settings.yml
- M lib/fat_free_crm/dropbox.rb
- M lib/fat_free_crm/permissions.rb
- M lib/fat_free_crm/plugin.rb
- M public/javascripts/application.js
- M public/javascripts/crm_classes.js
- M public/stylesheets/common.css
- M public/stylesheets/header.css
- M public/stylesheets/screen.css
- M spec/controllers/accounts_controller_spec.rb
- M spec/controllers/authentications_controller_spec.rb
- M spec/controllers/campaigns_controller_spec.rb
- M spec/controllers/contacts_controller_spec.rb
- M spec/controllers/leads_controller_spec.rb
- M spec/controllers/opportunities_controller_spec.rb
- M spec/factories.rb
- M spec/fixtures/emails.yml
- M spec/helpers/application_helper_spec.rb
- M spec/lib/dropbox_spec.rb
- M spec/models/account_spec.rb
- M spec/models/campaign_spec.rb
- M spec/models/contact_spec.rb
- M spec/models/lead_spec.rb
- M spec/models/opportunity_spec.rb
- M spec/shared/controllers.rb
- M spec/spec.opts
- M spec/spec_helper.rb
- M spec/views/home/options.rjs_spec.rb
- M vendor/plugins/acts_as_commentable/lib/commentable_methods.rb
- M vendor/plugins/simple_column_search/lib/simple_column_search.rb
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป
Ruby on Rails CRM platform for Web 2.0 and beyond