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

• 569cdce2db finish finance controller i18n wvengen 2013-02-22 00:44:39 +01:00
• 922a6f3a2a finish navigation i18n wvengen 2013-02-22 00:37:17 +01:00
• 8043fd2164 finish foodcoop i18n + controller + model wvengen 2013-02-22 00:19:22 +01:00
• fe632abf2c Fixed missing recipients when Message.send_emails. Benjamin Meichsner 2013-02-17 22:04:08 +01:00
• 7ca561a17a Installed rdoc to avoid messages in rake tasks. Benjamin Meichsner 2013-02-17 22:01:48 +01:00
• 16ba5fa0ca Comment out rake/rdoctask due to rake update. Benjamin Meichsner 2013-02-17 21:29:48 +01:00
• 35dbb58e67 Damn'it. Forget to update environment file after rails update. Benjamin Meichsner 2013-02-17 21:19:03 +01:00
• 6a0bab58f1 Temporairly deactivated ruby spec in Gemfile. Benjamin Meichsner 2013-02-17 21:01:08 +01:00
• ccdf3c0bf1 Updated rails to 2.3.17. Benjamin Meichsner 2013-02-17 21:00:12 +01:00
• c69a559dc4 add en translation stock_takings wvengen 2013-02-13 23:17:28 +01:00
• c693f697ff workgroups i18n wvengen 2013-02-13 01:32:48 +01:00
• 02f04be6e8 finish stock_takings i18n + controller wvengen 2013-02-13 01:18:50 +01:00
• 1cb933240b improve translations wvengen 2013-02-13 00:53:36 +01:00
• b59244783e initial en translation of simple_form, stockit wvengen 2013-02-13 00:38:41 +01:00
• d88a9757ca improve translations wvengen 2013-02-12 00:25:54 +01:00
• 734179a2bd clarify group_orders i18n wvengen 2013-02-12 00:05:27 +01:00
• dea0d9e215 initial en translation of layouts, mailer, ordergroups, shared wvengen 2013-02-11 23:44:36 +01:00
• cb2c724abd fix typo wvengen 2013-02-11 23:37:52 +01:00
• 20533a5163 fix orders i18n wvengen 2013-02-11 15:33:37 +01:00
• a0a974b9ce finish stockit i18n + controllers + model wvengen 2013-02-11 11:19:26 +01:00
• 0065c44b74 i18n finance ordergroups Manuel Wiedenmann 2013-02-11 10:15:40 +07:00
• d2cd5b2b02 i18n group order articles Manuel Wiedenmann 2013-02-11 10:07:53 +07:00
• 640e9799aa i18n financial_transactions + controller Manuel Wiedenmann 2013-02-11 09:57:33 +07:00
• 8722a5ed36 small en translation updates wvengen 2013-02-11 02:20:14 +01:00
• 471405ae21 improve translations wvengen 2013-02-11 02:06:22 +01:00
• df58bf0f18 add translations to en wvengen 2013-02-11 02:05:53 +01:00
• 8be93c33f8 i18n finance + controller Manuel Wiedenmann 2013-02-10 15:05:20 +07:00
• 2d58054d1c added order for interpolation Manuel Wiedenmann 2013-02-09 18:18:07 +07:00
• 22b3f3a491 fix bug in javascript i18n wvengen 2013-02-09 10:19:48 +01:00
• 36b18bcfbd finish messages i18n + controller + model wvengen 2013-02-09 10:13:56 +01:00
• 5941bbbf4f i18n feedback + controller Manuel Wiedenmann 2013-02-09 13:01:44 +07:00
• 6a564f0a25 admin controllers Manuel Wiedenmann 2013-02-09 12:47:21 +07:00
• 8d899581bd finish group_orders i18n + controller wvengen 2013-02-09 02:01:31 +01:00
• 28c66642f5 finish shared i18n wvengen 2013-02-08 19:16:06 +01:00
• e06524ca37 finish ordergroups and orders i18n + controller wvengen 2013-02-08 01:52:20 +01:00
• d818ea5d53 finish suppliers controller I18n wvengen 2013-02-08 00:31:09 +01:00
• eb1e02015e finish suppliers i18n wvengen 2013-02-07 16:30:47 +01:00
• 27b488a926 fix whitespace characters in translation wvengen 2013-02-07 02:35:46 +01:00
• e3cf3f4839 improve translations wvengen 2013-02-07 00:58:42 +01:00
• 98ef93c74f add admin, invites and session translations to en wvengen 2013-02-07 00:47:26 +01:00
• de730808e7 finish mailer i18n wvengen 2013-02-06 00:50:59 +01:00
• b12a906a74 finish login i18n + controller wvengen 2013-02-05 12:54:55 +01:00
• 419f5ef0ad fix layouts i18n wvengen 2013-02-05 12:43:21 +01:00
• c5de69bfc5 typo wvengen 2013-02-05 12:30:44 +01:00
• 39812bef99 finish layouts i18n, use help url from config, use html language from locale wvengen 2013-02-05 12:11:29 +01:00
• 5b53749fe6 fix small format bug in template wvengen 2013-02-04 13:13:04 +01:00
• ecce8041a1 invites controller i18n wvengen 2013-02-04 13:00:34 +01:00
• 034f6a8f5c finish invites i18n wvengen 2013-02-04 12:59:04 +01:00
• 9138f0da03 also internationalize home controller wvengen 2013-02-04 02:12:24 +01:00
• 1860e1c4cc also internationalize sessions controller wvengen 2013-02-04 02:00:27 +01:00
• 0c09696b2c finish sessions i18n wvengen 2013-02-04 01:46:07 +01:00
• 2b11549d33 finished home i18n wvengen 2013-02-04 00:46:22 +01:00
• 22e7f6a9cf update comment wvengen 2013-02-04 00:45:31 +01:00
• 3c70f5e702 de.admin.yml cleanup Manuel Wiedenmann 2013-02-04 01:42:01 +07:00
• 64b3d7e17d finished admin/users i18n + dry the admin i18n Manuel Wiedenmann 2013-02-04 01:38:18 +07:00
• 75c9338fd9 finished admin/workgroups i18n Manuel Wiedenmann 2013-02-04 00:36:03 +07:00
• e949257912 finished admin/ordergroups i18n Manuel Wiedenmann 2013-02-04 00:10:11 +07:00
• 42c97520a1 started with admin views Manuel Wiedenmann 2013-02-03 23:16:42 +07:00
• e0b781fca6 split locales into directory, and load from there wvengen 2013-02-01 17:56:34 +01:00
• afda844380 initial English locale translation wvengen 2013-01-31 11:03:32 +01:00
• a511da9ae3 Prevent stock_articles from appearing in supplier article index Julius 2013-01-30 21:21:49 +01:00
• 2c9fdcd79e Show customer number in fax pdf Julius 2013-01-30 19:46:18 +01:00
• 11aeed2f54 Merge branch 'rails3-fix-empty-dd' of http://github.com/balkansalat/foodsoft into rails3-fix-empty-dd Julius 2013-01-29 18:05:14 +01:00
• 8c7a4f0331 Fix empty dd in horizontal dl Julius 2013-01-29 17:52:44 +01:00
• 00d2847f9d Merge pull request #28 from JuliusR/rails3 JuliusR 2013-01-28 11:51:32 -08:00
• 396a47b6af Improve stock_article_selections Julius 2013-01-28 20:46:35 +01:00
• 524819b86f Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3 Julius 2013-01-27 22:01:53 +01:00
• 8b2b70f8bf Fixed saving user for new orders. Benjamin Meichsner 2013-01-26 16:24:45 +01:00
• 44ef0a9807 Added bullet gem to track unusued eager loading. Benjamin Meichsner 2013-01-26 16:16:50 +01:00
• 0683738003 Removed html ids from navigation. Benjamin Meichsner 2013-01-26 16:16:06 +01:00
• 04b611a080 Temporairly deactivated helper in new delivery form. Benjamin Meichsner 2013-01-26 15:57:29 +01:00
• 310a97912c Fixed disabling submit_button in group order form. Benjamin Meichsner 2013-01-26 15:41:46 +01:00
• 3ab3ff2bc4 Minor speed improvements for group order load. Benjamin Meichsner 2013-01-26 15:18:35 +01:00
• 2a66d37c3a Fixed wrong start balance in new group order. Benjamin Meichsner 2013-01-26 15:17:56 +01:00
• ce0300df43 Fix order.created_by Julius 2013-01-12 16:24:13 +01:00
• 099e2b9b06 Add stock_article_selection (deleting multiple stock articles at once) Julius 2013-01-12 16:14:06 +01:00
• ecb7ce7cd3 Remove secret_token.rb from git's tracked files Julius 2013-01-12 16:11:07 +01:00
• a4474213be tell git to ignore secret_token.rb Julius 2013-01-12 16:04:00 +01:00
• 65f9fe3392 Updated rails to version 3.2.11 Benjamin Meichsner 2013-01-11 11:56:47 +01:00
• 1fe141175c Fixed multicoops and resque rake tasks. Benjamin Meichsner 2013-01-07 13:44:46 +01:00
• 0364562273 Fixed return_to when authorization gets lost. benni 2012-12-30 16:34:01 +01:00
• f6ff422405 Fixed missing line breaks in haml email templates. benni 2012-12-30 16:24:36 +01:00
• 349cadd5e9 Renabled mail delivering in invites and login contrller. benni 2012-12-30 16:11:35 +01:00
• 9db5a2fa14 Fixed apple calcualtion issue on fresh coop installations. benni 2012-12-30 15:32:22 +01:00
• 28aec7e4d6 Replace ordergroup.account_updated with non database attr. benni 2012-12-30 15:31:37 +01:00
• a489079334 Fixed wrong request method in deny_access. benni 2012-12-30 15:13:50 +01:00
• 9e228085df Added rake tasks for restarting resque workers. benni 2012-12-30 14:47:02 +01:00
• ba75a6e328 Fixed accidently switching to english locale in production. benni 2012-12-29 17:47:35 +01:00
• cd583cc9b2 Set host infos for urls in emails via app_config. benni 2012-12-28 13:55:18 +01:00
• db07b28b1c Fixed bug in accessing foodsoft config. benni 2012-12-28 13:28:03 +01:00
• e509e28fd0 Force access over ssl in production mode. benni 2012-12-26 14:12:48 +01:00
• d347e2404b Added whenever to manage cronjobs. benni 2012-12-26 14:03:35 +01:00
• 9ad77f5256 Add rake task helper for single coop. benni 2012-12-24 12:50:37 +01:00
• 2c0fe08be6 Replaced delayed_job with resque. See README_DEVEL benni 2012-12-23 17:38:04 +01:00
• 344abf5a26 Deployment stuff. Ignore capistrano. Faster precompiling. benni 2012-12-22 18:38:49 +01:00
• b9138efa79 Fixed floating error in group_order new. benni 2012-12-22 14:42:19 +01:00
• d954279d6a Show accept/reject button in task show view. benni 2012-12-22 14:29:59 +01:00
• 807d476e44 Fixed missing scoping by ordergroup in financial index. benni 2012-12-22 14:23:58 +01:00
• 1298af8377 Small improvement for update price. Removed delayed job. benni 2012-12-16 21:46:24 +01:00
• 0dff5ea784 Fixed some bugs in tasks, apple feature: benni 2012-12-16 19:03:04 +01:00