Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Intake revisited #10466

Merged
merged 49 commits into from
Jul 15, 2024
Merged

chore: Intake revisited #10466

merged 49 commits into from
Jul 15, 2024

Commits on Jun 19, 2024

  1. New category 

    Might need some cleanup to have a better matching
    @aleene
    aleene committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    ea1d365 View commit details
    Browse the repository at this point in the history

  2. typo

    @aleene
    aleene committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    b34e5ed View commit details
    Browse the repository at this point in the history

  3. strange parent

    @aleene
    aleene committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    8882390 View commit details
    Browse the repository at this point in the history

  4. repaired parents

    @aleene
    aleene committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    b6065cd View commit details
    Browse the repository at this point in the history

  5. new milk parent 

    Needed to split liquid and powdered milk
    @aleene
    aleene committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    b9b32ed View commit details
    Browse the repository at this point in the history

  6. repaired and added

    @aleene
    aleene committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    b5c82a0 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2024

  1. nut milks

    @aleene
    aleene committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    1c0b04a View commit details
    Browse the repository at this point in the history

  2. Drinkable yogurts

    @aleene
    aleene committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    e430f48 View commit details
    Browse the repository at this point in the history

  3. Plain yogurts

    @aleene
    aleene committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    277cfed View commit details
    Browse the repository at this point in the history

  4. repaired parent

    @aleene
    aleene committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    b5a42a8 View commit details
    Browse the repository at this point in the history

  5. repaired orphan

    @aleene
    aleene committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    72ecbb8 View commit details
    Browse the repository at this point in the history

  6. repaired orphan

    @aleene
    aleene committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    912b0cf View commit details
    Browse the repository at this point in the history

  7. repaired orphan

    @aleene
    aleene committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    6f82f3b View commit details
    Browse the repository at this point in the history

  8. Yaourts à la grecque natures ou aromatisés

    @aleene
    aleene committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    ec01bd5 View commit details
    Browse the repository at this point in the history

  9. Yaourts aux fruits/aromatisés

    @aleene
    aleene committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    edc7996 View commit details
    Browse the repository at this point in the history

  10. Multifruit yoghurts 

    english translation
    @aleene
    aleene committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    6412ed0 View commit details
    Browse the repository at this point in the history

  11. test repair

    @aleene
    aleene committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    320a8a4 View commit details
    Browse the repository at this point in the history

  12. test update

    @aleene
    aleene committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    471ae22 View commit details
    Browse the repository at this point in the history

  13. en:Yogurts

    @aleene
    aleene committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    8ae34fe View commit details
    Browse the repository at this point in the history

  14. Yaourts & desserts végétaux

    @aleene
    aleene committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    0024f08 View commit details
    Browse the repository at this point in the history

  15. intake category created

    @aleene
    aleene committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    833acf8 View commit details
    Browse the repository at this point in the history

  16. New category Entremets - mousses and creamy puddings 

    Is defined as a parallel category. i.e. not within the existing branch,
    @aleene
    aleene committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    f04202d View commit details
    Browse the repository at this point in the history

  17. added translation 

    en:Fromages blancs - petit suisses and skyr
    @aleene
    aleene committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    9fde8d7 View commit details
    Browse the repository at this point in the history

  18. Produits laitiers & spécialités laitières

    @aleene
    aleene committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    6dae00f View commit details
    Browse the repository at this point in the history

  19. Burgers végétariens

    @aleene
    aleene committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    09f0fee View commit details
    Browse the repository at this point in the history

  20. Beignets de légumes

    @aleene
    aleene committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    f3dcf89 View commit details
    Browse the repository at this point in the history

  21. Vegetarian hamburgers 

    corrected the parent to meat alternatives. Better meat substitutes?
    @aleene
    aleene committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    26a849b View commit details
    Browse the repository at this point in the history

  22. Substituts végétariens à la viande

    @aleene
    aleene committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    d5d042e View commit details
    Browse the repository at this point in the history

  23. test update

    @aleene
    aleene committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    5c10cd5 View commit details
    Browse the repository at this point in the history

  24. Merge branch 'main' into aleene-intake-revisited

    @aleene
    aleene committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    2938503 View commit details
    Browse the repository at this point in the history

  25. revert test change

    @aleene
    aleene committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    76e1afb View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. test

    @aleene
    aleene committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    32135d2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into aleene-intake-revisited

    @aleene
    aleene committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    6a49c8e View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2024

  1. Plats à base de haricots

    @aleene
    aleene committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    42a1973 View commit details
    Browse the repository at this point in the history

  2. Plats à base de légumes ou végétariens

    @aleene
    aleene committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    57f16e4 View commit details
    Browse the repository at this point in the history

  3. Plant-based meals

    @aleene
    aleene committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    d77e84f View commit details
    Browse the repository at this point in the history

  4. Tomates

    @aleene
    aleene committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    5603464 View commit details
    Browse the repository at this point in the history

  5. Maïs

    @aleene
    aleene committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    691d67d View commit details
    Browse the repository at this point in the history

  6. Rutabaga / navet

    @aleene
    aleene committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    40cf819 View commit details
    Browse the repository at this point in the history

  7. Epinards

    @aleene
    aleene committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    7b7ce02 View commit details
    Browse the repository at this point in the history

  8. Salades

    @aleene
    aleene committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    9b265c5 View commit details
    Browse the repository at this point in the history

  9. Poivrons

    @aleene
    aleene committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    4055d0d View commit details
    Browse the repository at this point in the history

  10. Cornichons, câpres & piments 

    Definition must be better set
    @aleene
    aleene committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    f8e7cc9 View commit details
    Browse the repository at this point in the history

  11. Coleslaw

    @aleene
    aleene committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    bf876b8 View commit details
    Browse the repository at this point in the history

  12. Betterave

    @aleene
    aleene committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    3a420aa View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. update tests

    @stephanegigandet
    stephanegigandet committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    e8d4604 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2024

  1. merge, update tests

    @stephanegigandet
    stephanegigandet committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    2709c23 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. merge, update tests

    @stephanegigandet
    stephanegigandet committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    96299d9 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. merged main, fixed conflicts

    @stephanegigandet
    stephanegigandet committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    592fb4d View commit details
    Browse the repository at this point in the history