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

• b5acd9b116 Merge master branch of base Julius 2013-06-14 18:59:17 +02:00
• 885b11dba8 Add english translations for novel delivery functionality Julius 2013-06-14 12:33:16 +02:00
• 18f067ea60 make localeapp updates work in production environment too wvengen 2013-06-14 03:10:32 +02:00
• ba923a8f16 updates locale files Manuel Wiedenmann 2013-06-14 02:53:17 +02:00
• 2f31d1a5f8 add heroku deploy script wvengen 2013-06-14 02:42:13 +02:00
• 2c1d9aeb9c finishes i18n set_locale with user settings Manuel Wiedenmann 2013-06-14 02:39:25 +02:00
• 5b7ec86ed6 Merge branch master into i18n Manuel Wiedenmann 2013-06-14 02:02:57 +02:00
• 9b05923d7c Merge branch 'touchscreens' wvengen 2013-06-14 01:44:04 +02:00
• ac62dcce9d make touch device events work on buttons (closes foodcoop-rostock/foodsoft#34, closes foodcoops/foodsoft#104) wvengen 2013-06-13 11:59:05 +02:00
• 8141ad0233 remove duplicate code wvengen 2013-06-14 01:39:30 +02:00
• 13f2c128c6 do not use string values for integers (closes foodcoops/foodsoft#128) wvengen 2013-06-14 01:33:56 +02:00
• 3a48d1576f Remove broken sort-by-price; comment redundancy of stock_change template Julius 2013-06-13 23:51:37 +02:00
• 65f61e09d5 Improve delivery workflow; introduce sortable tables; use js.erb for deliveries Julius 2013-06-13 23:33:24 +02:00
• add4afd172 make touch device events work on buttons (closes foodcoop-rostock/foodsoft#34, closes foodcoops/foodsoft#104) wvengen 2013-06-13 11:59:05 +02:00
• ca9841dd02 fixup translation string order for localeapp roundtrip wvengen 2013-06-13 00:09:04 +02:00
• e3e1b5a1b3 add start of Dutch translation wvengen 2013-06-13 00:08:15 +02:00
• d63e1f8066 translation updates previously missed wvengen 2013-06-12 23:20:02 +02:00
• 848ef67e40 update documentation urls in config after repository move wvengen 2013-06-12 22:57:44 +02:00
• a9c3d538d0 use rfc2606 compliant domains in sample config wvengen 2013-06-12 22:56:37 +02:00
• 3d1847fabb small i18n and translation updates wvengen 2013-06-12 22:37:02 +02:00
• 4037ef12da Users may delete all tasks of a group, i.e. delete the whole group. Robert Waltemath 2013-06-12 12:02:13 +02:00
• f4a0e29297 Fixed bug in with new shared multiple suppliers feature. Benjamin Meichsner 2013-06-12 10:47:54 +02:00
• 25fbb47320 Merge branch 'rails3-allow-multiple-suppliers' of git://github.com/foodcoop-rostock/foodsoft into foodcoop-rostock-rails3-allow-multiple-suppliers Benjamin Meichsner 2013-06-12 10:40:20 +02:00
• 71d8f9bde7 Fixed schema.rb. Robert Waltemath 2013-06-12 10:20:06 +02:00
• 46b07a6136 Merge remote-tracking branch 'upstream/master' into multiple-recurring-tasks Robert Waltemath 2013-06-12 10:00:11 +02:00
• 49cfa9aded Cleanup StockArticle creation during delivery Julius 2013-06-11 15:05:19 +02:00
• e28f3eda65 Fix StockArticle creation during delivery; small cleanups Julius 2013-06-11 13:10:18 +02:00
• b7f71f5859 fix reset password breakage by avoiding encoding ampersand in url (closes #123) wvengen 2013-06-11 00:01:57 +02:00
• 9753e6db00 Resolve merge conflicts with i18n Julius 2013-06-10 20:05:47 +02:00
• 6bdb7b35f0 Showing/allowing multiple suppliers per shared supplier in shared-supplier-listing. Robert Waltemath 2013-06-10 11:37:59 +02:00
• b7416b2210 Fixed percent sign in sync-view. Robert Waltemath 2013-06-10 11:01:31 +02:00
• ad29a238f2 finish English translation wvengen 2013-06-10 10:02:33 +02:00
• d9b6723975 adds infos about the new branch structure to readme Manuel Wiedenmann 2013-06-10 02:01:15 +02:00
• 7a63394dac Merge remote-tracking branch 'origin/rails3' Manuel Wiedenmann 2013-06-10 01:53:31 +02:00
• 241c5666ec Merge pull request #119 from balkansalat/rails3-improve-checkall-performance Benjamin Meichsner 2013-06-09 09:19:19 -07:00
• fd091d9b89 Merge pull request #118 from balkansalat/rails3-order-delivery-articles Benjamin Meichsner 2013-06-09 09:15:20 -07:00
• 7c4ee01ff2 Define autofill attributes when creating new supplier from shared_supplier. Benjamin Meichsner 2013-06-09 18:02:47 +02:00
• e74c6b4068 Avoid having content-length warning in dev log. Benjamin Meichsner 2013-06-09 17:33:11 +02:00
• 60afa85ece Merge pull request #116 from balkansalat/rails3-balancing-delete-article Benjamin Meichsner 2013-06-09 08:26:38 -07:00
• c8c810a0a4 added user setting to set_locale Manuel Wiedenmann 2013-06-07 19:05:28 +02:00
• 0ebe38b7a9 Merge branch 'rails3' of http://github.com/balkansalat/foodsoft into rails3-improve-checkall-performance Julius 2013-06-07 09:52:56 +02:00
• 966902ff55 Merge branch 'rails3' of http://github.com/balkansalat/foodsoft into rails3-order-delivery-articles Julius 2013-06-07 09:51:50 +02:00
• ff343933dd Merge branch 'rails3' of http://github.com/balkansalat/foodsoft into rails3-show-percent-sign-in-views Julius 2013-06-07 09:49:32 +02:00
• 0058e826b2 Reorder delivery articles Julius 2013-06-07 09:35:22 +02:00
• 0f4614eb31 Add percent sign for tax in forms Julius 2013-06-06 17:58:02 +02:00
• b8a23a396c Remove test variable Julius 2013-06-06 17:09:22 +02:00
• 0d3c23f814 Improve performance of data-check-all Julius 2013-06-06 17:06:05 +02:00
• a1a469da03 do not fail when common_deploy is not installed wvengen 2013-06-06 14:54:54 +02:00
• 0061e45198 removes routes locale constrain and fixes some bugs Manuel Wiedenmann 2013-06-06 04:29:53 +02:00
• 60c4c5510a adds a new user settings system + migration + rake task/worker updates Manuel Wiedenmann 2013-06-06 03:40:15 +02:00
• e8173d44ae adds rails-settings cached and rails-i18n-debug gems Manuel Wiedenmann 2013-06-06 03:21:44 +02:00
• 47405b5b19 fixes locales issue Manuel Wiedenmann 2013-06-06 03:18:02 +02:00
• 8929f69dc4 add missing i18n text wvengen 2013-06-06 02:42:38 +02:00
• 3d05900067 make translation roundtrip over localeapp work without changes wvengen 2013-06-06 02:23:29 +02:00
• c38ce28347 fix i18n bug wvengen 2013-06-06 02:13:40 +02:00
• fb6196b78b fix translation errors and inconsistencies between German and English wvengen 2013-06-06 01:54:50 +02:00
• 75c4e7d6f7 move English translations to single file wvengen 2013-06-06 01:33:41 +02:00
• bf94a4b472 remove superfluous newlines in German translation wvengen 2013-06-06 01:33:04 +02:00
• c4b5a658c0 move German translations to single file wvengen 2013-06-06 01:15:56 +02:00
• 82fb6d1dbe Update ordergroup prices in OrderArticles via Order. Should fix bennibu#112. Robert Waltemath 2013-05-30 10:54:22 +02:00
• 043fc6391c show header on fax PDF (closes bennibu#109) wvengen 2013-06-04 13:08:50 +02:00
• c194d2545f Allowing SharedSuppliers to have multiple Suppliers. Should fix bennibu#107. Robert Waltemath 2013-06-04 11:28:25 +02:00
• c2c1961bd0 adds i18n support to routes and application controller; default_locale is set to :en Manuel Wiedenmann 2013-05-31 18:42:28 +02:00
• 2a1176c31a Update ordergroup prices in OrderArticles via Order. Should fix bennibu#112. Robert Waltemath 2013-05-30 10:54:22 +02:00
• c42c00b5f1 adds mailcatcher to foodsoft:setup_development Manuel Wiedenmann 2013-05-29 12:35:16 +02:00
• 21c7fa40c1 adds a foodsoft:setup_development rake task Manuel Wiedenmann 2013-05-26 14:02:16 +02:00
• 2fb7797c12 readds mysql Manuel Wiedenmann 2013-05-25 20:31:15 +02:00
• ec74b642a0 adds sqlite3 to Gemfile to test deployment Manuel Wiedenmann 2013-05-25 20:16:49 +02:00
• 6b84f4f117 updates common_deploy Manuel Wiedenmann 2013-05-25 20:10:48 +02:00
• 4024329474 adds doc/DEPLOYMENT instructions Manuel Wiedenmann 2013-05-25 20:03:53 +02:00
• 92d9a57f3f adds capistrano for deployment Manuel Wiedenmann 2013-05-25 19:38:14 +02:00
• a3df346110 DEVELOPMENT typo Manuel Wiedenmann 2013-05-25 15:44:01 +02:00
• e49db90dae readme typo Manuel Wiedenmann 2013-05-25 15:05:09 +02:00
• 1f44204b58 readme updates Manuel Wiedenmann 2013-05-25 15:03:31 +02:00
• 15f1ade167 Merge branch 'rails3' into master Manuel Wiedenmann 2013-05-21 20:36:07 +02:00
• d0c74b394e i18n and translate page number text too wvengen 2013-05-20 17:14:42 +02:00
• 3b7cbf71e0 fix i18n typos wvengen 2013-05-16 00:05:47 +02:00
• 0c94ef5912 also translate mail subjects wvengen 2013-05-07 13:28:14 +02:00
• 305ae9b5c0 translate missing defaults wvengen 2013-05-07 00:15:00 +02:00
• 8b559269c9 add deliveries, pages, tasks translation in English wvengen 2013-05-06 12:43:57 +02:00
• 53d5eabf79 fix login i18n wvengen 2013-04-26 21:32:19 +02:00
• 98b729eb71 i18n SimpleForm uses AR as attribute name fallback Manuel Wiedenmann 2013-04-21 18:22:56 +07:00
• f95652c756 fix multiline i18n fields wvengen 2013-04-19 11:16:21 +02:00
• cb39a4e587 Corrects typo in en.workgroups.yml Lippe 2013-04-16 02:08:47 -04:00
• f9a87d65a7 Changes copy, grammar, typos in en.simple_form.yml Lippe 2013-04-16 02:05:58 -04:00
• ea83baa676 Changes copy, grammar, typos in en.shared.yml Lippe 2013-04-16 02:03:01 -04:00
• e7a3390371 Changes copy, grammar, typos in en.login.yml Lippe 2013-04-16 01:59:36 -04:00
• c958fe4aac Changes copy, grammar, typos in en.invites.yml Lippe 2013-04-16 01:53:36 -04:00
• c0437c5145 Changes copy, grammar, typos in en.home.yml Lippe 2013-04-16 01:50:12 -04:00
• fd8d73b768 Changes copy, grammar, typos in en.group_orders.yml Lippe 2013-04-16 01:46:17 -04:00
• ffd6da2d61 Changes copy, grammar, typos in en.foodcoop.yml Lippe 2013-04-16 01:44:04 -04:00
• df6371c4b6 Changes copy, grammar, typos in en.finance.yml Lippe 2013-04-16 01:42:45 -04:00
• c41a849be3 Changes copy, grammar, typos in en.feedback.yml Lippe 2013-04-16 01:38:35 -04:00
• 29bb2413aa Changes copy, grammar, typos in en.defaults.yml Lippe 2013-04-16 01:36:23 -04:00
• 022c26f580 Changes copy, grammar, typos in en.articles.yml Lippe 2013-04-16 01:36:01 -04:00
• 5362eab4ad Changes copy, grammar, typos in en.admin.yml Lippe 2013-04-16 01:34:57 -04:00
• 5e2a3fb3f0 fix articles controller i18n wvengen 2013-04-12 16:14:54 +02:00
• f6ba21832d Merge remote-tracking branch 'bennibu/rails3' into rails3 wvengen 2013-04-12 15:45:24 +02:00
• 70542c1ad7 update en translation wvengen 2013-04-12 01:26:26 +02:00
• ccb116f504 add documents en translation wvengen 2013-04-12 01:15:11 +02:00