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

🛠 global resolver #2023

Merged
merged 19 commits into from
Apr 14, 2022
Merged

🛠 global resolver #2023

merged 19 commits into from
Apr 14, 2022

Commits on Mar 22, 2022

  1. global resolver

    @romanesko
    romanesko committed Mar 22, 2022
    Configuration menu
    Copy the full SHA
    65e7312 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2022

  1. global resolver

    @romanesko
    romanesko committed Mar 23, 2022
    Configuration menu
    Copy the full SHA
    3bfdb4d View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2022

  1. global resolver

    @romanesko
    romanesko committed Mar 24, 2022
    Configuration menu
    Copy the full SHA
    9114cfd View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2022

  1. global resolver

    @romanesko
    romanesko committed Mar 29, 2022
    Configuration menu
    Copy the full SHA
    4df4aed View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2022

  1. global resolver

    @romanesko
    romanesko committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    12f50f2 View commit details
    Browse the repository at this point in the history

  2. global resolver

    @romanesko
    romanesko committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    ad436d7 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2022

  1. merge conflicts fix

    @romanesko
    romanesko committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    e9df269 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2022

  1. Merge remote-tracking branch 'origin/develop' into global-resolver 

    # Conflicts:
#	twake/backend/node/src/services/applications/web/routes.ts
#	twake/backend/node/test/e2e/application/application-events.spec.ts
    @romanesko
    romanesko committed Apr 11, 2022
    Configuration menu
    Copy the full SHA
    a22bb3b View commit details
    Browse the repository at this point in the history

  2. global-resolver merge issues

    @romanesko
    romanesko committed Apr 11, 2022
    Configuration menu
    Copy the full SHA
    34fdf1c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of https://github.com/linagora/Twake into glob… 

    …al-resolver

# Conflicts:
#	twake/backend/node/src/services/channels/services/channel/service.ts
#	twake/backend/node/src/services/messages/services/messages.ts
    @romanesko
    romanesko committed Apr 11, 2022
    Configuration menu
    Copy the full SHA
    4740bd5 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' of https://github.com/linagora/Twake into glob… 

    …al-resolver

# Conflicts:
#	twake/backend/node/src/services/channels/services/channel/service.ts
#	twake/backend/node/src/services/messages/services/messages.ts
    @romanesko
    romanesko committed Apr 11, 2022
    Configuration menu
    Copy the full SHA
    3197225 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' of https://github.com/linagora/Twake into glob… 

    …al-resolver

# Conflicts:
#	twake/backend/node/src/services/channels/services/channel/service.ts
#	twake/backend/node/src/services/messages/services/messages.ts
    @romanesko
    romanesko committed Apr 11, 2022
    Configuration menu
    Copy the full SHA
    eafc1e5 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' of https://github.com/linagora/Twake into glob… 

    …al-resolver

# Conflicts:
#	twake/backend/node/src/services/channels/services/channel/service.ts
#	twake/backend/node/src/services/messages/services/messages.ts
    @romanesko
    romanesko committed Apr 11, 2022
    Configuration menu
    Copy the full SHA
    721d39b View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' of https://github.com/linagora/Twake into glob… 

    …al-resolver

# Conflicts:
#	twake/backend/node/package-lock.json
#	twake/backend/node/src/services/applications/api.ts
#	twake/backend/node/src/services/applications/services/applications.ts
#	twake/backend/node/src/services/applications/services/index.ts
#	twake/backend/node/src/services/applications/web/controllers/applications.ts
#	twake/backend/node/src/services/applications/web/controllers/company-applications.ts
#	twake/backend/node/src/services/applicationsapi/index.ts
#	twake/backend/node/src/services/applicationsapi/web/controllers/index.ts
#	twake/backend/node/src/services/messages/services/engine/index.ts
#	twake/backend/node/src/services/messages/web/controllers/threads.ts
    @romanesko
    romanesko committed Apr 11, 2022
    Configuration menu
    Copy the full SHA
    67028a4 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'develop' of https://github.com/linagora/Twake into glob… 

    …al-resolver

