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

• e728e76729 Merge branch 'master' into warn-uncheck-ordered-article Robert Waltemath 2013-09-17 17:10:56 +0200
• 1cf2145ff6 version update for security (now properly) (see also resque/redis-namespace#64) wvengen 2013-09-17 15:02:58 +0200
• e6320e5b7b add resque version for security wvengen 2013-09-17 14:49:19 +0200
• 6d4aa5ed40 Merge pull request #163 from foodcoop-rostock/order-tasks-alphabetically wvengen 2013-09-17 05:45:13 -0700
• f224735718 remember what member ordered when deleted in balancing screen wvengen 2013-09-17 14:19:46 +0200
• b11706f30a sort ordergroups in order screen and pdfs wvengen 2013-09-17 00:25:38 +0200
• 8ca95f396f make both ordered and received products visible in order screens and pdfs wvengen 2013-09-16 23:52:58 +0200
• 1bb257c41b remember member order when order article is deleted + test wvengen 2013-09-13 15:37:30 +0200
• ee31c0c2af localeapp roundtrip wvengen 2013-09-10 12:06:40 +0200
• b235592656 add total to order pdf, layout changes (closes foodcoops/foodsoft#138) wvengen 2013-06-21 02:34:56 +0200
• 39b3dee050 do not show empty fields on fax pdf (closes foodcoops/foodsoft#108) wvengen 2013-06-20 17:17:15 +0200
• e20898c5ee Merge branch 'tests-rspec' into master-spec wvengen 2013-09-10 11:37:05 +0200
• 6418790ef5 localeapp roundtrip, with updated translations wvengen 2013-09-10 10:46:02 +0200
• 12c0636941 fix i18n buglets (closes #167) wvengen 2013-09-10 10:27:13 +0200
• 707f487128 update spec gems to make tests work again wvengen 2013-09-07 01:34:34 +0200
• 7de57715f2 Merge branch 'master' into tests-rspec wvengen 2013-09-07 01:11:24 +0200
• 9922c0322a first version of new translation: French wvengen 2013-09-06 19:41:24 +0200
• bdd0f8cbcb fix heroku deploy script (also closes #165) wvengen 2013-09-06 19:31:15 +0200
• a0760ebfdb Fixed delivering emails to users. Benjamin Meichsner 2013-09-06 11:40:10 +0200
• 9f22615a25 Order tasks with same date by name. Robert Waltemath 2013-09-05 10:16:57 +0200
• 805071f3fb Added checkbox to ignore warnings. Added translations. Robert Waltemath 2013-09-04 10:52:14 +0200
• bb25bdc6eb Improved error data passing. Robert Waltemath 2013-09-03 17:37:49 +0200
• 1c9fad0a7b Added validation for removed but ordered articles. Robert Waltemath 2013-09-03 12:09:33 +0200
• 3792069fda Fxed encoding error when uploading files with non-ascii characters. Benjamin Meichsner 2013-09-02 16:46:44 +0200
• bf1c2b5ed2 Handle missing due_date in weekly tasks migration. Benjamin Meichsner 2013-09-02 15:42:03 +0200
• 5883bf50f3 Removed rails3 branch and updated Readme. Benjamin Meichsner 2013-09-02 14:41:16 +0200
• a1d85d0dd7 Changed API of multicoops rake tasks. Use TASK=sample:task Benjamin Meichsner 2013-09-02 14:19:44 +0200
• 51a91f376d Updated locales from localeapp. Benjamin Meichsner 2013-09-02 13:34:30 +0200
• 27c006443f (git)Ignore localeapp config. Benjamin Meichsner 2013-09-02 13:33:14 +0200
• 71e02ab569 Merge branch 'rails3' into rails3-to-master Benjamin Meichsner 2013-09-02 13:31:40 +0200
• c7cdcf2b82 Allow setting default locale in user settings migration. Benjamin Meichsner 2013-09-02 10:42:05 +0200
• 4ea940e4a3 Removed unused acts_as_configurable gem. Benjamin Meichsner 2013-09-02 10:03:12 +0200
• 37e5b0c25c add balancing integration spec wvengen 2013-07-26 18:34:03 +0200
• eac8260b38 add i18n tests wvengen 2013-07-25 14:46:25 +0200
• ca50006235 add coverage report, set COVERAGE=1 in env when running specs wvengen 2013-07-25 13:59:55 +0200
• 7c65995b62 add travis to README [ci skip] wvengen 2013-07-25 13:31:59 +0200
• 0f01b87e3b do not exceed 99 articles when ordering in specs wvengen 2013-07-25 13:21:24 +0200
• 50f5064d8e fix product distribution integration test wvengen 2013-07-25 13:08:38 +0200
• 7dafcf714a spec move functionality into factory wvengen 2013-07-25 11:16:39 +0200
• b302cbde4f make sure price spec works when price is zero wvengen 2013-07-25 09:42:29 +0200
• e9ed6f8c0f Revert "try to fix integration spec on travis" wvengen 2013-07-25 01:25:08 +0200
• c753ae0471 comment tests that are unclear how they should behave wvengen 2013-07-25 01:07:41 +0200
• 9a12ea9efc fix uniquess spec problems wvengen 2013-07-25 00:52:41 +0200
• 06d39f52ca try to fix integration spec on travis wvengen 2013-07-25 00:35:42 +0200
• 1e986e704a remove spec test that is broken and not really useful wvengen 2013-07-25 00:07:39 +0200
• ebf71ad494 fix price history spec wvengen 2013-07-25 00:01:58 +0200
• d602b7cd0d use expect instead of should in specs wvengen 2013-07-24 22:46:25 +0200
• 0be3955cd7 Revert "cleaner way to set foodcoop scope" wvengen 2013-07-24 22:06:53 +0200
• f0c831ccd9 initialize database on travis wvengen 2013-07-24 21:57:17 +0200
• 63a0c0cff6 travis create database before running tests wvengen 2013-07-24 21:47:27 +0200
• 71d25c5ebb travis.yml fix wvengen 2013-07-24 21:40:36 +0200
• c1147306be fix travis.yml wvengen 2013-07-24 21:28:42 +0200
• a6114f137b add order integration spec wvengen 2013-07-24 21:25:57 +0200
• bb20e9abea Merge branch 'master' into tests-rspec wvengen 2013-07-24 20:45:38 +0200
• 23a08b2ac8 cleaner way to set foodcoop scope wvengen 2013-07-24 20:44:07 +0200
• 6da2fdee6d add travis-ci configuration wvengen 2013-07-24 13:21:52 +0200
• 62682b7e64 make integration test work wvengen 2013-07-24 12:37:20 +0200
• 8af04e0112 add product distribution integration test wvengen 2013-07-24 04:04:59 +0200
• 0d33922ed9 make integration spec work with javascript driver too wvengen 2013-07-24 02:57:45 +0200
• a858ceedea more flexible login in spec helper wvengen 2013-07-24 01:11:36 +0200
• d58ce31b7f add first integration test wvengen 2013-07-24 01:05:01 +0200
• b9599ce455 Merge branch 'master' into updated-gems wvengen 2013-07-18 20:28:56 +0200
• 3e4c535bb1 update translations and localeapp roundtrip wvengen 2013-07-18 19:27:52 +0200
• 74bfc85562 Merge remote-tracking branch 'fsmanuel/master' into master. wvengen 2013-07-18 18:48:49 +0200
• c85a7fcc5c fixes User#receive_email? Manuel Wiedenmann 2013-07-18 16:58:04 +0200
• dfe1cee4cd german i18n + mini fix Manuel Wiedenmann 2013-07-18 16:23:29 +0200
• 1d12e09342 update translations and localeapp roundtrip wvengen 2013-07-18 16:22:38 +0200
• 0401572580 Merge pull request #1 from foodcoop-adam/extended-i18n Manuel Wiedenmann 2013-07-18 07:19:20 -0700
• 206709aa61 sets session[:locale] = user.locale after login Manuel Wiedenmann 2013-07-18 16:09:32 +0200
• 1fed9834b3 fix tooltip after bootstrap update wvengen 2013-07-17 11:31:27 +0200
• ccea97c2b3 update bootstrap assets wvengen 2013-07-17 11:31:12 +0200
• eef4626107 Merge branch 'master' into updated-gems wvengen 2013-07-17 11:04:28 +0200
• b81472d91b Merge pull request #159 from foodcoop-rostock/improve-delivery-workflow-further-stupid wvengen 2013-07-17 01:54:18 -0700
• ebe93e292b Merge pull request #141 from foodcoop-rostock/improve-delivery-workflow-further wvengen 2013-07-17 01:43:59 -0700
• 9f464706b4 Undo senseless indentation correction 2 Julius 2013-07-16 22:04:44 +0200
• 3b91b9f7c6 Undo senseless indentation correction Julius 2013-07-16 22:03:47 +0200
• 7fd8abf381 Replace 'own' js table sorting by stupidtable plugin Julius 2013-07-16 22:01:56 +0200
• ea399b2c72 client_side_validations config wvengen 2013-07-16 00:39:11 +0200
• 9fb6597980 Merge branch 'master' into updated-gems wvengen 2013-07-16 00:00:55 +0200
• e5448603a4 update uglifier wvengen 2013-07-15 23:45:09 +0200
• 4fafdcb7ad Remove broken font-size fix which is no longer needed Julius 2013-07-15 21:58:09 +0200
• 427a023135 add group_order_article spec wvengen 2013-07-15 21:01:46 +0200
• db80fbd807 Merge branch 'master' into tests-rspec wvengen 2013-07-15 18:45:04 +0200
• 679fc673c7 add group_order spec wvengen 2013-07-15 18:45:02 +0200
• 5e9a49b2c7 make uniqueness_of_name validations work again (closes foodcoops/foodsoft#157) wvengen 2013-07-15 18:03:02 +0200
• 3a7d650ed8 fix tests wvengen 2013-07-15 17:57:20 +0200
• 3ed8e0bc84 allow longer supplier phone number wvengen 2013-07-15 17:57:00 +0200
• cc6a188f4e fix small test bug wvengen 2013-07-15 00:22:20 +0200
• acd18721aa expand rspec tests wvengen 2013-07-15 00:17:07 +0200
• 0e66414534 Allow creation of StockArticles also if there are no Articles for a supplier in delivery form Julius 2013-07-14 22:00:38 +0200
• 3c264f6225 add some rspec tests for supplier and article wvengen 2013-07-14 02:49:40 +0200
• fc6fbdaa95 use less-rails, and make exception_notifier work again wvengen 2013-07-13 23:06:30 +0200
• b303b48853 Merge branch 'master' into improve-delivery-workflow-further Julius 2013-07-13 21:08:50 +0200
• 3fd498d29f translations update wvengen 2013-07-13 12:37:20 +0200
• 126f7e7459 Merge pull request #150 from foodcoop-rostock/stock_article_quantity_history wvengen 2013-07-13 03:16:31 -0700
• 12506e54b8 Remove stock_changes_helper.rb Julius 2013-07-13 09:34:19 +0200
• 730dc7cf2a Move StockChanges#index to StockArticles#history Julius 2013-07-13 09:32:27 +0200
• cfae279196 bundle update wvengen 2013-07-12 23:35:31 +0200
• edaf91b029 Inline before_filter of stock_changes_controller Julius 2013-07-12 22:19:11 +0200
• e5eff07abd Move Select2 for stock_article_creation to tfoot of delivery form Julius 2013-07-12 21:15:12 +0200