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

• ebc3c4cb99 Whitespace cleanup. Mathijs de Bruin 2013-10-28 15:49:59 +01:00
• 46a6b13e23 DEVELOPMENT *is* outdated. Link to .md docs. Mathijs de Bruin 2013-10-28 15:47:47 +01:00
• 2bd559f4d9 Rename documentation to .md for proper rendering. Mathijs de Bruin 2013-10-28 15:47:21 +01:00
• 85c98c4566 make heroku deploy work again wvengen 2013-10-28 00:49:00 +01:00
• b314363ce3 bundle update wvengen 2013-10-24 10:11:26 +02:00
• 68b9f6a974 i18n-js assets configuration change wvengen 2013-10-23 12:57:42 +02:00
• 13a7f84e35 localeapp roundtrip [ci skip] wvengen 2013-10-23 12:48:08 +02:00
• fc39f9d5c0 Merge pull request #186 from foodcoops/i18n wvengen 2013-10-23 03:39:09 -07:00
• 3275e9ba31 small i18n bug wvengen 2013-10-22 00:09:11 +02:00
• 1e73c82205 remove unused files (complements bf0dc4af09) [ci skip] wvengen 2013-10-21 18:00:13 +02:00
• d1f9b0b090 apply changes to other translations + translation fixes wvengen 2013-10-21 17:55:58 +02:00
• 98e7189d31 Merge branch 'master' into i18n wvengen 2013-10-18 12:30:34 +02:00
• 51e6a7aeb0 Merge pull request #149 from foodcoop-adam/updated-gems wvengen 2013-10-18 03:12:59 -07:00
• bf0dc4af09 remove disfunctional dispatch cgis wvengen 2013-10-18 00:21:45 +02:00
• bfcf35cd34 fix i18n spec after changes wvengen 2013-10-17 17:10:33 +02:00
• e1eb6031c8 load fr translation for datepicker wvengen 2013-10-17 16:48:34 +02:00
• 6e5184d796 use rails-i18n translations wvengen 2013-10-17 16:20:51 +02:00
• 4e61e764df fix haml indentation errors wvengen 2013-10-17 16:35:50 +02:00
• 092bc6b150 translation updates wvengen 2013-10-17 15:32:03 +02:00
• 389b45a505 fix stockit i18n reference wvengen 2013-10-10 19:23:37 +02:00
• 23b38b5a46 fix category heading wvengen 2013-10-10 19:22:43 +02:00
• a339ae4c7c i18n simple_form move of remaining labels wvengen 2013-10-10 19:12:59 +02:00
• d64590a534 more robustness wvengen 2013-10-10 17:49:06 +02:00
• 1afd8b8387 bundle update wvengen 2013-10-10 17:47:12 +02:00
• 9cb5362e48 Merge pull request #185 from foodcoop-rostock/force-order-finish wvengen 2013-10-10 08:30:33 -07:00
• 34a4951e28 Merge branch 'master' into i18n wvengen 2013-10-09 23:57:43 +02:00
• 6c17c17982 i18n simple_form move of fax pdf wvengen 2013-10-09 23:41:15 +02:00
• 67e29620f4 i18n simple_form move of invoices wvengen 2013-10-09 23:37:08 +02:00
• 6ba971fe15 i18n simple_form move of deliveries wvengen 2013-10-09 23:19:40 +02:00
• c3d22e883d i18n simple_form move of suppliers wvengen 2013-10-09 23:12:26 +02:00
• 78c81b194c i18n simple_form move of foodcoop wvengen 2013-10-09 23:00:07 +02:00
• 552af7925d i18n simple_form move of tasks wvengen 2013-10-09 22:41:23 +02:00
• 762292ef8e small i18n move wvengen 2013-10-09 22:29:19 +02:00
• b8ff431634 clean up price tooltips javascript wvengen 2013-10-09 10:35:27 +02:00
• bdce1b5872 Merge branch 'master' into updated-gems wvengen 2013-10-09 10:37:02 +02:00
• 28644dc334 Force update in Order#finish; rescue if error raised Julius 2013-10-08 19:58:11 +02:00
• 1b49a08c5e localeapp roundtrip wvengen 2013-10-08 11:42:23 +02:00
• a32a3757d2 Merge pull request #180 from foodcoop-rostock/search-article-list-modified wvengen 2013-10-08 02:21:35 -07:00
• ac3e5cd019 Merge pull request #184 from foodcoop-rostock/article-price-tooltip wvengen 2013-10-08 02:14:03 -07:00
• 9041a350d5 Add some locales for article attributes Julius 2013-10-05 22:37:17 +02:00
• 10d1615cd8 Prepare tooltip for next bootstrap version (as in 1fed9834b3) Julius 2013-10-05 22:28:04 +02:00
• 3a948e9b73 Move list.js extensions to plugins Julius 2013-10-04 18:28:45 +02:00
• dce92b9d7c i18n ordering javascript wvengen 2013-10-04 15:01:24 +02:00
• 64a597c689 use i18n-js wvengen 2013-10-04 14:53:22 +02:00
• a9dff7f1df add missing i18n wvengen 2013-10-04 10:09:33 +02:00
• ac1341d5b0 Merge branch 'master' of http://github.com/foodcoops/foodsoft into article-price-tooltip Julius 2013-10-03 23:22:31 +02:00
• 9a9a782bc4 Complete StockArticle#show view Julius 2013-10-03 23:21:53 +02:00
• fef8c6d99f Move StockArticle#history to StockArticle#show Julius 2013-10-03 22:24:21 +02:00
• a3e82f5304 Add article price tooltip to StockTaking form Julius 2013-10-03 22:14:41 +02:00
• 3f822dc396 Revert "Fix migrate problem caused by output formating(?)" Julius 2013-10-03 22:03:14 +02:00
• 26e207aeb1 Reuse some list.js standard template functions (thanks to wvengen https://gist.github.com/wvengen/6784056) Julius 2013-10-03 16:10:18 +02:00
• bbcad49831 start moving from simple_form i18n to activerecord wvengen 2013-10-03 16:03:13 +02:00
• 1674dcf851 fix i18n of article sync wvengen 2013-10-03 14:07:03 +02:00
• dd54cdce7a Merge branch 'master' of http://github.com/foodcoops/foodsoft Julius 2013-10-03 10:47:05 +02:00
• 1870276cd2 show user name with use_nick is false wvengen 2013-10-02 23:43:09 +02:00
• 1946cd1ab3 make user creation possible again wvengen 2013-10-02 23:33:24 +02:00
• bc5795b052 small model change wvengen 2013-10-02 23:29:21 +02:00
• 75e858db71 bundle update wvengen 2013-10-02 22:55:14 +02:00
• 3574f239c6 localeapp roundtrip wvengen 2013-10-02 17:33:37 +02:00
• 17bbb0705b fix i18n wvengen 2013-10-02 17:23:49 +02:00
• a8ace3bc79 add missing i18n wvengen 2013-10-02 17:13:49 +02:00
• 1d8fefcfb7 small i18n update wvengen 2013-10-02 17:08:24 +02:00
• 6cfaa4979a show lines with zero units but with member orders in balancing screen (closes foodcoops/foodsoft#179) wvengen 2013-10-02 16:32:29 +02:00
• 9ac9d1ea50 add spec for foodcoops/foodsoft#179 wvengen 2013-10-02 16:32:01 +02:00
• 0bb62332c0 localeapp roundtrip wvengen 2013-10-01 00:05:46 +02:00
• d36f2dd4ac Fix minor delivery bug Julius 2013-09-25 23:06:53 +02:00
• 6632f5ed75 workaround migration bug introduced by 975bcdec3a wvengen 2013-09-30 10:57:54 +02:00
• 53f24cd885 Fix migrate problem caused by output formating(?) Julius 2013-09-25 21:22:34 +02:00
• c1ac95e440 list.unlist.js: Use jQuery's toggleClass instead of native if-else (just for briefness) Julius 2013-09-25 20:58:53 +02:00
• 817d61491e Merge branch 'master' of github.com:foodcoops/foodsoft Benjamin Meichsner 2013-09-25 11:58:53 +02:00
• 975bcdec3a Avoid send messages so STDOUT in rake silen mode. Benjamin Meichsner 2013-09-25 11:57:22 +02:00
• a87ced2646 Hide article category if no article matches the search Julius 2013-09-24 21:21:08 +02:00
• 9f083dd4d0 Add button to clear article search (list.js customization) Julius 2013-09-23 21:31:54 +02:00
• 77fbf3ca81 Merge pull request #175 from foodcoop-rostock/fix-balancing wvengen 2013-09-23 02:14:50 -07:00
• 3c8f56b24f Add dismiss button to sidebars in group_order form (idea stolen from foodcoops#143) Julius 2013-09-22 22:07:34 +02:00
• 6ec81ace18 Always show article category headers (do not unlist them on list.js search) Julius 2013-09-22 22:04:29 +02:00
• 891293af84 Add delay to list.js search Julius 2013-09-22 21:50:59 +02:00
• ea3db22306 user display changes in model and mailer wvengen 2013-09-22 14:38:56 +02:00
• f6c2fd9a9d more user display changes wvengen 2013-09-22 02:15:35 +02:00
• 6d3db7636a make search work without nickname usage wvengen 2013-09-20 23:18:06 +02:00
• 17c1ee803f fix typo breaking invitation wvengen 2013-09-20 23:15:44 +02:00
• e4f0a1e3ed start of making nickname optional wvengen 2013-09-20 22:40:13 +02:00
• a77c3b59b1 allow to login with email instead of nick as well + tests wvengen 2013-09-20 22:39:19 +02:00
• fa99a0a852 add bitdeli badge wvengen 2013-09-20 18:24:40 +02:00
• 2060261c89 Merge pull request #144 from foodcoop-adam/fix-closed-group_order-totals Benjamin Meichsner 2013-09-19 03:14:40 -07:00
• 2008bb75bf update travis badge after tests merge [ci skip] wvengen 2013-09-18 23:34:55 +02:00
• 14d4d2f12d Add list.js for filtering articles (another try for foodcoops#143) Julius 2013-09-18 23:15:21 +02:00
• c7f28a3b5c use plain Ruby memoization to fix deprecation (closes #121) wvengen 2013-09-18 22:45:57 +02:00
• 6b0146eb95 add spec for article#in_open_order wvengen 2013-09-18 22:27:53 +02:00
• 50a8cce9fd do not update localeapp from translation instance, since it may run a slightly older version [ci skip] wvengen 2013-09-18 19:21:54 +02:00
• f1f7e8d709 localeapp roundtrip wvengen 2013-09-18 19:14:48 +02:00
• 2d549fc1da do not recalculate GroupOrder totals, but show message to do so on migrations wvengen 2013-09-18 18:33:49 +02:00
• 84daaf1b6c Merge branch 'production' Benjamin Meichsner 2013-09-18 18:30:15 +02:00
• 4c27a98e06 Fixed failing asset precompiling in production mode. Benjamin Meichsner 2013-09-18 18:19:41 +02:00
• ebb22ccb53 Merge branch 'master' into fix-closed-group_order-totals wvengen 2013-09-18 18:14:07 +02:00
• 5681553ca0 Avoid connecting to redis backend in test environment. Benjamin Meichsner 2013-09-18 18:04:40 +02:00
• b015ceea0b Merge branch 'warn-uncheck-ordered-article' of https://github.com/foodcoop-rostock/foodsoft into foodcoop-rostock-warn-uncheck-ordered-article Benjamin Meichsner 2013-09-18 17:50:30 +02:00
• 5444c3a1c0 Merged updates from localeapp. Benjamin Meichsner 2013-09-18 17:48:24 +02:00
• 857eb64a45 Merge pull request #173 from foodcoop-adam/keep-member-order-on-orderarticle-deletion Benjamin Meichsner 2013-09-18 08:32:33 -07:00
• 6a1f7d279a Merge branch 'master' of github.com:foodcoops/foodsoft Benjamin Meichsner 2013-09-18 17:29:03 +02:00