{"shas":[["185c8b3d5e1202e599656a78c61372c2f85edf8e","051973412585d608886bf5f07e7c135439c72a59@googlemail.com","Added after initialize stuff to set locale back to the default locale after some @#$%$% gem seems to be setting it to english","Matt Beedle"],["dc52ca5b9f76d5a315b5c49e63ead3e08649c332","051973412585d608886bf5f07e7c135439c72a59@googlemail.com","DE locale file","Matt Beedle"],["a1ad03230c8c9caf24cd985c71b184938a090a06","fa058af18af82151e7ab44c8416473c332a45857@gmail.com","Revert \"Added caching for lead counts on leads index page\"\n\nThis reverts commit d4f50f325575db4bb9d2dd3cc05083bae85cd46b.\n\nConflicts:\n\n\tapp/views/leads/index.html.haml","Bernerd Schaefer"],["40619a06ca1a24a08dc456cbc4ed14e6f76404bd","fa058af18af82151e7ab44c8416473c332a45857@gmail.com","Update unit tests to pass with i18n","Bernerd Schaefer"],["f3c8896a8303204c8c38471e9bebeffaf3a53937","fa058af18af82151e7ab44c8416473c332a45857@gmail.com","Only refresh permissions if user's role changes","Bernerd Schaefer"],["6679a9fb47dd5948f796344feb982bb0e1c9759b","fa058af18af82151e7ab44c8416473c332a45857@gmail.com","Merge branch 'campaigns' into dm-head-fixes\n\n* campaigns:\n  Upgrade campaigns to datamapper\n  Added a couple of missing tests, more to go though\n  User views list of campaigns with objectives\n  User creates campaign with objectives\n  User deletes campaign\n  User adds and views comments on campaign\n  User creates and views tasks for campaign\n  User creates leads for campaign\n  Cleanup\n  User views leads for campaign\n  User selects campaign for lead\n  Remove extra empty box from campaigns page\n  User views campaign events in activity lists\n  User edits campaign\n  User views campaign\n  User creates and views list of campaigns\n\nConflicts:\n\tconfig/locales/de.yml","Bernerd Schaefer"],["988505539f97044eb198bd26e12f4d9830907424","fa058af18af82151e7ab44c8416473c332a45857@gmail.com","Use :en locale for cucumber","Bernerd Schaefer"],["11fac501c08f1dabef3f2de8115cd38a4e680499","fa058af18af82151e7ab44c8416473c332a45857@gmail.com","Merge branch 'imports' into dm-head-fixes\n\n* imports: (64 commits)\n  Paginate results for Sunspot in testing\n  Fix failing test for lead#promote!\n  Down to 1 test and 2 cucumber failures\n  Getting closer to passing tests/cucumber\n  Title translations\n  Gem update\n  Gem update\n  Added company size field to leads\n  No viewed activies on dashboard in german version\n  Added staging settings to deploy file\n  Staging has correct gridfs settings\n  Staging database\n  Added some sorting to the opportunities\n  Activities are also created when locale is 'de' now\n  When converting a lead, if you enter an invalid opportunity now, then nothing is saved. If however you do not fill in any opportunity fields, then the conversion works fine, and no opportunity is created\n  Removed unused controller\n  Fix to stop people adding strings instead of numbers for opportunity amounts. Also, added fixes for leads page when in de locale\n  Search now has pagination, and also removed unused 'company' field. Also, lead imports may now specify which source to use, and finally removed account.name indexing on the contacts solr stuff because when contact account was blank everything exploded\n  Some additional translation keys\n  Fix for online_fields module\n  ...\n\nConflicts:\n\tGemfile\n\tGemfile.lock\n\tapp/helpers/tasks_helper.rb\n\tapp/models/contact.rb\n\tconfig/deploy.rb","Bernerd Schaefer"],["a4f6514356ce74411035002f8b7c90310884711e","fa058af18af82151e7ab44c8416473c332a45857@gmail.com","Merge remote branch 'origin/master' into dm-head-fixes\n\n* origin/master: (27 commits)\n  Set locale to de in production environment\n  Adding in sqlite3 gem to Gemfile\n  Fix to get test suite passing without having to start solr process\n  Gem update\n  Fixed lead comments bug, where converted at was always the date of the last activity for that lead\n  Fixed bug on comments where lead conversion time was always the last activity created_at\n  Removing index on account\n  Finishing touches of hot deploys\n  Updating config to read old pid properly\n  Use current path for bundler\n  Updaing restart task for cap\n  Updating unicorn for hot deploys\n  Updating unicorn config for hot deploys\n  Something needs sqlite in prod\n  Adding unicorn to gemfile\n  Updating rvmrc\n  Cleaning up Gemfile\n  Updating deploy tasks\n  Use dm-head-fixes, not dm-for-speed\n  Updating multi-stage cap scripts\n  ...\n\nConflicts:\n\tGemfile\n\tGemfile.lock\n\tconfig/deploy.rb\n\tconfig/deploy/production.rb\n\tconfig/deploy/staging.rb\n\tconfig/environments/production.rb\n\tconfig/unicorn.rb\n\ttest/test_helper.rb","Bernerd Schaefer"],["5178c4cb75b9a646c283965eb20dcbb615bf03d7","fa058af18af82151e7ab44c8416473c332a45857@gmail.com","Ensure has_constant values are in english","Bernerd Schaefer"],["e938b49ba6db669dbe42da52b979ccbab67830ca","051973412585d608886bf5f07e7c135439c72a59@googlemail.com","default locale is 'en', except for in production","Matt Beedle"],["9801a472e0e093ba0c91705eeea820693baa73c3","051973412585d608886bf5f07e7c135439c72a59@googlemail.com","Revert \"Ensure has_constant values are in english\"\n\nThis reverts commit 5178c4cb75b9a646c283965eb20dcbb615bf03d7.","Matt Beedle"],["053661c9196e996ba8ff61701c5715af88b72319","051973412585d608886bf5f07e7c135439c72a59@googlemail.com","Fixed due_at= problem with tasks since moving to datamapper (datamapper does #utc automatically)","Matt Beedle"],["78ee3464a50f0fb5c4fc805febf1f83ffd5cd27f","051973412585d608886bf5f07e7c135439c72a59@googlemail.com","Cucumber dependency issues, went back to old Gemfile.lock","Matt Beedle"],["ac3033ce1e324b19420c4a2975b61d3a76af1b12","fa058af18af82151e7ab44c8416473c332a45857@gmail.com","Enable cache sweepers","Bernerd Schaefer"],["4bab5043af0d9e224b0d89b0b26907b83b906138","051973412585d608886bf5f07e7c135439c72a59@googlemail.com","Removed some more UTC stuff from task model","Matt Beedle"],["bdcb6c44ea4539cb78b22ae57e950a231d27653a","051973412585d608886bf5f07e7c135439c72a59@googlemail.com","Sorted assignee dropdown in leads form","Matt Beedle"],["e4ae11eb3de1a370f7d05a63629609425c0f3a27","051973412585d608886bf5f07e7c135439c72a59@googlemail.com","Merge branch 'dm-head-fixes' of github.com:HRNewMedia/SalesFlip into dm-head-fixes","Matt Beedle"],["3c3fdc0fcdecdf65f2bbf0daad6f0bc6eed7dfcc","051973412585d608886bf5f07e7c135439c72a59@googlemail.com","Fix for remaining 2 failing task tests","Matt Beedle"],["3b8dcfa7d336487f86f68a6d25f8a71a4c068688","fa058af18af82151e7ab44c8416473c332a45857@gmail.com","Update unicorn dependency","Bernerd Schaefer"]],"repo":"HRNewMedia/SalesFlip","actor":"mattbeedle","ref":"refs/heads/master","size":36,"head":"8e9b3b54ef3c4344c8e947793022a296858439f1","actor_gravatar":"efea8c8cec85985403bae64bef84e7a3","push_id":24808227}