diff --git a/README.md b/README.md index 8eb17918..ccaa4db3 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ State of this Fork disussion [#956](https://github.com/foodcoops/foodsoft/issues/956) 1. Javascript Importmap * [x] [fork](https://git.local-it.org/Foodsoft/foodsoft/src/branch/9_rails_v_7_js_importmap) - * [ ] upstream + * [x] upstream #### Article Order Import/Export @@ -75,10 +75,10 @@ Updating Articles from large resellers and exporting orders is now much easier! 1. Richtext editor for messages. Also allows sending attachements. * [x] [fork](https://git.local-it.org/Foodsoft/foodsoft/src/branch/16_html_message_templates) - * [ ] upstream + * [x] upstream 1. Show the sum of all order group balances * [x] [fork](https://git.local-it.org/Foodsoft/foodsoft/src/branch/47_finance_ordergroup_sums) - * [ ] upstream + * [x] upstream 1. UI improvements for group order view * [x] [fork](https://git.local-it.org/Foodsoft/foodsoft/src/branch/uxui_group_order) * [ ] upstream