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

unify categories #25269

Closed
wants to merge 108 commits into from
Closed

unify categories #25269

wants to merge 108 commits into from

Commits on Jul 4, 2023

  1. unify categories

    @frederic34
    frederic34 committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    2e14655 View commit details
    Browse the repository at this point in the history

  2. unify categories 

    unify categories

unify categories
    @frederic34
    frederic34 committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    f1cdfef View commit details
    Browse the repository at this point in the history

  3. unify categories

    @frederic34
    frederic34 committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    8177758 View commit details
    Browse the repository at this point in the history

  4. unify categories

    @frederic34
    frederic34 committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    d65ac69 View commit details
    Browse the repository at this point in the history

  5. unify categories

    @frederic34
    frederic34 committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    f5b3fee View commit details
    Browse the repository at this point in the history

  6. unify categories

    @frederic34
    frederic34 committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    be7b6b2 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2023

  1. unify categories

    @frederic34
    frederic34 committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    d4cf3a4 View commit details
    Browse the repository at this point in the history

  2. unify categories

    @frederic34
    frederic34 committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    b46a48d View commit details
    Browse the repository at this point in the history

  3. unify categories

    @frederic34
    frederic34 committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    b48eb4d View commit details
    Browse the repository at this point in the history

  4. unify categories

    @frederic34
    frederic34 committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    4e2c53f View commit details
    Browse the repository at this point in the history

  5. unify categories

    @frederic34
    frederic34 committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    d39dd4b View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2023

  1. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    79b3ee8 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2023

  1. wip

    @frederic34
    frederic34 committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    a6e00a1 View commit details
    Browse the repository at this point in the history

  2. wip unify categories

    @frederic34
    frederic34 committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    bf7b40f View commit details
    Browse the repository at this point in the history

  3. unify categories

    @frederic34
    frederic34 committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    b564b68 View commit details
    Browse the repository at this point in the history

  4. unify categories

    @frederic34
    frederic34 committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    184b033 View commit details
    Browse the repository at this point in the history

  5. fetch data from llx_element_category

    @frederic34
    frederic34 committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    6a446bd View commit details
    Browse the repository at this point in the history

  6. fetch data from llx_element_category

    @frederic34
    frederic34 committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    3e331ea View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2023

  1. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    c25dbee View commit details
    Browse the repository at this point in the history

  2. sql changes

    @frederic34
    frederic34 committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    cf56f0a View commit details
    Browse the repository at this point in the history

  3. sql changes

    @frederic34
    frederic34 committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    eb229ae View commit details
    Browse the repository at this point in the history

  4. sql changes

    @frederic34
    frederic34 committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    265f2b8 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2023

  1. sql changes

    @frederic34
    frederic34 committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    2f7f28e View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2023

  1. wip

    @frederic34
    frederic34 committed Jul 16, 2023
    Configuration menu
    Copy the full SHA
    ca46bf0 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2023

  1. wip

    @frederic34
    frederic34 committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    b30204c View commit details
    Browse the repository at this point in the history

  2. Fix php 8 list.php (Dolibarr#25363)

    @ptibogxiv @frederic34
    ptibogxiv authored and frederic34 committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    cf9df40 View commit details
    Browse the repository at this point in the history

  3. Add missing Canadian territories (Dolibarr#25364)

    @mc2contributor @frederic34
    mc2contributor authored and frederic34 committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    97a20bb View commit details
    Browse the repository at this point in the history

  4. Add 'name' property for fetching user's name (Dolibarr#25359) 

    wip
    @mc2contributor @frederic34
    mc2contributor authored and frederic34 committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    3b6964c View commit details
    Browse the repository at this point in the history

  5. wip

    @frederic34
    frederic34 committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    d366102 View commit details
    Browse the repository at this point in the history

  6. wip

    @frederic34
    frederic34 committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    b1ff766 View commit details
    Browse the repository at this point in the history

  7. wip

    @frederic34
    frederic34 committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    a02dc90 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. wip

    @frederic34
    frederic34 committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    7c00e34 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    7172c65 View commit details
    Browse the repository at this point in the history

  3. wip

    @frederic34
    frederic34 committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    1539510 View commit details
    Browse the repository at this point in the history

  4. wip

    @frederic34
    frederic34 committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    a8d8429 View commit details
    Browse the repository at this point in the history

  5. wip

    @frederic34
    frederic34 committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    f277bcb View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. wip

    @frederic34
    frederic34 committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    067b9df View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    893cca9 View commit details
    Browse the repository at this point in the history

  3. fix merge

    @frederic34
    frederic34 committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    971eebe View commit details
    Browse the repository at this point in the history

  4. wip

    @frederic34
    frederic34 committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    d878ce0 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2023

  1. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    e437171 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. wip

    @frederic34
    frederic34 committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    54c3a9d View commit details
    Browse the repository at this point in the history

  2. wip

    @frederic34
    frederic34 committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    903da7b View commit details
    Browse the repository at this point in the history

  3. wip

    @frederic34
    frederic34 committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    dd8c5f5 View commit details
    Browse the repository at this point in the history

  4. wip

    @frederic34
    frederic34 committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    dec2fe8 View commit details
    Browse the repository at this point in the history

  5. wip

    @frederic34
    frederic34 committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    3dcfa66 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2023

  1. wip

    @frederic34
    frederic34 committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    088f8c1 View commit details
    Browse the repository at this point in the history

  2. wip

    @frederic34
    frederic34 committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    b87cd20 View commit details
    Browse the repository at this point in the history

  3. wip

    @frederic34
    frederic34 committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    7bf9bec View commit details
    Browse the repository at this point in the history

  4. wip

    @frederic34
    frederic34 committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    658b55b View commit details
    Browse the repository at this point in the history

  5. wip

    @frederic34
    frederic34 committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    1da39b6 View commit details
    Browse the repository at this point in the history

  6. wip

    @frederic34
    frederic34 committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    150a593 View commit details
    Browse the repository at this point in the history

  7. wip

    @frederic34
    frederic34 committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    cc4c5a8 View commit details
    Browse the repository at this point in the history

  8. wip

    @frederic34
    frederic34 committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    71c74c3 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    ed4e2fe View commit details
    Browse the repository at this point in the history

  10. wip

    @frederic34
    frederic34 committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    d17e7e2 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2023

  1. wip

    @frederic34
    frederic34 committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    55a8a86 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    d04f849 View commit details
    Browse the repository at this point in the history

  3. wip

    @frederic34
    frederic34 committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    2579200 View commit details
    Browse the repository at this point in the history

  4. wip

    @frederic34
    frederic34 committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    a062306 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2023

  1. wip

    @frederic34
    frederic34 committed Jul 29, 2023
    Configuration menu
    Copy the full SHA
    7068b74 View commit details
    Browse the repository at this point in the history

  2. wip

    @frederic34
    frederic34 committed Jul 29, 2023
    Configuration menu
    Copy the full SHA
    530e514 View commit details
    Browse the repository at this point in the history

  3. wip

    @frederic34
    frederic34 committed Jul 29, 2023
    Configuration menu
    Copy the full SHA
    48cfc9b View commit details
    Browse the repository at this point in the history

  4. wip

    @frederic34
    frederic34 committed Jul 29, 2023
    Configuration menu
    Copy the full SHA
    f2ff06a View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    0c64666 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    05a0fd1 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2023

  1. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    bd0f9f5 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2023

  1. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Aug 5, 2023
    Configuration menu
    Copy the full SHA
    a01e8b4 View commit details
    Browse the repository at this point in the history

  2. fix redeclare

    @frederic34
    frederic34 committed Aug 5, 2023
    Configuration menu
    Copy the full SHA
    ae229a5 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Aug 5, 2023
    Configuration menu
    Copy the full SHA
    b5d5815 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2023

  1. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Aug 6, 2023
    Configuration menu
    Copy the full SHA
    a2e9182 View commit details
    Browse the repository at this point in the history

  2. wip

    @frederic34
    frederic34 committed Aug 6, 2023
    Configuration menu
    Copy the full SHA
    5938f9b View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2023

  1. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    948ee15 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. Merge remote-tracking branch 'origin/unify_all_categories' into unify… 

    …_all_categories
    @frederic34
    frederic34 committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    d3fb92e View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    cb99d6d View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2023

  1. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    da4dec4 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    19d54cc View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    2ea448e View commit details
    Browse the repository at this point in the history

  4. remove debug

    @frederic34
    frederic34 committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    a579c5d View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2023

  1. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    b1a4ff8 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/unify_all_categories' into unify… 

    …_all_categories
    @frederic34
    frederic34 committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    17017f6 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2023

  1. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    5ffa8e2 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    dada111 View commit details
    Browse the repository at this point in the history

  3. fix tabs

    @frederic34
    frederic34 committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    7be4947 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    6a716a0 View commit details
    Browse the repository at this point in the history

  5. fix

    @frederic34
    frederic34 committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    f21e871 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    5b433d3 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    b5f920a View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'origin/unify_all_categories' into unify… 

    …_all_categories
    @frederic34
    frederic34 committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    03e2919 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2023

  1. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Aug 12, 2023
    Configuration menu
    Copy the full SHA
    0c695f9 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2023

  1. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    ceb96c8 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2023

  1. Merge branch 'develop' into unify_all_categories

    @frederic34
    frederic34 committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    846fb18 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2023

  1. Merge remote-tracking branch 'origin/unify_all_categories' into unify… 

    …_all_categories
    @frederic34
    frederic34 committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    9e9b317 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    27840ff View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2023

  1. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    882952c View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/unify_all_categories' into unify… 

    …_all_categories
    @frederic34
    frederic34 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    f13234e View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2023

  1. Merge remote-tracking branch 'upstream/develop' into unify_all_catego… 

    …ries
    @frederic34
    frederic34 committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    06265d9 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/unify_all_categories' into unify… 

    …_all_categories
    @frederic34
    frederic34 committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    0a889f7 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2023

  1. phpcs

    @frederic34
    frederic34 committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    a174509 View commit details
    Browse the repository at this point in the history

  2. phpcs

    @frederic34
    frederic34 committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    577ba95 View commit details
    Browse the repository at this point in the history

  3. try to fix

    @frederic34
    frederic34 committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    81b73c5 View commit details
    Browse the repository at this point in the history

  4. try to fix

    @frederic34
    frederic34 committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    53c3ae7 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2023

  1. fix

    @frederic34
    frederic34 committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    4d8e819 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2023

  1. Merge branch 'develop' into unify_all_categories

    @frederic34
    frederic34 committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    ea16044 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2023

  1. Merge branch 'develop' into unify_all_categories

    @frederic34
    frederic34 committed Sep 9, 2023
    Configuration menu
    Copy the full SHA
    d88af85 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2023

  1. Merge branch 'develop' into unify_all_categories

    @frederic34
    frederic34 committed Sep 10, 2023
    Configuration menu
    Copy the full SHA
    9fd2e6a View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2023

  1. fix phpcs

    @frederic34
    frederic34 committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    a52a6ad View commit details
    Browse the repository at this point in the history

  2. fix phpcs

    @frederic34
    frederic34 committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    0eab784 View commit details
    Browse the repository at this point in the history