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

• 111c061efa more i18n cleanup (affects foodcoops#137) wvengen 2013-12-06 22:53:59 +01:00
• a475a27f79 i18n cleanup (affects foodcoops#137) wvengen 2013-12-06 22:43:36 +01:00
• e99752e483 disable escape of html from local (one place) Julius Rapp 2013-12-06 18:33:35 +01:00
• 043607f20d workaround wikicloth i18n issue (closes foodsoft#217) wvengen 2013-12-06 16:41:16 +01:00
• 2baa1d3349 fix i18n deprecation warning wvengen 2013-12-06 16:13:04 +01:00
• 62ca3cb634 small layout cleanup [ci skip] wvengen 2013-12-06 14:49:05 +01:00
• 2f10210c76 remove unimplemented unit_divide box wvengen 2013-12-06 14:38:28 +01:00
• c99aa7aab6 add availability to article edit dialog wvengen 2013-12-06 14:33:51 +01:00
• 923b579bd1 Merge branch 'master' into article-dialog wvengen 2013-12-06 14:26:50 +01:00
• 3937400683 fix modal dialog margin [ci skip] wvengen 2013-12-06 14:25:58 +01:00
• 1c4b9591a2 fix edit article dialog title wvengen 2013-12-06 12:34:14 +01:00
• 05b934e79f update fc price dynamically in article edit form wvengen 2013-12-06 12:19:13 +01:00
• e42589ae72 translations update (localeapp roundtrip) wvengen 2013-12-06 11:58:08 +01:00
• dfa27dfc7c don't use resque on heroku by default wvengen 2013-12-05 15:52:32 +01:00
• 2408545496 bundle update (fixes rails vulnerability) wvengen 2013-12-04 21:07:50 +01:00
• b1e81dc1d7 make simple_form see that first_name is required wvengen 2013-12-03 22:03:19 +01:00
• 8a1b0386eb Re-indent code blocks according to markdown syntax. Robert Waltemath 2013-12-03 19:46:53 +01:00
• c900cf4988 make product redistribution work! wvengen 2013-11-26 23:48:21 +01:00
• 2d99141229 only allow to add articles not already present in receive wvengen 2013-11-26 13:31:07 +01:00
• beabe22a01 simplify model wvengen 2013-11-26 13:22:44 +01:00
• 9cb9bf6c1a focus newly added input in receive wvengen 2013-11-26 13:00:34 +01:00
• 9badaca2f3 fix wiki page creation wvengen 2013-11-25 16:33:12 +01:00
• 853e8ba9d2 add package images [ci skip] wvengen 2013-11-25 15:25:08 +01:00
• 9990e059d4 fix i18n wvengen 2013-11-25 15:24:20 +01:00
• 9c340ec08e more clarity whether a number is number units or boxes wvengen 2013-11-25 15:13:54 +01:00
• bd1b932775 add receive screen, quantities for model, redistribution wvengen 2013-11-25 13:48:54 +01:00
• 1f08ee4759 Merge remote-tracking branch 'foodcoops/master' into feature-link_to_group_order wvengen 2013-11-25 10:11:56 +01:00
• 810656a53b small link_to_ordering refactoring wvengen 2013-11-25 10:04:44 +01:00
• 9a0100e382 Merge pull request #207 from sjmulder/bug/130 wvengen 2013-11-25 00:39:52 -08:00
• 9c3eb9e741 Merge pull request #212 from foodcoop-adam/i18n-cleanup wvengen 2013-11-25 00:39:21 -08:00
• 935fdedd66 hide row when information not present wvengen 2013-11-24 02:16:15 +01:00
• 6410396489 localeapp roundtrip wvengen 2013-11-24 02:12:32 +01:00
• 20bd86fe65 make heading_helper work with empty _short translation wvengen 2013-11-24 01:59:44 +01:00
• e5471b9f73 more i18n cleanup wvengen 2013-11-24 01:47:34 +01:00
• 652a392b37 simplify i18n and fix some small ui issues wvengen 2013-11-23 17:28:21 +01:00
• 135e938d3d i18n cleanups (affects #137) wvengen 2013-11-23 12:05:29 +01:00
• ed9a6cca39 make result calculation a bit cleaner wvengen 2013-11-22 23:40:44 +01:00
• ad2822dd9e Merge pull request #210 from foodcoop-adam/retry-tests wvengen 2013-11-21 03:46:59 -08:00
• 8ac7cbf96f retry tests as a workaround for fragile integration tests (closes foodcoops#205) wvengen 2013-11-21 00:29:24 +01:00
• 84191ddcd0 first shot on improving edit article form wvengen 2013-11-20 23:40:38 +01:00
• 630aa383cb Remove apple-touch-icon links Sijmen Mulder 2013-11-19 22:57:55 +01:00
• 5adb25caf5 copy wiki strings to plugin area wvengen 2013-11-19 18:33:54 +01:00
• 2ac7016ccc localeapp roundtrip [ci skip] wvengen 2013-11-18 15:01:24 +01:00
• 3b8dfa7173 bundle update wvengen 2013-11-18 12:11:38 +01:00
• c4530bca6f Merge pull request #189 from foodcoops/allow-no-nickname wvengen 2013-11-18 03:00:27 -08:00
• 66ac3be81f Merge branch 'master' into allow-no-nickname wvengen 2013-11-18 11:42:49 +01:00
• 9b47e5d6c4 use dynamic conditional in validation, to enable different foodcoops having different use_nick configuration values wvengen 2013-11-18 11:31:30 +01:00
• 8a56e271f9 Merge pull request #202 from foodcoops/update-spec wvengen 2013-11-13 14:34:35 -08:00
• 4219eff0ab fix rspec warning wvengen 2013-11-13 23:22:26 +01:00
• 588898d7b0 do not error when calling shared_article on non-shared article wvengen 2013-11-13 23:20:48 +01:00
• ac6b00d4f5 add unit tests for shared database synchronisation wvengen 2013-11-13 23:09:17 +01:00
• de9453fa24 dashboard: link to view order page tg(x) 2013-11-13 16:29:30 +01:00
• a5a29aff5c Merge pull request #195 from foodcoop-adam/grouporder-many-products wvengen 2013-11-12 08:41:48 -08:00
• bb5a67033d Merge pull request #194 from foodcoop-adam/plugin-move wvengen 2013-11-12 03:46:15 -08:00
• 5daf1a466f localeapp roundtrip wvengen 2013-11-11 18:08:28 +01:00
• 768796407f Merge pull request #192 from foodcoop-adam/cleanup-stale wvengen 2013-11-11 09:05:19 -08:00
• ce3b89c910 make authentication methods more readable (thanks @fsmanuel) wvengen 2013-11-11 16:23:20 +01:00
• 891b9a21c0 fix and improve i18n of "My Ordergroup" wvengen 2013-11-09 14:19:54 +01:00
• 94a9603488 avoid running specs twice in test environment wvengen 2013-11-07 21:17:53 +01:00
• ec85c1de44 doc update [ci skip] wvengen 2013-11-07 20:46:01 +01:00
• ffa994d759 fix typo wvengen 2013-11-07 20:22:56 +01:00
• a5e4bb8bfb Merge pull request #198 from foodcoop-adam/doc-update Mathijs de Bruin 2013-11-07 10:12:12 -08:00
• d6f40923f6 add explanation of foodcoops to README wvengen 2013-11-07 19:08:33 +01:00
• 9490357fcc fix migration name wvengen 2013-11-07 12:03:28 +01:00
• fd3aa7ebc9 move dependency to wiki plugin wvengen 2013-11-06 13:43:04 +01:00
• a27dda62e0 copy migrations to default directory instead of trying to make it more easy to use wvengen 2013-11-06 10:54:20 +01:00
• a535fbc517 allow large product lists in member order wvengen 2013-11-05 10:54:35 +01:00
• 841cdad010 add missing routes to wiki plugin wvengen 2013-11-02 10:57:37 +01:00
• fa0102fed5 fix gemspec after file rename wvengen 2013-11-01 20:32:30 +01:00
• f4e4d11bae workaround for integration test problem wvengen 2013-11-01 13:30:02 +01:00
• 13c8af3642 use abbr instead of acronym for heading helper wvengen 2013-11-01 12:48:14 +01:00
• f7a0103553 clearer login field name wvengen 2013-10-30 21:28:35 +01:00
• 3588962329 remove unused layout wvengen 2013-10-30 20:53:01 +01:00
• fef17604c5 remove unused autocomplete templates wvengen 2013-10-30 20:50:56 +01:00
• 5ead67f88c remove unused memberships controller/view wvengen 2013-10-30 20:46:59 +01:00
• ccbf3be4a6 Merge branch 'master' into plugin-move wvengen 2013-10-30 11:06:53 +01:00
• 6e9954c86f remove user referencing page as it is not being used anyway wvengen 2013-10-30 11:04:22 +01:00
• f507efcdb3 update foodsoft_wiki README [ci skip] wvengen 2013-10-30 09:51:11 +01:00
• ea71d691e9 update foodsoft_wiki README wvengen 2013-10-30 09:50:06 +01:00
• c3068c8d51 move foodsoft_wiki db migration to plugin wvengen 2013-10-30 09:43:38 +01:00
• de948d7692 fix and cleanup routing (closes foodcoops#190) wvengen 2013-10-30 01:56:23 +01:00
• e883f4cfa7 fix last commit for non-js tests wvengen 2013-10-30 01:28:59 +01:00
• 042fbdc3a3 maximise window before running tests wvengen 2013-10-30 00:49:35 +01:00
• 70c12b7c1f move wiki functionality to plugin wvengen 2013-10-29 22:42:06 +01:00
• d4dccbc646 add foodsoft_wiki plugin to Gemfile by default wvengen 2013-10-29 22:23:17 +01:00
• 6d0ba985aa first version of the foodsoft_wiki plugin wvengen 2013-10-29 22:22:24 +01:00
• fde7904c1a allow plugins to modify the navigation menu wvengen 2013-10-29 21:47:36 +01:00
• 7779c15dc9 update testing gems to try fixing occasional integration test error wvengen 2013-10-29 21:31:07 +01:00
• 201f23381b remove deprecated plugins directory wvengen 2013-10-29 20:28:09 +01:00
• c37ed74942 Merge branch 'master' into allow-no-nickname wvengen 2013-10-29 19:15:52 +01:00
• e13ca74df3 fix new user form wvengen 2013-10-29 19:11:33 +01:00
• 9ba425aafa fallback for when nick is nil wvengen 2013-10-29 18:58:04 +01:00
• e968919cce beautify map invocations of users wvengen 2013-10-29 18:46:55 +01:00
• ed0ac706b9 small README changes [ci skip] wvengen 2013-10-29 15:39:56 +01:00
• cee6186c9e README fixups [ci skip] wvengen 2013-10-29 15:31:49 +01:00
• 75059d5bcf split and cleanup documentation [ci skip] wvengen 2013-10-29 15:27:26 +01:00
• 50d2991cc0 fix README markup wvengen 2013-10-29 14:23:37 +01:00
• c28822d33b Merge pull request #188 from foodcoops/doc_fixups wvengen 2013-10-29 06:05:16 -07:00
• 193e32f20b Deployment details / contact us. Mathijs de Bruin 2013-10-28 16:36:04 +01:00
• 41e384892c Getting started guide. Mathijs de Bruin 2013-10-28 16:26:44 +01:00