wvengen
|
f6c2fd9a9d
|
more user display changes
|
2013-09-22 02:15:35 +02:00 |
|
wvengen
|
6d3db7636a
|
make search work without nickname usage
|
2013-09-20 23:18:06 +02:00 |
|
wvengen
|
17c1ee803f
|
fix typo breaking invitation
|
2013-09-20 23:15:44 +02:00 |
|
wvengen
|
e4f0a1e3ed
|
start of making nickname optional
|
2013-09-20 22:40:13 +02:00 |
|
wvengen
|
a77c3b59b1
|
allow to login with email instead of nick as well + tests
|
2013-09-20 22:39:19 +02:00 |
|
wvengen
|
fa99a0a852
|
add bitdeli badge
|
2013-09-20 18:24:40 +02:00 |
|
Benjamin Meichsner
|
2060261c89
|
Merge pull request #144 from foodcoop-adam/fix-closed-group_order-totals
fix closed group_order totals
|
2013-09-19 03:14:40 -07:00 |
|
wvengen
|
2008bb75bf
|
update travis badge after tests merge [ci skip]
|
2013-09-18 23:35:01 +02:00 |
|
Julius
|
14d4d2f12d
|
Add list.js for filtering articles (another try for foodcoops#143)
|
2013-09-18 23:28:18 +02:00 |
|
wvengen
|
c7f28a3b5c
|
use plain Ruby memoization to fix deprecation (closes #121)
|
2013-09-18 22:46:58 +02:00 |
|
wvengen
|
6b0146eb95
|
add spec for article#in_open_order
|
2013-09-18 22:46:57 +02:00 |
|
wvengen
|
50a8cce9fd
|
do not update localeapp from translation instance, since it may run a slightly older version [ci skip]
|
2013-09-18 19:21:59 +02:00 |
|
wvengen
|
f1f7e8d709
|
localeapp roundtrip
|
2013-09-18 19:14:48 +02:00 |
|
wvengen
|
2d549fc1da
|
do not recalculate GroupOrder totals, but show message to do so on migrations
|
2013-09-18 18:33:49 +02:00 |
|
Benjamin Meichsner
|
84daaf1b6c
|
Merge branch 'production'
|
2013-09-18 18:30:15 +02:00 |
|
Benjamin Meichsner
|
4c27a98e06
|
Fixed failing asset precompiling in production mode.
|
2013-09-18 18:19:41 +02:00 |
|
wvengen
|
ebb22ccb53
|
Merge branch 'master' into fix-closed-group_order-totals
Conflicts:
db/schema.rb
|
2013-09-18 18:14:07 +02:00 |
|
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 |
|
wvengen
|
19a61a6c42
|
update gems
|
2013-09-18 16:53:49 +02: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 |
|
wvengen
|
0abb63279f
|
Merge branch 'master' into updated-gems
Conflicts:
Gemfile.lock
|
2013-09-18 13:00:26 +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 |
|