Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.

Feat mail suggestion #345

Open
wants to merge 79 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
ddb2395
clean timeclock
munkhsaikhan Sep 20, 2023
bbca9fd
Merge branch 'dev' of github.com:erxes/erxes into dev
munkhsaikhan Sep 20, 2023
7fd2284
clean return clean;
munkhsaikhan Sep 20, 2023
4815ecf
improve imap activity log
Sep 20, 2023
b3e01a1
update
Sep 20, 2023
61aa9ce
Merge branch 'dev' of github.com:erxes/erxes-community into perf-imap…
Sep 20, 2023
acb64a0
update
Sep 20, 2023
9e1c1e4
Merge pull request #318 from erxes/perf-imap-activitylog
Anu-Ujin Sep 20, 2023
3e51201
online pos with productName
munkhsaikhan Sep 20, 2023
095a5a6
reload fix
Sep 20, 2023
d940b4e
Merge pull request #4637 from erxes/cypress-fix-reload
uulaa Sep 20, 2023
56b4c55
Merge branch 'dev' of https://github.com/erxes/erxes into dev
soyombo-baterdene Sep 20, 2023
36e06dd
Merge branch 'dev' of github.com:erxes/erxes-community into dev
munkhsaikhan Sep 20, 2023
2017ab9
pos ui cancel & return (#319)
KhBaterdene Sep 20, 2023
1dee263
fix another logic resync less orders
munkhsaikhan Sep 20, 2023
0029146
Merge branch 'dev' of github.com:erxes/erxes-community into dev
munkhsaikhan Sep 20, 2023
bd003b0
clean code
munkhsaikhan Sep 20, 2023
1c93934
fix cover filter
munkhsaikhan Sep 20, 2023
ed43a2b
fix email forward was not showing
batmnkh2344 Sep 21, 2023
095d41b
fix mail header date was showing current date
batmnkh2344 Sep 21, 2023
fe00b9e
include widgets and workers in build-test
dulguun0225 Sep 21, 2023
43bc034
feat: CLI - add image_tag configuration for essyncer
dulguun0225 Sep 21, 2023
bfbb084
Merge pull request #321 from erxes/fix-mailHeader-date
Anu-Ujin Sep 21, 2023
ca7df0c
fix: settings sidebar glitch (#4635)
Baylag321 Sep 21, 2023
5d9cfff
merge with dev
Sep 21, 2023
9ca4908
Merge branch 'dev' of github.com:erxes/erxes-community into fix-mail-…
Sep 21, 2023
f5e5e49
fix internal note image height broken in activity log
Sep 21, 2023
e4b78fb
fix conflice with dev
Sep 21, 2023
cc863de
upgrade: Node v18.17.1
dulguun0225 Sep 21, 2023
143f7b4
upgrade: Node v18.17.1
dulguun0225 Sep 21, 2023
d3aa1b8
fix cache email content when create new email
Sep 21, 2023
ef5fac9
Merge branch 'dev' of github.com:erxes/erxes-community into dev
Sep 21, 2023
c568f24
fix conversation right actionbar
Sep 21, 2023
97e2d4f
fix(imap): calendar
ariunzayarin Sep 21, 2023
b1fbf56
fix reply was showing twice after sent
batmnkh2344 Sep 21, 2023
c4ae0ed
Merge pull request #322 from erxes/fix-imap-calendar
Anu-Ujin Sep 21, 2023
4d973db
Pos payment (#323)
KhBaterdene Sep 22, 2023
bd3d6c4
Merge branch 'dev' of github.com:erxes/erxes-community into fix-mail-…
Sep 22, 2023
30816a8
Merge branch 'fix-mail-forward' of github.com:erxes/erxes-community i…
Sep 22, 2023
6fbef29
Merge pull request #320 from erxes/fix-mail-forward
Anu-Ujin Sep 22, 2023
903597a
Pos odd amount (#328)
KhBaterdene Sep 22, 2023
292ac69
Use IPv4 address instead of localhost
dulguun0225 Sep 22, 2023
8c6eacc
use 127.0.0.1 instead of localhost
dulguun0225 Sep 22, 2023
f6f98d3
Revert "use 127.0.0.1 instead of localhost"
dulguun0225 Sep 22, 2023
006e8d0
fix: localhost = ::1 related fix for local environment
dulguun0225 Sep 22, 2023
960d3b6
Merge branch 'dev' of https://github.com/erxes/erxes into dev
dulguun0225 Sep 22, 2023
5986292
fix(automations):get customerIds when send webhook
Wlkr123 Sep 23, 2023
3cd8de9
Merge branch 'dev' of github.com:erxes/erxes into dev
Wlkr123 Sep 23, 2023
27082eb
fix(riskassessment):migrate file to fix stringValue of customFieldsDa…
Wlkr123 Sep 23, 2023
11598af
Merge branch 'dev' of github.com:erxes/erxes-community into dev
Wlkr123 Sep 23, 2023
6d62692
Merge branch 'dev' of github.com:erxes/erxes into dev
Wlkr123 Sep 23, 2023
9169dc8
payment invoice rightsidebar content from pos orders
munkhsaikhan Sep 23, 2023
1669b00
little
munkhsaikhan Sep 23, 2023
523af5a
posorder payment description with bill number
munkhsaikhan Sep 23, 2023
b2818f1
productCount with similarity
munkhsaikhan Sep 23, 2023
fd65b59
posclient products count query with similarities
munkhsaikhan Sep 23, 2023
de6022a
pos-ui yaml update
munkhsaikhan Sep 24, 2023
38d72e9
Merge branch 'dev' of github.com:erxes/erxes into dev
munkhsaikhan Sep 24, 2023
73902e1
:q
munkhsaikhan Sep 24, 2023
e28f824
Merge branch 'dev' of github.com:erxes/erxes-community into dev
munkhsaikhan Sep 24, 2023
a897eca
little
munkhsaikhan Sep 24, 2023
a4f1395
coffeshop choose (#332)
KhBaterdene Sep 24, 2023
520d9a5
fix cover errors & config fetch (#333)
KhBaterdene Sep 25, 2023
c784a0b
remove unnecessary convoluted dependencies
dulguun0225 Sep 25, 2023
391288e
cypress structure changes
Sep 25, 2023
ada659c
Merge pull request #4642 from erxes/cypress-structure
uulaa Sep 25, 2023
9e1088f
feat (Timeclock) - enhancement
nandinboldn Sep 25, 2023
fbf6cdf
Merge branch 'dev' of github.com:erxes/erxes into dev
nandinboldn Sep 25, 2023
9e655ff
add common collapsiblelist component
Sep 25, 2023
a767080
add loader in product list query
Sep 25, 2023
4315630
Merge branch 'dev' of github.com:erxes/erxes-community into perf-coll…
Sep 25, 2023
c5cef14
Merge pull request #334 from erxes/perf-collapsible-category
Anu-Ujin Sep 25, 2023
4de2f17
custom graphic (#336)
hitchikermn Sep 25, 2023
78a7883
Merge branch 'dev' of github.com:erxes/erxes into dev
munkhsaikhan Sep 25, 2023
c09cb61
Merge branch 'dev' of github.com:erxes/erxes into dev
munkhsaikhan Sep 25, 2023
37a8625
create-cis
munkhsaikhan Sep 25, 2023
c79e418
Is pre order on pos (#337)
munkhsaikhan Sep 25, 2023
6527c44
show user suggestion from contact
batmnkh2344 Sep 28, 2023
c09a487
fix some parts
batmnkh2344 Oct 4, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/client_portal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@ jobs:
cd client-portal
echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
docker build -t erxes/client-portal:${GITHUB_REF#refs/heads/} -f Dockerfile .
docker push erxes/client-portal:${GITHUB_REF#refs/heads/}
docker push erxes/client-portal:${GITHUB_REF#refs/heads/}
14 changes: 7 additions & 7 deletions .github/workflows/core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@ on:

jobs:
core:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Use Node.js 14.20.x
uses: actions/setup-node@v1
- name: Use Node.js 18.17.x
uses: actions/setup-node@v3
with:
node-version: 14.20.x
node-version: 18.17.x

# https://github.com/actions/cache/blob/master/examples.md#node---yarn
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT

- uses: actions/cache@v2
- uses: actions/cache@v3
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/coreui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ on:

jobs:
ui:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Use Node.js 14.20.x
uses: actions/setup-node@v1
- name: Use Node.js 18.17.x
uses: actions/setup-node@v3
with:
node-version: 14.20.x
node-version: 18.17.x

- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Build
run: |
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/crons.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,22 @@ on:

jobs:
crons:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Use Node.js 14.20.x
uses: actions/setup-node@v1
- name: Use Node.js 18.17.x
uses: actions/setup-node@v3
with:
node-version: 14.20.x
node-version: 18.17.x

# https://github.com/actions/cache/blob/master/examples.md#node---yarn
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT

- uses: actions/cache@v2
- uses: actions/cache@v3
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/dashboard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,26 @@ on:

jobs:
dashboard:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Use Node.js 14.20.x
uses: actions/setup-node@v1
- name: Use Node.js 18.17.x
uses: actions/setup-node@v3
with:
node-version: 14.20.x
node-version: 18.17.x

# https://github.com/actions/cache/blob/master/examples.md#node---yarn
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT

- uses: actions/cache@v2
- uses: actions/cache@v3
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-dashboard-${{ hashFiles('yarn.lock', 'dashboard/yarn.lock') }}
key: ${{ runner.os }}-yarn-dashboard-${{ hashFiles('yarn.lock', 'plugin-dashboard-api/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-dashboard
${{ runner.os }}-yarn-
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/documentation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,4 @@ jobs:
git config --global user.email "github-actions[bot]@users.noreply.github.com"
git config --global user.name "github-actions[bot]"
yarn install --frozen-lockfile
yarn deploy
yarn deploy
2 changes: 1 addition & 1 deletion .github/workflows/email_verifier.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ jobs:
cd email-verifier
echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
docker build -t erxes/erxes-email-verifier:${GITHUB_REF#refs/heads/} -f Dockerfile .
docker push erxes/erxes-email-verifier:${GITHUB_REF#refs/heads/}
docker push erxes/erxes-email-verifier:${GITHUB_REF#refs/heads/}
12 changes: 6 additions & 6 deletions .github/workflows/gateway.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ jobs:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Use Node.js 14.20.x
uses: actions/setup-node@v1
- name: Use Node.js 18.17.x
uses: actions/setup-node@v3
with:
node-version: 14.20.x
node-version: 18.17.x

# https://github.com/actions/cache/blob/master/examples.md#node---yarn
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT

- uses: actions/cache@v2
- uses: actions/cache@v3
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/plugin-assets-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,22 @@ on:

jobs:
api:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Use Node.js 14.20.x
uses: actions/setup-node@v1
- name: Use Node.js 18.17.x
uses: actions/setup-node@v3
with:
node-version: 14.20.x
node-version: 18.17.x

# https://github.com/actions/cache/blob/main/examples.md#node---yarn
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT

- uses: actions/cache@v2
- uses: actions/cache@v3
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/plugin-assets-ui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ on:

jobs:
ui:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Use Node.js 14.20.x
uses: actions/setup-node@v1
- name: Use Node.js 18.17.x
uses: actions/setup-node@v3
with:
node-version: 14.20.x
node-version: 18.17.x

- name: Build
run: |
Expand All @@ -71,7 +71,7 @@ jobs:
yarn build

- name: Configure AWS credentials
if: github.event_name == 'push' && ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging')
if: github.event_name == 'push' && ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/build-test')
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/plugin-automations-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,22 @@ on:

jobs:
api:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Use Node.js 14.20.x
uses: actions/setup-node@v1
- name: Use Node.js 18.17.x
uses: actions/setup-node@v3
with:
node-version: 14.20.x
node-version: 18.17.x

# https://github.com/actions/cache/blob/main/examples.md#node---yarn
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT

- uses: actions/cache@v2
- uses: actions/cache@v3
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/plugin-automations-ui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ on:

jobs:
ui:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Use Node.js 14.20.x
uses: actions/setup-node@v1
- name: Use Node.js 18.17.x
uses: actions/setup-node@v3
with:
node-version: 14.20.x
node-version: 18.17.x

- name: Build
run: |
Expand All @@ -71,7 +71,7 @@ jobs:
yarn build

- name: Configure AWS credentials
if: github.event_name == 'push' && ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging')
if: github.event_name == 'push' && ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/build-test')
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/plugin-block-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,22 @@ on:

jobs:
api:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Use Node.js 14.20.x
uses: actions/setup-node@v1
- name: Use Node.js 18.17.x
uses: actions/setup-node@v3
with:
node-version: 14.20.x
node-version: 18.17.x

# https://github.com/actions/cache/blob/main/examples.md#node---yarn
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT

- uses: actions/cache@v2
- uses: actions/cache@v3
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/plugin-block-ui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ on:

jobs:
ui:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Use Node.js 14.20.x
uses: actions/setup-node@v1
- name: Use Node.js 18.17.x
uses: actions/setup-node@v3
with:
node-version: 14.20.x
node-version: 18.17.x

- name: Build
run: |
Expand All @@ -71,7 +71,7 @@ jobs:
yarn build

- name: Configure AWS credentials
if: github.event_name == 'push' && ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging')
if: github.event_name == 'push' && ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/build-test')
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/plugin-calendar-ui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ on:

jobs:
ui:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Use Node.js 14.20.x
uses: actions/setup-node@v1
- name: Use Node.js 18.17.x
uses: actions/setup-node@v3
with:
node-version: 14.20.x
node-version: 18.17.x

- name: Build
run: |
Expand All @@ -71,7 +71,7 @@ jobs:
yarn build

- name: Configure AWS credentials
if: github.event_name == 'push' && ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging')
if: github.event_name == 'push' && ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/build-test')
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
Expand Down
Loading