wvengen
|
6c17c17982
|
i18n simple_form move of fax pdf
|
2013-10-09 23:41:15 +02:00 |
|
wvengen
|
67e29620f4
|
i18n simple_form move of invoices
|
2013-10-09 23:37:08 +02:00 |
|
wvengen
|
6ba971fe15
|
i18n simple_form move of deliveries
|
2013-10-09 23:19:40 +02:00 |
|
wvengen
|
c3d22e883d
|
i18n simple_form move of suppliers
|
2013-10-09 23:12:26 +02:00 |
|
wvengen
|
78c81b194c
|
i18n simple_form move of foodcoop
|
2013-10-09 23:00:07 +02:00 |
|
wvengen
|
552af7925d
|
i18n simple_form move of tasks
|
2013-10-09 22:41:23 +02:00 |
|
wvengen
|
762292ef8e
|
small i18n move
|
2013-10-09 22:29:19 +02:00 |
|
wvengen
|
dce92b9d7c
|
i18n ordering javascript
|
2013-10-04 15:01:24 +02:00 |
|
wvengen
|
64a597c689
|
use i18n-js
|
2013-10-04 15:01:10 +02:00 |
|
wvengen
|
a9dff7f1df
|
add missing i18n
|
2013-10-04 10:25:53 +02:00 |
|
wvengen
|
bbcad49831
|
start moving from simple_form i18n to activerecord
|
2013-10-03 16:03:13 +02:00 |
|
wvengen
|
1674dcf851
|
fix i18n of article sync
|
2013-10-03 14:36:53 +02:00 |
|
wvengen
|
3574f239c6
|
localeapp roundtrip
|
2013-10-02 17:33:37 +02:00 |
|
wvengen
|
17bbb0705b
|
fix i18n
|
2013-10-02 17:23:49 +02:00 |
|
wvengen
|
a8ace3bc79
|
add missing i18n
|
2013-10-02 17:13:49 +02:00 |
|
wvengen
|
1d8fefcfb7
|
small i18n update
|
2013-10-02 17:08:24 +02:00 |
|
wvengen
|
6cfaa4979a
|
show lines with zero units but with member orders in balancing screen (closes foodcoops/foodsoft#179)
|
2013-10-02 16:32:29 +02:00 |
|
wvengen
|
9ac9d1ea50
|
add spec for foodcoops/foodsoft#179
|
2013-10-02 16:32:01 +02:00 |
|
wvengen
|
0bb62332c0
|
localeapp roundtrip
|
2013-10-01 00:05:46 +02:00 |
|
Julius
|
d36f2dd4ac
|
Fix minor delivery bug
|
2013-09-30 11:04:55 +02:00 |
|
wvengen
|
6632f5ed75
|
workaround migration bug introduced by 975bcdec3a
|
2013-09-30 11:01:15 +02:00 |
|
Benjamin Meichsner
|
817d61491e
|
Merge branch 'master' of github.com:foodcoops/foodsoft
|
2013-09-25 11:58:53 +02:00 |
|
Benjamin Meichsner
|
975bcdec3a
|
Avoid send messages so STDOUT in rake silen mode.
|
2013-09-25 11:57:22 +02:00 |
|
wvengen
|
77fbf3ca81
|
Merge pull request #175 from foodcoop-rostock/fix-balancing
Added hint when changing total delivered amount.
|
2013-09-23 02:14:50 -07: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 |
|
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 |
|
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 |
|