Commit graph

1467 commits

Author SHA1 Message Date
wvengen
a9dff7f1df add missing i18n 2013-10-04 10:25:53 +02:00
Julius
ac1341d5b0 Merge branch 'master' of http://github.com/foodcoops/foodsoft into article-price-tooltip 2013-10-03 23:22:31 +02:00
Julius
9a9a782bc4 Complete StockArticle#show view 2013-10-03 23:21:53 +02:00
Julius
fef8c6d99f Move StockArticle#history to StockArticle#show 2013-10-03 22:24:21 +02:00
Julius
a3e82f5304 Add article price tooltip to StockTaking form 2013-10-03 22:14:41 +02:00
Julius
3f822dc396 Revert "Fix migrate problem caused by output formating(?)"
This reverts commit 53f24cd885.
2013-10-03 22:03:14 +02:00
Julius
26e207aeb1 Reuse some list.js standard template functions (thanks to wvengen https://gist.github.com/wvengen/6784056) 2013-10-03 16:10:18 +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
Julius
dd54cdce7a Merge branch 'master' of http://github.com/foodcoops/foodsoft 2013-10-03 10:47:05 +02:00
wvengen
1870276cd2 show user name with use_nick is false 2013-10-02 23:43:09 +02:00
wvengen
1946cd1ab3 make user creation possible again 2013-10-02 23:33:24 +02:00
wvengen
bc5795b052 small model change 2013-10-02 23:29:21 +02:00
wvengen
75e858db71 bundle update 2013-10-02 22:55:14 +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
Julius
53f24cd885 Fix migrate problem caused by output formating(?) 2013-09-25 21:22:34 +02:00
Julius
c1ac95e440 list.unlist.js: Use jQuery's toggleClass instead of native if-else (just for briefness) 2013-09-25 20:58:53 +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
Julius
a87ced2646 Hide article category if no article matches the search 2013-09-24 21:21:08 +02:00
Julius
9f083dd4d0 Add button to clear article search (list.js customization) 2013-09-23 21:31:54 +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
Julius
3c8f56b24f Add dismiss button to sidebars in group_order form (idea stolen from foodcoops#143) 2013-09-22 22:07:34 +02:00
Julius
6ec81ace18 Always show article category headers (do not unlist them on list.js search) 2013-09-22 22:04:29 +02:00
Julius
891293af84 Add delay to list.js search 2013-09-22 21:50:59 +02:00
wvengen
ea3db22306 user display changes in model and mailer 2013-09-22 14:38:56 +02:00
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