Commit graph

1467 commits

Author SHA1 Message Date
wvengen
d299fa4870 move receive screen to orders 2013-12-18 21:08:58 +01:00
wvengen
94b4454a1b add receive to order screen, and distinguish between finished and closed orders to put it in nicely 2013-12-18 19:21:39 +01:00
wvengen
1ab09b41bd fix articles_for_select2 helper 2013-12-18 17:34:45 +01:00
wvengen
2b511ee559 Merge branch 'master' into fresh-flow
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
2013-12-18 17:03:26 +01:00
wvengen
a0c6cf8afe fix warning without text 2013-12-18 16:04:30 +01:00
wvengen
b4dfa50409 bundle update 2013-12-18 11:10:00 +01:00
wvengen
64040d6bb9 make some dependencies optional to decrease startup-time 2013-12-17 23:03:48 +01:00
wvengen
a02ca1b9c0 localeapp roundtrip [ci skip] 2013-12-17 18:54:05 +01:00
wvengen
9b27ce29e9 fix BigDecimal to_s monkey-patch (complements 0052d4af1a4cc397c4248a7049a52e35ce33cec1) 2013-12-17 18:02:11 +01:00
wvengen
be76f29473 do not show ".0" even for floats 2013-12-17 18:02:04 +01:00
wvengen
f47413a60f Merge pull request #220 from wvengen/feature-i18n-cleanup
Some more i18n cleanup
2013-12-17 07:20:01 -08:00
wvengen
94b2c8eac3 Merge remote-tracking branch 'foodcoops/master' into feature-i18n-cleanup
Conflicts:
	app/views/deliveries/_stock_article_form.html.haml
	config/locales/de.yml
	config/locales/en.yml
2013-12-17 15:58:47 +01:00
wvengen
b26b124b0c Merge pull request #211 from foodcoop-adam/group_order-cleanup
make order result calculation a bit cleaner
2013-12-17 06:29:15 -08:00
wvengen
c5b1236f21 Merge pull request #218 from foodcoop-adam/article-dialog
Edit article user-interface update
2013-12-17 06:29:04 -08:00
wvengen
5af82eb55c Merge pull request #219 from foodcoop-rostock/publish-subscribe-from-scratch
Publish/subscribe pattern for DOM updates after AJAX database manipulation
2013-12-17 06:28:25 -08:00
wvengen
147365cba1 update coverage and use coveralls.io 2013-12-16 23:11:39 +01:00
wvengen
18c946eab1 add note about release version to setup documentation 2013-12-16 18:13:30 +01:00
wvengen
1e7b1a43c8 Bumped new version: 3.2.0 2013-12-16 11:30:54 +01:00
wvengen
c72ed20c90 add CHANGELOG [ci skip] 2013-12-16 11:29:23 +01:00
wvengen
a91c97526e complete German translations (thanks @fsmanuel) [ci skip] 2013-12-16 10:55:45 +01:00
wvengen
452db61af8 i18n fix (thanks @JuliusR) 2013-12-14 23:52:59 +01:00
Julius
9b92d6ff10 Mark two i18n issues 2013-12-14 14:48:58 +01:00
wvengen
11a2b865aa localeapp roundtrip 2013-12-14 13:35:52 +01:00
wvengen
142e8a0473 i18n fixes 2013-12-14 13:34:58 +01:00
wvengen
4e54388b83 Merge remote-tracking branch 'foodcoop-rostock/question-form-i18n' into feature-i18n-cleanup 2013-12-14 13:20:03 +01:00
wvengen
46ab4dcc01 proper i18n of last ordergroup order (thanks @JuliusR) 2013-12-14 13:15:47 +01:00
wvengen
d67a0083f1 fix price hint escaping (thanks @JuliusR) 2013-12-14 13:15:16 +01:00
Julius
40e9e82295 Mark two i18n issues 2013-12-14 10:03:32 +01:00
wvengen
2b6a84ddf8 localeapp roundtrip 2013-12-12 00:33:35 +01:00
wvengen
d448707b1a i18n cleanup (affects foodcoops#137) 2013-12-12 00:13:19 +01:00
wvengen
b53cb36714 give proper block to link_to_ordering (closes #201) 2013-12-11 22:58:50 +01:00
wvengen
e25570d870 Merge remote-tracking branch 'tg-x/master'
Conflicts:
	app/views/shared/_open_orders.html.haml
2013-12-11 22:39:37 +01:00
tg(x)
e7de772e2b Merge pull request #1 from wvengen/feature-link_to_group_order
small link_to_ordering refactoring
2013-12-11 03:02:01 -08:00
wvengen
3f497e9274 allow more than two columns in horizontal form 2013-12-10 23:41:45 +01:00
wvengen
675f0e6d16 fix workgroup link task list 2013-12-10 19:12:29 +01:00
wvengen
6bbc614e42 localeapp roundtrip (closes foodcoops#156) 2013-12-10 18:03:50 +01:00
wvengen
e42e27957d improve task i18n (affects foodcoops#137) 2013-12-10 17:58:32 +01:00
wvengen
da737793e8 workaround help block margin issue [ci skip] 2013-12-10 16:50:04 +01:00
wvengen
85b6ff908b make new article dialog more responsive 2013-12-10 16:41:26 +01:00
wvengen
58de1a231b update price during editing as well 2013-12-10 13:30:15 +01:00
Julius
30b35cdd11 Improve usability of supplier selection for stock_articles in delivery form 2013-12-09 00:03:07 +01:00
Julius
7eb64e3c9d Update locales 2013-12-07 17:58:06 +01:00
Julius
7a673b1a8b Move stock_article locales from delivery to stock_article 2013-12-07 17:48:04 +01:00
Julius
047a3f63c1 Finally fix markdown formating issue in publish_subscribe.md 2013-12-07 17:29:44 +01:00
Julius
38cbd47a2f Fix markdown formating issue in publish_subscribe.md 2013-12-07 17:27:45 +01:00
Julius
0f141cb709 Try to fix markdown formating issue in publish_subscribe.md 2013-12-07 17:14:30 +01:00
Julius
cdb87a8389 Highlight created/updated stock_article in StockArticle#index view 2013-12-07 17:10:40 +01:00
Julius
012327dd7c Slightly cleanup delivery form 2013-12-07 16:57:53 +01:00
Julius
92f560e189 Again revert wrong quotation mark in English locale 2013-12-07 16:46:16 +01:00
Julius
3e49104318 Revert wrong quotation mark in English locale 2013-12-07 16:44:16 +01:00