Commit graph

Select branches

Hide pull requests

1008-ideal-integration-online-payment-provider

11_bnn_import_article_update

11_include_kilo_litre_price

12_generate_custom_csv_file

12_nkn_file_plugin

20_favourites

37_display_kilo_price

52_messages_tests

56_add_update_of_article_category_to_file_import

8_increase_test_coverage_controllers

8_increase_test_coverage_controllers_home

automatic_group_order_invoice

automatic_group_order_invoice_generation_merge

automatic_group_order_invoice_plugin

demo

demo-merge-article-category

develop

master

online-payment-mollie

tantewandel

uxui_group_order

x_11_file_import_via_plugin

#26

#33

#35

#36

#38

#39

#41

#50

#54

#55

#57

#58

#65

2023-10-20

Mono Color

• cf1e68f11d Allow to edit OrderArticle in Order#receive form Julius 2013-12-30 14:34:26 +01:00
• 81dfe8110c Apply publish/subscribe for OrderArticle#update Julius 2013-12-30 13:09:49 +01:00
• 27a73be68f Merge remote-tracking branch 'foodcoops/master' into feature-receive wvengen 2014-01-02 18:57:59 +01:00
• 428678fe49 Merge pull request #238 from foodcoop-rostock/fix-order-link-from-invoice-form wvengen 2014-01-02 07:43:28 -08:00
• 3819fa012e Offer _undeleted_ StockArticles for new OrderArticle only Julius 2013-12-31 12:35:30 +01:00
• 9bed751d28 Merge pull request #239 from foodcoop-rostock/add-article-price-locales wvengen 2013-12-31 01:48:44 -08:00
• 3336065218 Add missing translations for ArticlePrice attributes Julius 2013-12-30 12:38:26 +01:00
• b22677eced Change order link from invoice form to avoid access problems Julius 2013-12-30 11:26:10 +01:00
• 4f80fd0e8c Merge pull request #231 from wvengen/feature-autocomplete-fixes-2 wvengen 2013-12-30 02:03:48 -08:00
• 19f583381d Merge pull request #232 from wvengen/feature-remove_unused_redirect_to wvengen 2013-12-30 01:46:28 -08:00
• 1c03aade53 Merge pull request #235 from foodcoop-rostock/fix-derive-title wvengen 2013-12-30 01:39:44 -08:00
• f3c3b7af34 Fix StockArticle#derive title i18n Julius 2013-12-28 20:07:28 +01:00
• 699be6a6d9 introduce new layout in balancing article screen as well wvengen 2013-12-23 16:11:14 +01:00
• f5bd7a43e4 update balancing order article edit screen to support received units wvengen 2013-12-23 15:25:45 +01:00
• 03bb83ecc0 show different warning signs for mismatch with ordered and received wvengen 2013-12-23 12:32:26 +01:00
• 5d8f71f834 move javascript a little wvengen 2013-12-23 11:50:57 +01:00
• 45ad8e6524 move helper to new module wvengen 2013-12-23 11:48:06 +01:00
• 0a6e0ab514 Merge pull request #1 from foodcoop-rostock/feature-store-new-password wvengen 2013-12-23 01:54:50 -08:00
• d7f624a089 Merge pull request #230 from foodcoop-rostock/workaround-possible-wikicloth-bug wvengen 2013-12-23 01:51:27 -08:00
• 3bf1392251 Show clearer error message on WikiCloth exception Julius 2013-12-22 23:34:54 +01:00
• ed228c4bd7 Allow control of password autocomplete by flag Julius 2013-12-22 23:21:14 +01:00
• d071c5bba8 fix user search wvengen 2013-12-22 23:21:02 +01:00
• 53e611c1c0 Allow browser to store new password after change Julius 2013-12-22 18:26:28 +01:00
• 42e983f7ee Move html markup of WikiCloth exception from locales to controller Julius 2013-12-22 18:09:40 +01:00
• 7ef6832ab3 fix invite authentication wvengen 2013-12-22 14:20:25 +01:00
• cee96915f9 remove unused redirect_to functionality wvengen 2013-12-22 13:58:49 +01:00
• 3e1d561a5e fix user form field order and autocompletion wvengen 2013-12-22 13:28:33 +01:00
• 496a250495 Rescue on WikiCloth exception Julius 2013-12-22 12:17:02 +01:00
• df9cff0eee Do not escape mailing list wiki link in the message form (foodcoops#227) wvengen 2013-12-22 01:59:33 +01:00
• 537ac52f4e Merge pull request #227 from foodcoop-rostock/fix-escape-new-message-hint wvengen 2013-12-21 16:14:20 -08:00
• 3099e740ca Do not escape mailing list links in message form Julius 2013-12-21 22:52:39 +01:00
• a28c6031a4 fix receive exception when input is set to nil wvengen 2013-12-21 17:39:20 +01:00
• 41ea9ed66e hide receive screen for stock orders wvengen 2013-12-21 17:36:25 +01:00
• aa6041d337 show all articles in receive screen (not just of this order) wvengen 2013-12-21 17:33:06 +01:00
• bb331f99a7 fix units_to_order display [ci skip] wvengen 2013-12-19 00:45:14 +01:00
• 54e98474b1 remove unused helper [ci skip] wvengen 2013-12-18 22:35:01 +01:00
• 68c4affb02 better disabled button wvengen 2013-12-18 22:22:34 +01:00
• 3d511ea2fb only show receive in finance when access to ordering wvengen 2013-12-18 22:19:36 +01:00
• 7f813f2c0f fix order add_article wvengen 2013-12-18 22:16:19 +01:00
• 88f2dad706 language change wvengen 2013-12-18 22:14:52 +01:00
• 84fe791078 update balancing screen wvengen 2013-12-18 22:08:02 +01:00
• 873a1ff108 update texts wvengen 2013-12-18 21:58:15 +01:00
• 4fede30a19 hide invoice columns until implemented wvengen 2013-12-18 21:53:31 +01:00
• 82d1c41e9f update show order wvengen 2013-12-18 21:34:54 +01:00
• d299fa4870 move receive screen to orders wvengen 2013-12-18 21:06:05 +01:00
• 94b4454a1b add receive to order screen, and distinguish between finished and closed orders to put it in nicely wvengen 2013-12-18 19:21:39 +01:00
• 1ab09b41bd fix articles_for_select2 helper wvengen 2013-12-18 17:34:45 +01:00
• 2b511ee559 Merge branch 'master' into fresh-flow wvengen 2013-12-18 17:03:26 +01:00
• a0c6cf8afe fix warning without text wvengen 2013-12-18 16:04:30 +01:00
• b4dfa50409 bundle update wvengen 2013-12-18 11:10:00 +01:00
• 64040d6bb9 make some dependencies optional to decrease startup-time wvengen 2013-12-17 23:03:48 +01:00
• a02ca1b9c0 localeapp roundtrip [ci skip] wvengen 2013-12-17 18:53:59 +01:00
• 9b27ce29e9 fix BigDecimal to_s monkey-patch (complements 0052d4af1a4cc397c4248a7049a52e35ce33cec1) wvengen 2013-12-14 00:46:13 +01:00
• be76f29473 do not show ".0" even for floats wvengen 2013-12-14 00:19:18 +01:00
• f47413a60f Merge pull request #220 from wvengen/feature-i18n-cleanup wvengen 2013-12-17 07:20:01 -08:00
• 94b2c8eac3 Merge remote-tracking branch 'foodcoops/master' into feature-i18n-cleanup wvengen 2013-12-17 15:58:47 +01:00
• b26b124b0c Merge pull request #211 from foodcoop-adam/group_order-cleanup wvengen 2013-12-17 06:29:15 -08:00
• c5b1236f21 Merge pull request #218 from foodcoop-adam/article-dialog wvengen 2013-12-17 06:29:04 -08:00
• 5af82eb55c Merge pull request #219 from foodcoop-rostock/publish-subscribe-from-scratch wvengen 2013-12-17 06:28:25 -08:00
• 147365cba1 update coverage and use coveralls.io wvengen 2013-12-16 23:11:39 +01:00
• 18c946eab1 add note about release version to setup documentation wvengen 2013-12-16 18:13:30 +01:00
• 1e7b1a43c8 Bumped new version: 3.2.0 wvengen 2013-12-16 11:30:54 +01:00
• c72ed20c90 add CHANGELOG [ci skip] wvengen 2013-12-16 11:29:23 +01:00
• a91c97526e complete German translations (thanks @fsmanuel) [ci skip] wvengen 2013-12-16 10:55:32 +01:00
• 452db61af8 i18n fix (thanks @JuliusR) wvengen 2013-12-14 23:52:59 +01:00
• 9b92d6ff10 Mark two i18n issues Julius 2013-12-14 10:03:32 +01:00
• 11a2b865aa localeapp roundtrip wvengen 2013-12-14 13:35:52 +01:00
• 142e8a0473 i18n fixes wvengen 2013-12-14 13:34:58 +01:00
• 4e54388b83 Merge remote-tracking branch 'foodcoop-rostock/question-form-i18n' into feature-i18n-cleanup wvengen 2013-12-14 13:20:03 +01:00
• 46ab4dcc01 proper i18n of last ordergroup order (thanks @JuliusR) wvengen 2013-12-14 13:15:47 +01:00
• d67a0083f1 fix price hint escaping (thanks @JuliusR) wvengen 2013-12-14 13:15:16 +01:00
• 40e9e82295 Mark two i18n issues Julius 2013-12-14 10:03:32 +01:00
• 2b6a84ddf8 localeapp roundtrip wvengen 2013-12-12 00:33:35 +01:00
• d448707b1a i18n cleanup (affects foodcoops#137) wvengen 2013-12-12 00:13:19 +01:00
• b53cb36714 give proper block to link_to_ordering (closes #201) wvengen 2013-12-11 22:58:45 +01:00
• e25570d870 Merge remote-tracking branch 'tg-x/master' wvengen 2013-12-11 22:39:37 +01:00
• e7de772e2b Merge pull request #1 from wvengen/feature-link_to_group_order tg(x) 2013-12-11 03:02:01 -08:00
• 3f497e9274 allow more than two columns in horizontal form wvengen 2013-12-10 23:41:45 +01:00
• 675f0e6d16 fix workgroup link task list wvengen 2013-12-10 19:12:29 +01:00
• 6bbc614e42 localeapp roundtrip (closes foodcoops#156) wvengen 2013-12-10 18:03:50 +01:00
• e42e27957d improve task i18n (affects foodcoops#137) wvengen 2013-12-10 17:58:32 +01:00
• da737793e8 workaround help block margin issue [ci skip] wvengen 2013-12-10 16:48:39 +01:00
• 85b6ff908b make new article dialog more responsive wvengen 2013-12-10 16:41:26 +01:00
• 58de1a231b update price during editing as well wvengen 2013-12-10 13:30:15 +01:00
• 30b35cdd11 Improve usability of supplier selection for stock_articles in delivery form Julius 2013-12-09 00:03:07 +01:00
• 7eb64e3c9d Update locales Julius 2013-12-07 17:58:06 +01:00
• 7a673b1a8b Move stock_article locales from delivery to stock_article Julius 2013-12-07 17:48:04 +01:00
• 047a3f63c1 Finally fix markdown formating issue in publish_subscribe.md Julius 2013-12-07 17:29:44 +01:00
• 38cbd47a2f Fix markdown formating issue in publish_subscribe.md Julius 2013-12-07 17:27:45 +01:00
• 0f141cb709 Try to fix markdown formating issue in publish_subscribe.md Julius 2013-12-07 17:14:30 +01:00
• cdb87a8389 Highlight created/updated stock_article in StockArticle#index view Julius 2013-12-07 17:10:40 +01:00
• 012327dd7c Slightly cleanup delivery form Julius 2013-12-07 16:57:53 +01:00
• 92f560e189 Again revert wrong quotation mark in English locale Julius 2013-12-07 16:46:16 +01:00
• 3e49104318 Revert wrong quotation mark in English locale Julius 2013-12-07 16:44:16 +01:00
• bceabfec5c Apply publish/subscribe pattern to stock_article manipulation in delivery form Julius 2013-12-07 16:42:25 +01:00
• 13bb4e0a8b Rename 'simple_form.hints.stock_article.copy_stock_article' to 'simple_form.hints.stock_article.copy' Julius 2013-12-07 15:12:08 +01:00
• 11117738ce Resolve merge conflicts Julius Rapp 2013-12-07 11:50:37 +01:00
• dd08e277c7 AJAX_ify StockArticle manipulation; Introduce publish/subscribe pattern for DOM updates Julius Rapp 2013-12-07 11:20:03 +01:00
• b05c75aef3 localeapp roundtrip wvengen 2013-12-06 23:12:15 +01:00
• 112fa3be23 fix forgotten i18n string (affects foodcoops#137) wvengen 2013-12-06 23:08:28 +01:00