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

[NEW] [ENTERPRISE] Omnichannel queue priorities #17141

Merged
merged 44 commits into from
Apr 21, 2020
Merged

[NEW] [ENTERPRISE] Omnichannel queue priorities #17141

merged 44 commits into from
Apr 21, 2020

Commits on Mar 25, 2020

  1. .

    @renatobecker
    renatobecker committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    e49a65e View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2020

  1. Merge branch 'develop' into omnichannel/add-omnichannel-priority-feature

    @renatobecker
    renatobecker committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    f4c773c View commit details
    Browse the repository at this point in the history

  2. Fix lint errors.

    @renatobecker
    renatobecker committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    1b39146 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2020

  1. Add input color

    @MarcosSpessatto
    MarcosSpessatto committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    33d6b62 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2020

  1. wip: priorities

    @MarcosSpessatto
    MarcosSpessatto committed Apr 4, 2020
    Configuration menu
    Copy the full SHA
    088137d View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2020

  1. Add priority to omnichannel rooms

    @MarcosSpessatto
    MarcosSpessatto committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    3fb0180 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into omnichannel/add-omnichannel-priority-feature

    @MarcosSpessatto
    MarcosSpessatto authored Apr 7, 2020
    Configuration menu
    Copy the full SHA
    ee89fdd View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into omnichannel/add-omnichannel-priority-feature

    @MarcosSpessatto
    MarcosSpessatto committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    4054d5b View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/omnichannel/add-omnichannel-prio… 

    …rity-feature' into omnichannel/add-omnichannel-priority-feature
    @MarcosSpessatto
    MarcosSpessatto committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    caf23b3 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2020

  1. Apply suggestions from review

    @MarcosSpessatto
    MarcosSpessatto committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    78d0c35 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into omnichannel/add-omnichannel-priority-feature

    @MarcosSpessatto
    MarcosSpessatto authored Apr 8, 2020
    Configuration menu
    Copy the full SHA
    3f869e6 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2020

  1. Merge branch 'develop' into omnichannel/add-omnichannel-priority-feature

    @MarcosSpessatto
    MarcosSpessatto committed Apr 13, 2020
    Configuration menu
    Copy the full SHA
    b347077 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/omnichannel/add-omnichannel-prio… 

    …rity-feature' into omnichannel/add-omnichannel-priority-feature
    @MarcosSpessatto
    MarcosSpessatto committed Apr 13, 2020
    Configuration menu
    Copy the full SHA
    610d15a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into omnichannel/add-omnichannel-priority-feature

    @MarcosSpessatto
    MarcosSpessatto committed Apr 13, 2020
    Configuration menu
    Copy the full SHA
    3f01696 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2020

  1. Merge branch 'develop' into omnichannel/add-omnichannel-priority-feature

    @MarcosSpessatto
    MarcosSpessatto authored Apr 14, 2020
    Configuration menu
    Copy the full SHA
    9a061d7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into omnichannel/add-omnichannel-priority-feature

    @renatobecker
    renatobecker authored Apr 14, 2020
    Configuration menu
    Copy the full SHA
    8056e68 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2020

  1. Regression: Remove avatar color stuff.

    @renatobecker
    renatobecker committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    b074adb View commit details
    Browse the repository at this point in the history

  2. Remove custom avatar color stuff.

    @renatobecker
    renatobecker committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    213bb69 View commit details
    Browse the repository at this point in the history

  3. Remove unnecessary model updates.

    @renatobecker
    renatobecker committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    20162e1 View commit details
    Browse the repository at this point in the history

  4. Remove unused imports.

    @renatobecker
    renatobecker committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    a62b7ee View commit details
    Browse the repository at this point in the history

  5. Comment import.

    @renatobecker
    renatobecker committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    4be9de5 View commit details
    Browse the repository at this point in the history

  6. Update priority info into Rooms and Inquiries.

    @renatobecker
    renatobecker committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    996975e View commit details
    Browse the repository at this point in the history

  7. Add async statement.

    @renatobecker
    renatobecker committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    a5ae5eb View commit details
    Browse the repository at this point in the history

  8. Fetch priority over REST API.

    @renatobecker
    renatobecker committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    5b18819 View commit details
    Browse the repository at this point in the history

  9. Fix models.

    @renatobecker
    renatobecker committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    89be42f View commit details
    Browse the repository at this point in the history

  10. Fix enterprise templates.

    @renatobecker
    renatobecker committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    ed1c16d View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2020

  1. Add new methods to update inquiry Priorities.

    @renatobecker
    renatobecker committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    00e9e61 View commit details
    Browse the repository at this point in the history

  2. Update Inquiry queue estimated data.

    @renatobecker
    renatobecker committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    0058a3f View commit details
    Browse the repository at this point in the history

  3. Allow to set the room priority through the room creator method.

    @renatobecker
    renatobecker committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    43b56e0 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into omnichannel/add-omnichannel-priority-feature

    @renatobecker
    renatobecker committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    bdcb0ca View commit details
    Browse the repository at this point in the history

  5. Add migration to add the new fields that will be used to sort the inq… 

    …uiries.
    @renatobecker
    renatobecker committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    2694ada View commit details
    Browse the repository at this point in the history

  6. Fix endpoint permission.

    @renatobecker
    renatobecker committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    d097df2 View commit details
    Browse the repository at this point in the history

  7. Fix migration.

    @renatobecker
    renatobecker committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    fda413c View commit details
    Browse the repository at this point in the history

  8. Remove console.log.

    @renatobecker
    renatobecker committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    b258168 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2020

  1. Merge remote-tracking branch 'origin/develop' into omnichannel/add-om… 

    …nichannel-priority-feature
    @rodrigok
    rodrigok committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    5e24ffa View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into omnichannel/add-omnichannel-priority-feature

    @renatobecker
    renatobecker committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    3b64cbf View commit details
    Browse the repository at this point in the history

  3. Codebase improvements.

    @renatobecker
    renatobecker committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    42f6905 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into omnichannel/add-omnichannel-priority-feature

    @renatobecker
    renatobecker committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    4859ddc View commit details
    Browse the repository at this point in the history

  5. Improvements on the codebase according to the review suggestions.

    @renatobecker
    renatobecker committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    f3e10b1 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'omnichannel/add-omnichannel-priority-feature' of https:… 

    …//github.com/RocketChat/Rocket.Chat into omnichannel/add-omnichannel-priority-feature
    @renatobecker
    renatobecker committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    47edcc9 View commit details
    Browse the repository at this point in the history

  7. Add _id to the user find method.

    @renatobecker
    renatobecker committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    ccb338d View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2020

  1. Merge branch 'develop' into omnichannel/add-omnichannel-priority-feature 

    # Conflicts:
#	ee/i18n/en.i18n.json
#	ee/i18n/pt-BR.i18n.json
    @renatobecker
    renatobecker committed Apr 21, 2020
    Configuration menu
    Copy the full SHA
    53e2cfb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into omnichannel/add-omnichannel-priority-feature 

    # Conflicts:
#	server/startup/migrations/v185.js
    @renatobecker
    renatobecker committed Apr 21, 2020
    Configuration menu
    Copy the full SHA
    eba0853 View commit details
    Browse the repository at this point in the history

  3. Fix migration file.

    @renatobecker
    renatobecker committed Apr 21, 2020
    Configuration menu
    Copy the full SHA
    2a16cc1 View commit details
    Browse the repository at this point in the history