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

• 1f979c3f66 Show User.display instead of User.name when showing messages Patrick Gansterer 2017-02-16 08:33:27 +01:00
• c32593d682 Merge pull request #462 from foodcoop1040/message_undeleted wvengen 2017-02-16 00:24:57 +01:00
• d48eecd6fe Send messages only to users which have not been deleted Patrick Gansterer 2017-02-15 23:47:10 +01:00
• 504c8b6192 Merge pull request #459 from foodcoop1040/smtp wvengen 2017-02-15 11:31:17 +01:00
• 12bc5f9ab7 Add documentation for receiving mails to the README of the messages plugin Patrick Gansterer 2017-02-15 10:41:03 +01:00
• 56d121e02e Fix FoodsoftConfig.each_coop after 4e35e2d Patrick Gansterer 2017-02-14 12:00:19 +01:00
• 57bfd542b4 Fix create_upcoming_periodic_tasks after 9ae7c05 Patrick Gansterer 2017-02-14 11:52:05 +01:00
• ef5b5a11a2 Add reply_email_smtp_server task Patrick Gansterer 2017-02-04 07:20:32 +01:00
• 3a49e79548 Add mini-smtp-server gem dependency Patrick Gansterer 2017-02-04 07:17:17 +01:00
• 4817ab6452 Move command line mail handling into separate function Patrick Gansterer 2017-02-04 07:16:50 +01:00
• 46275fa564 Merge pull request #458 from foodcoop1040/break wvengen 2017-02-03 23:05:22 +01:00
• d330b57b8a Merge pull request #457 from foodcoop1040/translations wvengen 2017-02-03 23:04:29 +01:00
• e0dbd396e1 Hide break in shared group template if empty Patrick Gansterer 2017-02-03 20:30:28 +01:00
• eb2fc56fc8 Fix translations of messages plugin Patrick Gansterer 2017-02-03 20:25:00 +01:00
• 571d927360 Merge pull request #454 from foodcoop1040/done wvengen 2017-01-28 17:09:34 +01:00
• 1410e242a4 Merge pull request #455 from foodcoop1040/confirm_delete wvengen 2017-01-28 17:09:13 +01:00
• a7f86dd0cd Fix UI string for confirm_delete in documents plugin Patrick Gansterer 2017-01-26 22:49:13 +01:00
• 1056b86f9d Make sure that newly created periodic task are not done Patrick Gansterer 2017-01-26 20:54:53 +01:00
• 2072fbb4d5 Allow plugins to override some document prices wvengen 2016-10-20 14:20:12 +02:00
• c6731b4e4f Add IBAN field to supplier and user model Patrick Gansterer 2017-01-18 11:12:56 +01:00
• 925727d3ae Show button for creating invoices also at finished orders Patrick Gansterer 2017-01-20 02:42:47 +01:00
• 233ed415c7 Add "Copy" button for settled orders #383 Patrick Gansterer 2017-01-20 03:53:20 +01:00
• e742958c0c Add missing German translations Patrick Gansterer 2017-01-20 02:54:45 +01:00
• 1ba84f03d5 Merge pull request #444 from foodcoop1040/docker wvengen 2016-10-15 11:43:27 +02:00
• ad2f2c5ead Add missing dependency in Dockerfile Patrick Gansterer 2016-10-14 18:08:01 +02:00
• 22aa9cd84a Fix changelog markup wvengen 2016-08-12 21:51:41 +02:00
• 7009b36a64 continue development after release wvengen 2016-08-12 16:03:48 +02:00
• a7b6b0c803 Bumped new version: 4.5.1 wvengen 2016-08-12 16:03:20 +02:00
• 36706511c0 Be a bit more safe displaying stock ordergroup wvengen 2016-08-12 15:56:45 +02:00
• d06a9ed3f0 Fix dynamic select2 usage (oops!) wvengen 2016-08-12 15:54:28 +02:00
• 326016dfb5 Fix tricky i18n error on html render (not js) wvengen 2016-08-09 20:38:55 +02:00
• bd22da50a6 Fix missing asset in wiki wvengen 2016-08-08 21:17:42 +02:00
• fc32c12ccd continue development after release wvengen 2016-06-28 20:53:21 +02:00
• bf62abefbc Bumped new version: 4.5.0 wvengen 2016-06-28 20:50:48 +02:00
• 0d309af5f6 Update translations from localeapp wvengen 2016-06-28 20:43:53 +02:00
• 402a6e4251 Update changelog wvengen 2016-06-11 20:23:59 +02:00
• 9e53b01ca3 Update Gemfile versions where it doesn't break things wvengen 2016-06-11 19:42:14 +02:00
• c2dc1d8697 Bundle update wvengen 2016-06-11 19:23:46 +02:00
• c6a625e5ed Localeapp update wvengen 2016-06-11 19:19:30 +02:00
• 30f2a4c25b Merge pull request #433 from foodcoops/feature/fix-document-preloading wvengen 2016-06-09 22:56:51 +02:00
• b9bdd04311 Fix current_order's ordergroups document preloading wvengen 2016-06-04 23:36:11 +02:00
• 5928640872 Fix current_order's order_articles preloading wvengen 2016-06-04 22:13:59 +02:00
• 78604ae09f Fix order document preloading wvengen 2016-06-04 21:58:37 +02:00
• 70c79137cf Fix order_articles document preloading wvengen 2016-06-04 21:45:24 +02:00
• 020b75cac8 Fix group_orders document preloading wvengen 2016-06-04 21:37:47 +02:00
• 0c9d20e01c Let current_order plugin play nicer with stock articles wvengen 2016-06-07 00:37:00 +02:00
• f08d131842 Fix Heroku deployment wvengen 2016-05-25 02:05:55 +02:00
• be287cf67e Fix new stock article failing wvengen 2016-05-20 21:30:56 +02:00
• f9ffa0caff Update documents plugin instructions wvengen 2016-05-06 16:48:46 +02:00
• 8bb58c5519 Add documents (merges foodcoops/foodsoft#353) Patrick Gansterer 2016-04-28 13:46:13 +02:00
• 33c9b23e2f Update installation documentation wvengen 2016-05-06 16:00:55 +02:00
• 961c50b7e5 Hide delete attachment button when none present wvengen 2016-05-06 15:56:26 +02:00
• 3e5b320a6b Merge pull request #345 from foodcoop1040/attachment wvengen 2016-05-06 15:57:05 +02:00
• 749791bb7a Add possibility to add an attachment to an invoice #345 Patrick Gansterer 2016-05-06 15:04:58 +02:00
• 8d5467ab7c Merge pull request #355 from foodcoop1040/expeted_delivery_date wvengen 2016-05-04 17:42:29 +02:00
• f286dd6053 Add pickup date Patrick Gansterer 2016-04-29 15:28:05 +02:00
• de66cd5a2b Update badge urls wvengen 2016-04-29 15:11:10 +02:00
• 86d8e90c06 Merge pull request #424 from foodcoop1040/stock_order_fixes wvengen 2016-04-29 15:06:58 +02:00
• 2e2efec5e7 Get rid of coffeescript. wvengen 2016-04-25 20:25:49 +02:00
• 483c2aba29 Fix rake in production environment wvengen 2016-04-25 09:01:19 +02:00
• 6a7b0ae409 Fix sync ignored article count wvengen 2016-04-16 21:15:53 +02:00
• 61189dc035 Bundle update wvengen 2016-04-07 16:07:58 +02:00
• 9e0ec35e9c Fix schema version (closes foodcoops/foodsoft#425) wvengen 2016-03-30 20:27:00 +02:00
• 5c56ae6775 Add missing changes for the stock order Patrick Gansterer 2016-03-11 22:52:49 +01:00
• 42eb6c8509 Make ordergroup break fields a bit nicer wvengen 2016-03-11 13:56:02 +01:00
• b067808937 Merge pull request #404 from foodcoop1040/ordergroup_break wvengen 2016-03-11 13:48:57 +01:00
• 4433a665e4 Merge pull request #421 from foodcoop1040/edit_links wvengen 2016-03-11 13:39:27 +01:00
• b8010fedca Add ordergroup_name to GroupOrder Patrick Gansterer 2016-02-25 02:08:04 +01:00
• efb929e64f Allow editing of linked deliveries and orders at invoice Patrick Gansterer 2016-03-11 13:23:13 +01:00
• 9c4d9d5c20 Add stock group order Patrick Gansterer 2016-02-25 02:27:17 +01:00
• b56df39623 Merge pull request #417 from foodcoop1040/deliveries_col wvengen 2016-03-11 11:53:40 +01:00
• 253512eb51 Add break to ordergroup Patrick Gansterer 2016-03-04 17:07:24 +01:00
• 14e2fd179e Merge pull request #403 from foodcoops/feature/402-messagegroups wvengen 2016-03-07 22:36:37 +01:00
• 80ab359860 Correct messages i18n wvengen 2016-03-07 22:17:18 +01:00
• 5d9e1845b7 Fix i18n key typo wvengen 2016-03-07 21:06:49 +01:00
• a0358aab01 Merge pull request #420 from foodcoop1040/wiki_diff wvengen 2016-03-07 20:23:09 +01:00
• 8545190a84 Merge pull request #419 from foodcoop1040/wiki wvengen 2016-03-07 20:22:32 +01:00
• d358278333 Merge pull request #416 from foodcoop1040/invite_config wvengen 2016-03-07 19:47:00 +01:00
• 0b70ce39a8 Merge pull request #414 from foodcoop1040/ftc wvengen 2016-03-07 19:45:45 +01:00
• cb8205e4de Merge pull request #413 from foodcoop1040/error_translations wvengen 2016-03-07 19:44:29 +01:00
• b4e2ddf66d Merge pull request #412 from foodcoop1040/confirm wvengen 2016-03-07 19:44:06 +01:00
• 58e84b8923 Merge pull request #411 from foodcoop1040/invoice_total wvengen 2016-03-07 19:42:38 +01:00
• 7aacc7fef6 Fix German ui.* translations Patrick Gansterer 2016-03-07 15:21:03 +01:00
• ad036c948f Add diff for wiki pages Patrick Gansterer 2016-03-06 21:05:06 +01:00
• bd2c961e23 Improve sorting of wiki pages Patrick Gansterer 2016-03-06 18:32:46 +01:00
• 7d7dfd7155 Hide deliveries column if there are no deliveries Patrick Gansterer 2016-03-06 14:01:24 +01:00
• e16a0fb336 Add config option to disable the invites Patrick Gansterer 2016-03-06 13:56:33 +01:00
• a5d0c5ccab Add a button to add all ordergroups to a new finanacial transaction collection Patrick Gansterer 2016-03-06 11:53:31 +01:00
• f24a18371e Add missing German translations for error messages Patrick Gansterer 2016-03-04 23:23:56 +01:00
• c62104a388 Get rid of duplicated confirm_delete translations Patrick Gansterer 2016-03-04 23:13:28 +01:00
• 5e744453f8 Add more infos to the invoice page Patrick Gansterer 2016-03-04 22:26:55 +01:00
• f5b6fbcf18 Merge pull request #408 from foodcoop1040/count_to_any wvengen 2016-03-04 21:37:21 +01:00
• 50e6c9f88b Merge pull request #409 from foodcoop1040/confirm wvengen 2016-03-04 21:37:03 +01:00
• e5db84b17c Merge pull request #410 from foodcoop1040/user_count wvengen 2016-03-04 21:36:35 +01:00
• 294d14624c Count only undeleted users for the user_count expansion varibale Patrick Gansterer 2016-03-04 20:47:49 +01:00
• 0fc80a1ef5 Rename translation "admin.confirm" to "ui.confirm_delete" Patrick Gansterer 2016-03-04 20:10:11 +01:00
• 1efd3745df Replace "count > 0" with "any?" Patrick Gansterer 2016-03-04 17:39:06 +01:00
• 97f81d9826 Merge pull request #406 from foodcoop1040/delete_user wvengen 2016-03-04 19:12:04 +01:00
• b623b6abbf Remove useless if in invoices form Patrick Gansterer 2016-03-04 17:31:41 +01:00
• b05ac2ab64 Add deleted_at for User Patrick Gansterer 2016-03-04 19:03:52 +01:00