# Conflicts:
#	twake/backend/node/package-lock.json
#	twake/backend/node/src/services/applications/api.ts
#	twake/backend/node/src/services/applications/services/applications.ts
#	twake/backend/node/src/services/applications/services/index.ts
#	twake/backend/node/src/services/applications/web/controllers/applications.ts
#	twake/backend/node/src/services/applications/web/controllers/company-applications.ts
#	twake/backend/node/src/services/applicationsapi/index.ts
#	twake/backend/node/src/services/applicationsapi/web/controllers/index.ts
#	twake/backend/node/src/services/messages/services/engine/index.ts
#	twake/backend/node/src/services/messages/web/controllers/threads.ts
    @romanesko
    romanesko committed Apr 11, 2022
    Configuration menu
    Copy the full SHA
    ab7daec View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2022

  1. Merge branch 'develop' of https://github.com/linagora/Twake into glob… 

    …al-resolver

# Conflicts:
#	twake/backend/node/package-lock.json
#	twake/backend/node/src/services/applications/api.ts
#	twake/backend/node/src/services/applications/services/applications.ts
#	twake/backend/node/src/services/applications/services/index.ts
#	twake/backend/node/src/services/applications/web/controllers/applications.ts
#	twake/backend/node/src/services/applications/web/controllers/company-applications.ts
#	twake/backend/node/src/services/applicationsapi/index.ts
#	twake/backend/node/src/services/applicationsapi/web/controllers/index.ts
#	twake/backend/node/src/services/messages/services/engine/index.ts
#	twake/backend/node/src/services/messages/web/controllers/threads.ts
    @romanesko
    romanesko committed Apr 12, 2022
    Configuration menu
    Copy the full SHA
    56c5271 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2022

  1. Merge branch 'develop' of https://github.com/linagora/Twake into glob… 

    …al-resolver

# Conflicts:
#	twake/backend/node/package-lock.json
#	twake/backend/node/src/services/applications/api.ts
#	twake/backend/node/src/services/applications/services/applications.ts
#	twake/backend/node/src/services/applications/services/index.ts
#	twake/backend/node/src/services/applications/web/controllers/applications.ts
#	twake/backend/node/src/services/applications/web/controllers/company-applications.ts
#	twake/backend/node/src/services/applicationsapi/index.ts
#	twake/backend/node/src/services/applicationsapi/web/controllers/index.ts
#	twake/backend/node/src/services/messages/services/engine/index.ts
#	twake/backend/node/src/services/messages/web/controllers/threads.ts
    @romanesko
    romanesko committed Apr 13, 2022
    Configuration menu
    Copy the full SHA
    8752f73 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2022

  1. Merge branch 'develop' of https://github.com/linagora/Twake into glob… 

    …al-resolver

# Conflicts:
#	twake/backend/node/package-lock.json
#	twake/backend/node/src/services/applications/api.ts
#	twake/backend/node/src/services/applications/services/applications.ts
#	twake/backend/node/src/services/applications/services/index.ts
#	twake/backend/node/src/services/applications/web/controllers/applications.ts
#	twake/backend/node/src/services/applications/web/controllers/company-applications.ts
#	twake/backend/node/src/services/applicationsapi/index.ts
#	twake/backend/node/src/services/applicationsapi/web/controllers/index.ts
#	twake/backend/node/src/services/messages/services/engine/index.ts
#	twake/backend/node/src/services/messages/web/controllers/threads.ts
    @romanesko
    romanesko committed Apr 14, 2022
    Configuration menu
    Copy the full SHA
    803f0a2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of github.com:romanesko/Twake into global-reso… 

    …lver

# Conflicts:
#	twake/backend/node/src/services/applications/web/controllers/applications.ts
#	twake/backend/node/src/services/channels/services/channel/service.ts
    @romanesko
    romanesko committed Apr 14, 2022
    Configuration menu
    Copy the full SHA
    dc84425 View commit details
    Browse the repository at this point in the history