Changeset [fc6e3a2422a18a04faecbff561bae426f6d2ce63] by Ralf Ebert

August 6th, 2010 @ 06:34 AM

Merge branch 'master' into development

Conflicts:

app/views/contacts/_contact.html.haml
app/views/leads/_lead.html.haml
app/views/opportunities/_opportunity.html.haml
app/views/tasks/_assigned.html.haml
app/views/tasks/_completed.html.haml
app/views/tasks/_pending.html.haml

http://github.com/michaeldv/fat_free_crm/commit/fc6e3a2422a18a04fae...

Committed by Ralf Ebert

  • 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
  • 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 README.rdoc
  • M app/helpers/application_helper.rb
  • M app/models/opportunity.rb
  • M app/views/accounts/_account.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/comments/_comment.html.haml
  • M app/views/comments/_new.html.haml
  • M app/views/common/_comment.html.haml
  • M app/views/contacts/_contact.html.haml
  • M app/views/emails/_email.html.haml
  • M app/views/home/_activity.html.haml
  • M app/views/leads/_lead.html.haml
  • M app/views/opportunities/_opportunity.html.haml
  • M app/views/tasks/_assigned.html.haml
  • M app/views/tasks/_completed.html.haml
  • M app/views/tasks/_pending.html.haml
  • M config/environment.rb
  • M config/locales/de_fat_free_crm.yml
  • M config/locales/en-US.yml
  • M lib/fat_free_crm/dropbox.rb
  • M public/stylesheets/screen.css
  • M spec/lib/dropbox_spec.rb
  • M spec/spec_helper.rb
  • M spec/views/home/options.rjs_spec.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 ยป

Ruby on Rails CRM platform for Web 2.0 and beyond