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

• 6c0de3dc74 Merge remote-tracking branch 'foodcoop-rostock/fix-order-article-update' wvengen 2014-01-20 12:12:00 +0100
• 8b4c292ea0 Merge pull request #222 from wvengen/feature-receive wvengen 2014-01-20 03:02:27 -0800
• 65041c78c5 allow to preselect order view wvengen 2014-01-17 15:03:46 +0100
• 1129cf4094 include comments link wvengen 2014-01-17 14:32:00 +0100
• 5b6d1a66a6 complete show order i18n wvengen 2014-01-17 14:25:06 +0100
• 42d622d1b2 cleanup orders and add search wvengen 2014-01-17 13:14:49 +0100
• cc1ba606c6 update deployment instructions [ci skip] wvengen 2014-01-17 09:49:16 +0100
• d496c452e6 allow to enable/disable plugins in deploy wvengen 2014-01-15 21:41:54 +0100
• 46b36c42bd simplify initial database setup deployment rules wvengen 2014-01-15 21:39:29 +0100
• af3761fcf5 do not run resque verbose by default wvengen 2014-01-15 17:28:20 +0100
• 151f851799 do not require authentication for root redirect wvengen 2014-01-15 16:24:49 +0100
• 4e68d3b7f5 remove dysfunctional deployment hook wvengen 2014-01-15 15:50:36 +0100
• ecb2f2a015 fix root redirect when using suburi wvengen 2014-01-15 15:26:33 +0100
• ca234f0b70 deployment with Capistrano 3 (affects foodcoops#148) wvengen 2014-01-15 13:51:24 +0100
• bab28d2770 i18n update wvengen 2014-01-13 23:21:03 +0100
• b2f032ac8e fix bootstrap menu on mobile [ci skip] wvengen 2014-01-13 14:44:18 +0100
• f0b65bd738 Merge pull request #247 from wvengen/feature-center_rows_vertically wvengen 2014-01-13 03:22:20 -0800
• 8f0e3af2ba Merge pull request #221 from wvengen/feature-fix_float_display wvengen 2014-01-13 03:21:17 -0800
• 8760d87a76 fix receive notice wvengen 2014-01-13 11:48:43 +0100
• 3b2d50b47d make receive delta work when unit_quantity changes wvengen 2014-01-13 11:37:18 +0100
• 45e529b008 revert i18n attributes pluralisation wvengen 2014-01-11 16:30:11 +0100
• cb3e2f7ca0 Merge branch 'master' into feature-receive wvengen 2014-01-11 15:56:33 +0100
• c0dfb88c4e Merge pull request #6 from foodcoop-rostock/feature-receive-en-de wvengen 2014-01-11 06:54:51 -0800
• 9db8cb72df Synchronize German and English locales Julius 2014-01-10 20:50:58 +0100
• 063ec61753 localeapp roundtrip wvengen 2014-01-10 00:00:57 +0100
• b30b424540 Merge branch 'master' into feature-receive wvengen 2014-01-09 18:42:29 +0100
• 0b4cfde1b2 put footer below body, now that is allowed in html5 wvengen 2014-01-09 14:47:05 +0100
• dcb17e04b5 do not show article hint in order view after all, since "old price" is actually the price of the current article, which will probably be different in the future wvengen 2014-01-09 13:24:40 +0100
• 2b97ca050a i18n oops wvengen 2014-01-09 13:22:32 +0100
• bea2706005 fix receive dynamic update (complements 90c81de872) wvengen 2014-01-09 13:19:27 +0100
• 124341c7d6 receive helper and i18n cleanup wvengen 2014-01-09 13:01:10 +0100
• 90c81de872 update receive delta column + responsive css wvengen 2014-01-09 12:17:25 +0100
• 56bd527a8b keep white input background with package class [ci skip] wvengen 2014-01-09 10:51:48 +0100
• 5a7c9b817c fix receive js for document updates [ci skip] wvengen 2014-01-09 10:13:57 +0100
• b331d9a2a9 better css responsiveness [ci skip] wvengen 2014-01-08 19:58:45 +0100
• 65e79d7e1b small receive usability changes wvengen 2014-01-08 19:28:39 +0100
• d1c3c83ed7 use plural in table headings by default wvengen 2014-01-08 18:23:34 +0100
• ffdfa63d86 add coveralls badge to README wvengen 2014-01-08 14:45:10 +0100
• abb3770d08 bundle update wvengen 2014-01-08 14:39:17 +0100
• bdb9499535 fix broken update password flow wvengen 2014-01-08 14:09:01 +0100
• 0e8e93204a Merge pull request #240 from foodcoop-rostock/fix-order-article-helper-undeleted wvengen 2014-01-08 04:42:55 -0800
• ce17bf33e0 complete and improve receive i18n wvengen 2014-01-08 13:39:49 +0100
• 8f14ab31f3 cleanup and expand receive integration test wvengen 2014-01-08 13:07:11 +0100
• 6e60f94484 small receive-related i18n updates wvengen 2014-01-08 12:52:29 +0100
• ccdb1e8add Merge remote-tracking branch 'foodcoop-rostock/feature-receive-i18n' into feature-receive wvengen 2014-01-08 12:35:44 +0100
• d01d1bc496 add integration tests for receive wvengen 2014-01-08 11:52:39 +0100
• dcc3d21b4d center table rows vertically [ci skip] wvengen 2014-01-08 10:31:54 +0100
• 563993fffa Complete I18n of current receive screen Julius 2014-01-08 00:06:25 +0100
• d7c771d10a Continue I18n of receive screen Julius 2014-01-06 23:48:39 +0100
• 69a29b8296 Merge pull request #245 from fsmanuel/rss_feed + 1 wvengen 2014-01-06 13:55:32 +0100
• fe111a1422 require gem in plugin wvengen 2014-01-06 13:54:56 +0100
• dc92de771e Comment on ArticlePrices without Article association Julius 2014-01-04 21:39:11 +0100
• f83f6971e8 Rename update_current_price to update_global_price to avoid confusion Julius 2014-01-04 21:35:19 +0100
• 3c88f572a4 When updating OrderArticle: save ArticlePrice association Julius 2014-01-04 21:22:57 +0100
• 8479678530 Improve unlock button for receiving OrderArticles manually adjusted Julius 2014-01-03 22:26:20 +0100
• a8e604c196 When receiving: hide OrderArticle unit fields also after failed validation Julius 2014-01-04 20:35:31 +0100
• aa57cee96f do not show units fields in receive edit order article screen wvengen 2014-01-03 13:54:02 +0100
• 0d0ff90a64 adds an RSS feed for pages/all Manuel Wiedenmann 2014-01-04 20:12:01 +0100
• e807ff8b38 Merge pull request #244 from foodcoop-rostock/fix-clean-session-on-logout JuliusR 2014-01-03 14:03:35 -0800
• a0f55ba812 Clear return_to URL in session when signing out. Robert Waltemath 2014-01-03 19:42:08 +0100
• 933f4fe67a Merge pull request #243 from foodcoop-rostock/fix-access-denied-cycle wvengen 2014-01-03 06:59:43 -0800
• 2f02f89089 Allow login through link in message (and remember requested page). Robert Waltemath 2014-01-03 15:27:15 +0100
• b800da9b9b use helper in ajax update too wvengen 2014-01-03 14:52:44 +0100
• 7b0d8aa91a Merge pull request #242 from foodcoop-rostock/fix-gitignore-dotbundler wvengen 2014-01-03 05:18:56 -0800
• 436ebc0190 Merge pull request #234 from foodcoop-adam/article-dialog wvengen 2014-01-03 05:16:03 -0800
• 133429720c old price display tweaks wvengen 2014-01-03 14:11:50 +0100
• bf8ef2f45c Ignore bundler config. Robert Waltemath 2014-01-03 13:54:15 +0100
• 03f61668aa Redirect to home page on denied access (fixes #237). Robert Waltemath 2014-01-03 13:51:00 +0100
• 1a5dc3ebe4 consider group_order_article without result not manually changed wvengen 2014-01-03 13:03:28 +0100
• 438de97464 fix non-closed order display wvengen 2014-01-03 13:00:14 +0100
• ebe2966895 fix migration, complements 7aae7f4d55 wvengen 2014-01-03 12:50:49 +0100
• 9219d099c8 ui update for packages display wvengen 2014-01-03 12:42:36 +0100
• 4c9e84ecc6 change layout of receive unlock wvengen 2014-01-03 11:26:39 +0100
• 014a62aa11 use disabled property for input and fix style wvengen 2014-01-03 10:59:42 +0100
• f1ae2724c6 fix unit quantity display after ajax update wvengen 2014-01-03 10:45:15 +0100
• 5ead0fb441 show correct price wvengen 2014-01-03 10:44:57 +0100
• f230d39055 Merge price columns in receive form into one Julius 2014-01-02 21:59:08 +0100
• 0af8a065a1 Fix calculation of OrderArticle.total_price and .total_gross_price Julius 2014-01-02 21:36:45 +0100
• 2ec3d38238 Set readonly property with javascript by .prop instead of .attr Julius 2014-01-02 21:17:55 +0100
• 98f59a3de3 Readonly receive input if GroupOrderArticle result has manually been changed wvengen 2014-01-03 10:33:09 +0100
• 7aae7f4d55 Add result_computed to GroupOrderArticle wvengen 2014-01-03 10:07:03 +0100
• a439f26b67 ui design update wvengen 2014-01-02 22:30:04 +0100
• dd138da1a6 Change comment according to 9d61e2e61569159489098eda1bd6c30d7322ce76 Julius 2014-01-01 23:54:01 +0100
• 8e52fca304 Do not set quantity of newly created OrderArticles to 1 Julius 2014-01-01 23:45:57 +0100
• a384532619 Revert some changes of 20adce8a4e2d32548e7d7016dace250dd3e2eb9b Julius 2014-01-01 16:54:49 +0100
• 033aa90698 Use OrderArticle#create in receive form instead of Order#add_article Julius 2013-12-31 13:46:25 +0100
• 59c118a171 Apply publish/subscribe for OrderArticle#create Julius 2013-12-31 13:25:29 +0100
• 5349ee142e Offer _undeleted_ StockArticles for new OrderArticle only Julius 2013-12-31 12:35:30 +0100
• 01264bc0ac Clean up OrderArticle#new form and related stuff Julius 2013-12-31 12:27:10 +0100
• baa5f16cfc Free order_article resource from finance namespace; also unlock for role_orders Julius 2013-12-31 11:41:14 +0100
• 9ed906f425 Correct haml comment from '#' to '-#' Julius 2013-12-31 09:58:58 +0100
• cf1e68f11d Allow to edit OrderArticle in Order#receive form Julius 2013-12-30 14:34:26 +0100
• 81dfe8110c Apply publish/subscribe for OrderArticle#update Julius 2013-12-30 13:09:49 +0100
• 27a73be68f Merge remote-tracking branch 'foodcoops/master' into feature-receive wvengen 2014-01-02 18:57:59 +0100
• 428678fe49 Merge pull request #238 from foodcoop-rostock/fix-order-link-from-invoice-form wvengen 2014-01-02 07:43:28 -0800
• 3819fa012e Offer _undeleted_ StockArticles for new OrderArticle only Julius 2013-12-31 12:35:30 +0100
• 9bed751d28 Merge pull request #239 from foodcoop-rostock/add-article-price-locales wvengen 2013-12-31 01:48:44 -0800
• 3336065218 Add missing translations for ArticlePrice attributes Julius 2013-12-30 12:38:26 +0100
• b22677eced Change order link from invoice form to avoid access problems Julius 2013-12-30 11:26:10 +0100
• 4f80fd0e8c Merge pull request #231 from wvengen/feature-autocomplete-fixes-2 wvengen 2013-12-30 02:03:48 -0800