Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
1053 commits 22 branches 1 tag 31 MiB
Commit graph

1053 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benjamin Meichsner
5681553ca0 Avoid connecting to redis backend in test environment. 
This makes it also possible to test if certain background task are doing what they should do.
 2013-09-18 18:04:40 +02:00
Benjamin Meichsner
b015ceea0b Merge branch 'warn-uncheck-ordered-article' of https://github.com/foodcoop-rostock/foodsoft into foodcoop-rostock-warn-uncheck-ordered-article 2013-09-18 17:50:30 +02:00
Benjamin Meichsner
5444c3a1c0 Merged updates from localeapp. 2013-09-18 17:48:24 +02:00
Benjamin Meichsner
857eb64a45 Merge pull request #173 from foodcoop-adam/keep-member-order-on-orderarticle-deletion 
Keep member order on orderarticle deletion
 2013-09-18 08:32:33 -07:00
Benjamin Meichsner
6a1f7d279a Merge branch 'master' of github.com:foodcoops/foodsoft 2013-09-18 17:29:03 +02:00
Benjamin Meichsner
7e659e2374 Merge branch 'order-display-improvements' of https://github.com/foodcoop-adam/foodsoft into foodcoop-adam-order-display-improvements 2013-09-18 17:16:04 +02:00
wvengen
5f9b144c53 Merge pull request #176 from fsmanuel/master 
uses FactoryGirl helpers
 2013-09-18 08:16:02 -07:00
Benjamin Meichsner
c597d70596 Merge branch 'master' of github.com:foodcoops/foodsoft 2013-09-18 15:19:04 +02:00
Benjamin Meichsner
b515d5b2e8 Fixed whenever cron config. 2013-09-18 14:52:23 +02:00
Manuel Wiedenmann
f462e70e49 uses FactoryGirl helpers 2013-09-18 12:44:41 +02:00
Robert Waltemath
142de28ade Split up messages for stock/ supplier orders. 2013-09-18 10:50:56 +02:00
Robert Waltemath
dbb0bb4506 Added hint when changing total delivered amount. 2013-09-18 10:07:50 +02:00
Robert Waltemath
e728e76729 Merge branch 'master' into warn-uncheck-ordered-article 2013-09-17 17:10:56 +02:00
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
f224735718 remember what member ordered when deleted in balancing screen 2013-09-17 14:19:46 +02:00
wvengen
b11706f30a sort ordergroups in order screen and pdfs 2013-09-17 00:25:38 +02:00
wvengen
8ca95f396f make both ordered and received products visible in order screens and pdfs 2013-09-16 23:52:58 +02:00
wvengen
1bb257c41b remember member order when order article is deleted + test 2013-09-13 15:37:30 +02: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
Robert Waltemath
805071f3fb Added checkbox to ignore warnings. Added translations. 2013-09-04 10:52:14 +02:00
Robert Waltemath
bb25bdc6eb Improved error data passing. 2013-09-03 17:37:49 +02:00
Robert Waltemath
1c9fad0a7b Added validation for removed but ordered articles. 2013-09-03 12:09:33 +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