Commit Graph

982 Commits

Author SHA1 Message Date
wvengen 1cf2145ff6 version update for security (now properly) (see also resque/redis-namespace#64) 2013-09-17 15:02:58 +02:00
wvengen e6320e5b7b add resque version for security 2013-09-17 14:49:19 +02:00
wvengen 6d4aa5ed40 Merge pull request #163 from foodcoop-rostock/order-tasks-alphabetically
Order tasks with same date by name.
2013-09-17 05:45:13 -07:00
wvengen ee31c0c2af localeapp roundtrip 2013-09-10 12:06:40 +02:00
wvengen b235592656 add total to order pdf, layout changes (closes foodcoops/foodsoft#138) 2013-09-10 11:59:32 +02:00
wvengen 39b3dee050 do not show empty fields on fax pdf (closes foodcoops/foodsoft#108) 2013-09-10 11:59:32 +02:00
wvengen e20898c5ee Merge branch 'tests-rspec' into master-spec 2013-09-10 11:37:05 +02:00
wvengen 6418790ef5 localeapp roundtrip, with updated translations 2013-09-10 10:46:02 +02:00
wvengen 12c0636941 fix i18n buglets (closes #167) 2013-09-10 10:27:13 +02:00
wvengen 707f487128 update spec gems to make tests work again 2013-09-07 01:34:34 +02:00
wvengen 7de57715f2 Merge branch 'master' into tests-rspec
Conflicts:
	Gemfile
2013-09-07 01:11:24 +02:00
wvengen 9922c0322a first version of new translation: French 2013-09-06 19:41:24 +02:00
wvengen bdd0f8cbcb fix heroku deploy script (also closes #165) 2013-09-06 19:31:15 +02:00
Benjamin Meichsner a0760ebfdb Fixed delivering emails to users.
There was a bug in User#receive_email? Return values are now true or false, not '1' or '0'.
2013-09-06 11:40:40 +02:00
Robert Waltemath 9f22615a25 Order tasks with same date by name. 2013-09-05 10:16:57 +02:00
Benjamin Meichsner 3792069fda Fxed encoding error when uploading files with non-ascii characters. 2013-09-02 16:46:44 +02:00
Benjamin Meichsner bf1c2b5ed2 Handle missing due_date in weekly tasks migration. 2013-09-02 15:42:03 +02:00
Benjamin Meichsner 5883bf50f3 Removed rails3 branch and updated Readme. 2013-09-02 14:41:16 +02:00
Benjamin Meichsner a1d85d0dd7 Changed API of multicoops rake tasks. Use TASK=sample:task
Fixed running rake task without multicoops wrapper.
2013-09-02 14:19:44 +02:00
Benjamin Meichsner 51a91f376d Updated locales from localeapp. 2013-09-02 13:34:30 +02:00
Benjamin Meichsner 27c006443f (git)Ignore localeapp config. 2013-09-02 13:33:25 +02:00
Benjamin Meichsner 71e02ab569 Merge branch 'rails3' into rails3-to-master
Conflicts:
	app/views/suppliers/shared_suppliers.haml
2013-09-02 13:31:40 +02:00
Benjamin Meichsner c7cdcf2b82 Allow setting default locale in user settings migration.
Use DEFAULT_LOCALE=de to have german enabled for all users.
2013-09-02 10:42:05 +02:00
Benjamin Meichsner 4ea940e4a3 Removed unused acts_as_configurable gem. 2013-09-02 10:03:12 +02:00
wvengen 37e5b0c25c add balancing integration spec 2013-07-26 18:34:03 +02:00
wvengen eac8260b38 add i18n tests 2013-07-25 14:46:25 +02:00
wvengen ca50006235 add coverage report, set COVERAGE=1 in env when running specs 2013-07-25 14:00:08 +02:00
wvengen 7c65995b62 add travis to README [ci skip] 2013-07-25 13:31:59 +02:00
wvengen 0f01b87e3b do not exceed 99 articles when ordering in specs 2013-07-25 13:21:24 +02:00
wvengen 50f5064d8e fix product distribution integration test 2013-07-25 13:08:38 +02:00
wvengen 7dafcf714a spec move functionality into factory 2013-07-25 11:16:39 +02:00
wvengen b302cbde4f make sure price spec works when price is zero 2013-07-25 09:42:29 +02:00
wvengen e9ed6f8c0f Revert "try to fix integration spec on travis"
This reverts commit 06d39f52ca.
2013-07-25 01:25:08 +02:00
wvengen c753ae0471 comment tests that are unclear how they should behave 2013-07-25 01:07:41 +02:00
wvengen 9a12ea9efc fix uniquess spec problems 2013-07-25 00:52:41 +02:00
wvengen 06d39f52ca try to fix integration spec on travis 2013-07-25 00:35:42 +02:00
wvengen 1e986e704a remove spec test that is broken and not really useful 2013-07-25 00:07:39 +02:00
wvengen ebf71ad494 fix price history spec 2013-07-25 00:01:58 +02:00
wvengen d602b7cd0d use expect instead of should in specs 2013-07-24 22:48:48 +02:00
wvengen 0be3955cd7 Revert "cleaner way to set foodcoop scope"
This reverts commit 23a08b2ac8.

Conflicts:
	spec/spec_helper.rb
2013-07-24 22:06:53 +02:00
wvengen f0c831ccd9 initialize database on travis 2013-07-24 21:57:17 +02:00
wvengen 63a0c0cff6 travis create database before running tests 2013-07-24 21:47:27 +02:00
wvengen 71d25c5ebb travis.yml fix 2013-07-24 21:40:36 +02:00
wvengen c1147306be fix travis.yml 2013-07-24 21:28:42 +02:00
wvengen a6114f137b add order integration spec 2013-07-24 21:25:57 +02:00
wvengen bb20e9abea Merge branch 'master' into tests-rspec
Conflicts:
	Gemfile
	Gemfile.lock
2013-07-24 21:25:36 +02:00
wvengen 23a08b2ac8 cleaner way to set foodcoop scope 2013-07-24 20:44:07 +02:00
wvengen 6da2fdee6d add travis-ci configuration 2013-07-24 13:21:52 +02:00
wvengen 62682b7e64 make integration test work 2013-07-24 12:37:20 +02:00
wvengen 8af04e0112 add product distribution integration test 2013-07-24 04:04:59 +02:00