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

• 7fa8193010 start using rspec for tests wvengen 2013-07-12 20:06:49 +0200
• f57038ff56 show quantity/tolerance in order screen when unit_quantity=1 wvengen 2013-07-11 23:18:12 +0200
• 66e0bbc348 cleanup translation changes introduced by last merge wvengen 2013-07-11 22:09:58 +0200
• db8a929f0b Merge pull request #142 from foodcoop-rostock/multiple-recurring-tasks wvengen 2013-07-11 12:48:41 -0700
• 2ee1bef410 translation updates wvengen 2013-07-11 21:36:32 +0200
• 469abb753d Merge branch 'master' into improve-delivery-workflow-further Julius 2013-07-11 19:24:37 +0200
• 620686fa46 Merge branch 'master' into stock_article_quantity_history Julius 2013-07-11 19:23:52 +0200
• 54afbb7af5 Add locales for stock_changes index Julius 2013-07-11 19:21:56 +0200
• 7c27017306 Link delivery/stock_taking/order in stock_changes index Julius 2013-07-11 18:37:55 +0200
• ffcb9490c9 Make stock_changes readonly in index view Julius 2013-07-11 18:20:24 +0200
• 65c0b555c2 Added warning/ hint when updating periodic task. Robert Waltemath 2013-07-11 10:30:55 +0200
• 2ef7e58b0b Merge pull request #146 from foodcoop-adam/add-only-undeleted-articles wvengen 2013-07-10 13:05:50 -0700
• 33d3b9c466 merge branch minimum_balance into master (closes #133) wvengen 2013-07-10 22:02:36 +0200
• de9541a0df Ask how to fetch readonly associations Julius 2013-07-09 21:49:39 +0200
• ef62a18ac9 Add StockChanges index Julius 2013-07-09 21:46:04 +0200
• 5ed2659bc6 Fix StockArticle update in Delivery form Julius 2013-07-09 17:08:59 +0200
• 164b3f7415 Replace deprecated $.fn.live in delivery form Julius 2013-07-08 22:49:49 +0200
• 33b27d2fa7 proper usage of jQuery.on(), and update javascript in views as well wvengen 2013-07-08 22:41:06 +0200
• f76b9da1e9 Separate columns for article price and unit in delivery form Julius 2013-07-08 22:19:27 +0200
• a6228bdcf2 Style bootstrap tooltip; show FC share in article price info Julius 2013-07-08 22:10:36 +0200
• bba70dc875 Change DOM sort style to match existing style Julius 2013-07-08 21:51:15 +0200
• ff1317b17b Add hint to copy stock_article if price change desired in delivery process Julius 2013-07-08 21:02:43 +0200
• 5fcc14a36d Fix trailing '*/' in application.css Julius 2013-07-08 20:46:05 +0200
• e9e7135639 run bundle update and make it work again wvengen 2013-07-08 14:32:24 +0200
• 1eeec23c80 only add undeleted articles in balancing screen wvengen 2013-07-08 02:31:54 +0200
• a5565b436f Resolve merge conflicts Julius Rapp 2013-07-07 14:58:57 +0200
• 02e2ce4bc3 Update locales Julius Rapp 2013-07-07 14:30:13 +0200
• 1ebd4e3ce6 Use foodsoft button and table styles (no btn-group, no table-condensed) Julius Rapp 2013-07-07 14:18:18 +0200
• d3ccfd1929 Add hint to change name of copied StockArticle Julius Rapp 2013-07-07 14:16:06 +0200
• 4a208c83c0 Separate actions for new StockArticle Julius Rapp 2013-07-07 14:14:32 +0200
• d397132f7b be safe even with locale string wvengen 2013-07-07 02:31:42 +0200
• 8080cd6b7e pass locale to datepicker, use gem for that wvengen 2013-07-07 01:47:22 +0200
• 76645ebd12 add default tax percentage to app_config wvengen 2013-07-06 23:11:50 +0200
• 3da27734c7 allow import of files with categories that do not exist (map to no category) wvengen 2013-07-06 17:49:10 +0200
• a6688b3b43 import manufacturer and origin too (closes #140) wvengen 2013-07-06 17:48:40 +0200
• 497c9e0cf1 fix closed group_order totals wvengen 2013-07-02 12:01:25 +0200
• d7540bdd20 fix i18n key wvengen 2013-06-30 13:07:57 +0200
• 9ef208fa13 small translation changes wvengen 2013-06-29 03:02:05 +0200
• b807e9d059 beautify order mail wvengen 2013-06-29 02:54:00 +0200
• 9b0db5bb0b translation updates: capitalisations, order_result mail wvengen 2013-06-29 02:46:20 +0200
• f11d10ff07 update order result mail (fixing html quoting of quotes) wvengen 2013-06-29 02:22:01 +0200
• 9d406bbc08 make resque worker function on non-multi-coop-installs too wvengen 2013-06-29 01:48:57 +0200
• 0978b84f4d set user language on login to override session wvengen 2013-06-28 13:30:26 +0200
• e5d790021c Add repeated symbol to task list. Robert Waltemath 2013-06-27 10:22:22 +0200
• 69060a6da6 Fix ordering of stock_changes in delivery 2 Julius 2013-06-27 09:10:46 +0200
• d0ccf07bc5 Merge latest changes in master of http://github.com/foodcoops/foodsoft Julius 2013-06-26 20:23:11 +0200
• a29d52dcae Fix ordering of stock_changes in delivery (case-insensitive ordering did not work properly for all database flavors) Julius 2013-06-26 20:14:33 +0200
• 8a79dfd167 Add tooltip for article prices Julius 2013-06-26 19:57:38 +0200
• 2ee7f716ae Improve delivery validation: StockArticles must not be associated more than once Julius 2013-06-26 17:56:20 +0200
• 5df4c8f8a6 Update locales for delivery form Julius 2013-06-26 15:21:11 +0200
• dd70b84ef0 Linearize and clean up delivery form Julius 2013-06-26 15:16:52 +0200
• befe89d4ef fix tolerance display in group_order form wvengen 2013-06-26 01:36:44 +0200
• c31e864c73 internationalise currency in order screen wvengen 2013-06-26 01:17:04 +0200
• dddd11d8f0 do not autocapitalize or autocorrect on login fields to avoid login errors on iPad/iPhone wvengen 2013-06-26 00:42:09 +0200
• 91c8be6b6c make tests work again wvengen 2013-06-25 13:04:55 +0200
• e450cf404e harmonize order cycle translations wvengen 2013-06-25 00:16:30 +0200
• 7dbe1363ed fix adding article balancing failing with 'already taken' (closes foodcoops/foodsoft#125) wvengen 2013-06-24 13:32:07 +0200
• 7942ccfae6 Added missing migration files. Robert Waltemath 2013-06-24 12:02:22 +0200
• c27127c745 Added i18n strings. Robert Waltemath 2013-06-24 11:53:52 +0200
• abe7c7181d Remove obsolete columns from database. Robert Waltemath 2013-06-24 10:57:42 +0200
• 3d1faa9ed3 Skip save callback when migrating data. Robert Waltemath 2013-06-24 10:36:14 +0200
• d081a2c66b Validate done/weekly combination only on creation of task. Robert Waltemath 2013-06-24 09:49:06 +0200
• 577945e591 Add validation for task.done in combination with periodic task. Robert Waltemath 2013-06-22 18:56:17 +0200
• a7fd7a7936 Removed obsolete code of old workgroup-centric weekly task concept. Robert Waltemath 2013-06-22 18:14:11 +0200
• ef329b5647 Added up and down migration for weekly task data. Robert Waltemath 2013-06-22 17:35:45 +0200
• 2e1a3eb47f Removed unused I18n strings. Robert Waltemath 2013-06-22 11:23:08 +0200
• 990397a7f0 Delete only the FOLLOWING tasks. Robert Waltemath 2013-06-21 22:04:36 +0200
• c52e482743 Exclude tasks from groups when changing attributes. Robert Waltemath 2013-06-21 20:54:24 +0200
• cab6ada8b8 small invoice i18n cleanup/refactoring wvengen 2013-06-21 14:24:05 +0200
• c5c4b1f93f small translation updates wvengen 2013-06-21 13:54:36 +0200
• 906093b3ce small i18n fixes and clarifications wvengen 2013-06-21 13:49:34 +0200
• 6b62fc90d8 Now creating periodic task via button Robert Waltemath 2013-06-21 13:48:48 +0200
• 3cfd8b2d44 fix i18n key wvengen 2013-06-21 13:25:52 +0200
• 931b3bef5e fix touch event twice bug (complements ac62dcce9d) wvengen 2013-06-20 01:20:13 +0200
• bf32e72414 Improve delivery form validation Julius 2013-06-19 11:21:55 +0200
• 0b81ba97b9 Fix newline char in heroku_deploy script Julius 2013-06-18 22:18:24 +0200
• c48ce138f3 cleanup of profile layout wvengen 2013-06-18 12:20:26 +0200
• 04c9770e80 Complete I18n Julius 2013-06-18 10:59:53 +0200
• cc1a839246 Allow to create stock_article as copy of article in delivery form Julius 2013-06-18 10:48:19 +0200
• cc5574f8b5 Revert ac62dcce9d Julius 2013-06-18 09:10:31 +0200
• 1e984df3aa more beautiful ordergroup edit form wvengen 2013-06-18 01:35:12 +0200
• 6e6cce1cb7 Add Select2 jQuery plugin Julius 2013-06-17 16:05:23 +0200
• 9502ca28dd Merge latest changes in master Julius 2013-06-17 15:47:08 +0200
• a9938df443 Clean up sort functionality; Remove title attributes due to hard I18n Julius 2013-06-17 15:43:42 +0200
• f47237ebe0 update link wvengen 2013-06-17 03:13:42 +0200
• 9523eba65f add badges wvengen 2013-06-17 02:59:36 +0200
• eee5d4a896 Fixed indentation bug in sync template. Benjamin Meichsner 2013-06-16 15:10:50 +0200
• 8c4da55561 Merge branch 'show-percent-sign' of git://github.com/foodcoop-rostock/foodsoft into foodcoop-rostock-show-percent-sign Benjamin Meichsner 2013-06-16 14:55:48 +0200
• 713c030213 i18n and translate missing entry wvengen 2013-06-15 18:43:42 +0200
• 8c08de9eae translation fixes, clarifications and additions wvengen 2013-06-15 17:59:15 +0200
• 6569579c02 styles the preferences in user profile Manuel Wiedenmann 2013-06-14 22:38:07 +0200
• b5acd9b116 Merge master branch of base Julius 2013-06-14 18:59:17 +0200
• 885b11dba8 Add english translations for novel delivery functionality Julius 2013-06-14 12:33:16 +0200
• 18f067ea60 make localeapp updates work in production environment too wvengen 2013-06-14 03:10:32 +0200
• ba923a8f16 updates locale files Manuel Wiedenmann 2013-06-14 02:53:17 +0200
• 2f31d1a5f8 add heroku deploy script wvengen 2013-06-14 02:42:13 +0200
• 2c1d9aeb9c finishes i18n set_locale with user settings Manuel Wiedenmann 2013-06-14 02:39:25 +0200
• 5b7ec86ed6 Merge branch master into i18n Manuel Wiedenmann 2013-06-14 02:02:57 +0200
• 9b05923d7c Merge branch 'touchscreens' wvengen 2013-06-14 01:44:04 +0200
• ac62dcce9d make touch device events work on buttons (closes foodcoop-rostock/foodsoft#34, closes foodcoops/foodsoft#104) wvengen 2013-06-13 11:59:05 +0200