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

Meeting plugin #286

Open
wants to merge 1,947 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1947 commits
Select commit Hold shift + click to select a range
3186e12
Update script.js
soyombo-baterdene Sep 29, 2023
9e33c78
remove debug
soyombo-baterdene Sep 29, 2023
0b8174b
impr(gateway): more verbose error for subscription resolver
dulguun0225 Sep 29, 2023
cc5faad
catch initfireBase
munkhsaikhan Sep 29, 2023
0af8113
Merge branch 'dev' of github.com:erxes/erxes-community into dev
munkhsaikhan Sep 29, 2023
8243c5d
Merge branch 'dev' of https://github.com/erxes/erxes into dev
soyombo-baterdene Sep 29, 2023
4385890
Update utils.ts
soyombo-baterdene Sep 29, 2023
7209f0c
Merge branch 'dev' of github.com:erxes/erxes into dev
munkhsaikhan Sep 29, 2023
86819bd
Merge branch 'dev' of github.com:erxes/erxes-community into dev
soyombo-baterdene Sep 29, 2023
48739c1
Update utils.ts
soyombo-baterdene Sep 29, 2023
9dfc29f
Merge remote-tracking branch 'upstream/dev' into dev
soyombo-baterdene Sep 29, 2023
08b8294
Merge branch 'dev' of github.com:erxes/erxes into dev
munkhsaikhan Sep 29, 2023
a42b8c6
Merge branch 'dev' of github.com:erxes/erxes-community into dev
munkhsaikhan Sep 29, 2023
418fa49
feat(xypdan): xypdan alpha version (#341)
batorshih Sep 29, 2023
6f14e5d
Merge branch 'dev' of github.com:erxes/erxes-community into dev
soyombo-baterdene Sep 29, 2023
802c85a
add xypdan cis
soyombo-baterdene Sep 29, 2023
4972c16
Fix team member filter (#4654)
Baylag321 Sep 29, 2023
9521721
Update utils.ts
soyombo-baterdene Sep 29, 2023
6a7afdf
little bugs fixed in meeting
enkhtuvshinD Sep 29, 2023
9b0be25
refactor
enkhtuvshinD Sep 29, 2023
ebbe864
Messenger update added validations on required fields (#4644)
orgilshdeee Sep 29, 2023
391d47b
feat(Timeclock) add mobile notification (#4655)
nandinboldn Sep 29, 2023
37f417a
bug fixed in meeting (#347)
enkhtuvshinD Sep 29, 2023
c660db7
Perf settings list (#4656)
Anu-Ujin Sep 29, 2023
79a519f
fix conflict
Sep 29, 2023
4bd13f3
feat(timeclock) - fix conflict
nandinboldn Sep 29, 2023
4eac5e4
bump redis version to 7.2.1
dulguun0225 Sep 29, 2023
80cd444
Merge branch 'dev' of github.com:erxes/erxes-community into dev
munkhsaikhan Sep 29, 2023
aab44a7
fix settings collapse component
Sep 29, 2023
beae3c6
fix brace error in core
Sep 29, 2023
a79ea92
undo withquery condition in inbox conversation detail
Sep 29, 2023
9f21ec5
upgrade: Redis related dependencies
dulguun0225 Sep 29, 2023
df63f60
upgrade: Redis related dependencies
dulguun0225 Sep 29, 2023
62ec343
fix config error
Sep 29, 2023
636bfb0
Merge branch 'dev' of github.com:erxes/erxes-community into dev
Sep 29, 2023
e550248
fix conflict
Sep 29, 2023
2f22fee
Pos kiosk (#348)
KhBaterdene Sep 30, 2023
2c3406c
little hot fix
munkhsaikhan Oct 1, 2023
330febc
Merge branch 'dev' of github.com:erxes/erxes into dev
munkhsaikhan Oct 1, 2023
4cfd923
little hot fix
munkhsaikhan Oct 1, 2023
893a74e
Merge branch 'dev' of github.com:erxes/erxes into dev
munkhsaikhan Oct 1, 2023
2f95baa
little hot fix
munkhsaikhan Oct 1, 2023
13bc36a
Merge branch 'dev' of github.com:erxes/erxes into dev
munkhsaikhan Oct 1, 2023
fe8b938
fix(engages):handle customer primaryEmail null on engageSendMail
Wlkr123 Oct 1, 2023
523fdf5
Merge branch 'dev' of github.com:erxes/erxes into dev
Wlkr123 Oct 1, 2023
8982a80
Merge branch 'dev' of github.com:erxes/erxes-community into dev
munkhsaikhan Oct 1, 2023
edc4415
Merge branch 'dev' of https://github.com/erxes/erxes-community into m…
enkhtuvshinD Oct 2, 2023
0525e75
set event
enkhtuvshinD Oct 2, 2023
f39b711
add event in Meeting (#351)
enkhtuvshinD Oct 2, 2023
311699b
feat(exm) publish new exm web
Enkhtuvshin0513 Oct 2, 2023
fe44cab
update exm web yaml
Oct 2, 2023
e61eb27
posclient orders filter by slotCode
munkhsaikhan Oct 2, 2023
2ecc38f
ggpushMerge branch 'dev' of github.com:erxes/erxes-community into dev
munkhsaikhan Oct 2, 2023
07137b1
pos order record fix
munkhsaikhan Oct 2, 2023
3a45278
update exm web yaml
Oct 2, 2023
ed486a2
Merge branch 'dev' of github.com:erxes/erxes-community into dev
Oct 2, 2023
75938e1
fix read file exm
Oct 2, 2023
708eb42
remove console log
Oct 2, 2023
765eb07
fix read file exm
Oct 2, 2023
b9f50c1
update readfile
Oct 2, 2023
2e2d46b
update exm web yaml
Oct 2, 2023
05b4824
update login
Oct 2, 2023
2c620f0
update
Oct 2, 2023
2bfff15
update
Oct 2, 2023
4044875
update exm upload file
Oct 2, 2023
3db28a6
Payment callback pos (#349)
munkhsaikhan Oct 2, 2023
5859bc3
up pos list
munkhsaikhan Oct 2, 2023
e9a8de6
Merge branch 'dev' of github.com:erxes/erxes-community into dev
soyombo-baterdene Oct 2, 2023
ac4f342
Update XypConfigs.tsx
soyombo-baterdene Oct 2, 2023
7395a25
subbranch logic
munkhsaikhan Oct 2, 2023
bca1756
pos _id fix
munkhsaikhan Oct 2, 2023
09f1868
reconnect rmq
munkhsaikhan Oct 2, 2023
2e74335
Merge branch 'dev' of github.com:erxes/erxes into dev
munkhsaikhan Oct 2, 2023
e851184
syncerkhet rmq reconnected
munkhsaikhan Oct 2, 2023
aa25533
Merge branch 'dev' of https://github.com/erxes/erxes into dev
soyombo-baterdene Oct 3, 2023
45cd9e3
Update Users.ts
soyombo-baterdene Oct 3, 2023
d274919
Update messageBroker.ts
soyombo-baterdene Oct 3, 2023
2eb9c5b
Merge branch 'dev' of github.com:erxes/erxes-community into dev
soyombo-baterdene Oct 3, 2023
21a52e8
Merge remote-tracking branch 'upstream/dev' into dev
soyombo-baterdene Oct 3, 2023
cbb2846
Update ProductSection.tsx
soyombo-baterdene Oct 3, 2023
7831750
update(segments):add ability filter by birthday when selected day bef…
Wlkr123 Oct 3, 2023
bf7a817
Merge branch 'dev' of github.com:erxes/erxes into dev
Wlkr123 Oct 3, 2023
783ea2b
Loansbugs (#353)
hitchikermn Oct 3, 2023
3fd18ff
pos ebarimt header
munkhsaikhan Oct 3, 2023
e5ff44c
ggpushMerge branch 'dev' of github.com:erxes/erxes-community into dev
munkhsaikhan Oct 3, 2023
be39ccf
Merge branch 'dev' of https://github.com/erxes/erxes into dev
soyombo-baterdene Oct 3, 2023
c55adb5
fix(payment): fix mismatching invoice identifier
soyombo-baterdene Oct 3, 2023
91fa22b
Merge branch 'dev' of github.com:erxes/erxes-community into dev
soyombo-baterdene Oct 3, 2023
8f89bc8
feat(timeclock) enhancement (#4667)
nandinboldn Oct 3, 2023
f6ce220
remove unused declare
Oct 3, 2023
5c0b2c5
Merge branch 'dev' of github.com:erxes/erxes into dev
Oct 3, 2023
d3340c1
copy community change
Oct 3, 2023
74de40d
fix dayjs fromnow error in conversation item
Oct 3, 2023
bd1733d
fix golomt config & remove Dynamic& improve ebarim (#356)
KhBaterdene Oct 3, 2023
3c715f5
improve order filter add isPre (#354)
KhBaterdene Oct 3, 2023
aa2104d
fix conversation list refresh in every minute bug
Oct 3, 2023
c74083c
feat(Timeclock) add search bar on device configs list (#357)
nandinboldn Oct 3, 2023
04227e1
Merge branch 'dev' of github.com:erxes/erxes into dev
nandinboldn Oct 3, 2023
8396485
Merge branch 'dev' of github.com:erxes/erxes-community into dev
soyombo-baterdene Oct 3, 2023
5312c7e
Update messageBroker.ts
soyombo-baterdene Oct 3, 2023
3d3c70d
Update messageBroker.ts
soyombo-baterdene Oct 3, 2023
568c329
Update xypdata.ts
soyombo-baterdene Oct 3, 2023
9f67f53
Update messageBroker.ts
soyombo-baterdene Oct 3, 2023
bd680b1
Update xypdata.ts
soyombo-baterdene Oct 3, 2023
0a5c1c8
Update CustomerSidebar.tsx
soyombo-baterdene Oct 3, 2023
9d51244
offline pos subscriptions up
munkhsaikhan Oct 3, 2023
87ffa94
poscProducts filter by categoryMeta fix
munkhsaikhan Oct 4, 2023
c6ccc6b
Merge branch 'dev' of https://github.com/erxes/erxes into dev
soyombo-baterdene Oct 4, 2023
1f4f8fe
Update cpUserMiddleware.ts
soyombo-baterdene Oct 4, 2023
ab54096
Merge remote-tracking branch 'upstream/dev' into dev
soyombo-baterdene Oct 4, 2023
29be211
Merge branch 'dev' of github.com:erxes/erxes-community into dev
soyombo-baterdene Oct 4, 2023
06cb9b1
Merge branch 'dev' of github.com:erxes/erxes into dev
Oct 4, 2023
bb8c70c
posclient update from products productsConfig
munkhsaikhan Oct 4, 2023
5f3465e
Merge branch 'dev' of github.com:erxes/erxes-community into dev
munkhsaikhan Oct 4, 2023
de1c393
feat(timeclock) - improve absence requests logic
nandinboldn Oct 4, 2023
a223f81
Merge branch 'dev' of github.com:erxes/erxes into dev
nandinboldn Oct 4, 2023
f75c041
posclient products query schema with soon in out
munkhsaikhan Oct 4, 2023
db52bf1
hot fix
munkhsaikhan Oct 4, 2023
a6684ac
feat(Timeclock) - extend types
nandinboldn Oct 4, 2023
38f54f5
Merge branch 'dev' of github.com:erxes/erxes into dev
nandinboldn Oct 4, 2023
de223c3
Merge branch 'dev' of github.com:erxes/erxes-community into dev
nandinboldn Oct 4, 2023
a3b4563
Perf conversation list (#4671)
Anu-Ujin Oct 4, 2023
c1550b7
fix conflict
Oct 4, 2023
c1ab773
getIdsBySearchParams message broker
Oct 4, 2023
90dfdd5
Merge branch 'dev' of https://github.com/erxes/erxes into dev
soyombo-baterdene Oct 5, 2023
e3d4797
Update core.tsx
soyombo-baterdene Oct 5, 2023
9b8de36
Merge branch 'dev' of github.com:erxes/erxes-community into dev
soyombo-baterdene Oct 5, 2023
a5d2cd9
Merge remote-tracking branch 'upstream/dev' into dev
soyombo-baterdene Oct 5, 2023
3a9e3e1
Merge branch 'dev' of https://github.com/erxes/erxes-community into m…
enkhtuvshinD Oct 5, 2023
8cfb8a0
Kiosk pos update (#358)
munkhsaikhan Oct 5, 2023
4805ebf
fix search deal in meeting
enkhtuvshinD Oct 5, 2023
d9e010d
ci fix on pos
munkhsaikhan Oct 5, 2023
02e5b9c
Merge branch 'dev' of github.com:erxes/erxes-community into dev
soyombo-baterdene Oct 6, 2023
993e3d1
add resolver to xyp
soyombo-baterdene Oct 6, 2023
e3369de
fix(meetings): fix deal search (#359)
enkhtuvshinD Oct 6, 2023
ccb01d6
Update permission filter (#4669)
Baylag321 Oct 6, 2023
e6c39b1
Fix department, branch parentId (#4674)
Baylag321 Oct 6, 2023
6c1549b
Merge branch 'dev' of github.com:erxes/erxes into dev
Oct 6, 2023
432c3a5
bump cli version
dulguun0225 Oct 7, 2023
fdc5096
update(imap):Add ability get newContent and replies in mailData
Wlkr123 Oct 8, 2023
00c14b6
Loan schdule logic fix (#360)
hitchikermn Oct 9, 2023
22dbf56
feat(timeclock) - add field
nandinboldn Oct 9, 2023
bb3369f
Merge branch 'dev' of github.com:erxes/erxes into dev
nandinboldn Oct 9, 2023
b03ba46
Update customer.ts
soyombo-baterdene Oct 9, 2023
0b0b15b
Merge branch 'dev' of https://github.com/erxes/erxes into dev
soyombo-baterdene Oct 9, 2023
9784037
Merge branch 'dev' of github.com:erxes/erxes-community into dev
soyombo-baterdene Oct 9, 2023
ef15379
feat(timeclock) - add fields
nandinboldn Oct 9, 2023
ab48598
Merge branch 'dev' of github.com:erxes/erxes into dev
nandinboldn Oct 9, 2023
c1d04c4
Merge branch 'dev' of github.com:erxes/erxes into dev
nandinboldn Oct 9, 2023
dcbf541
Merge branch 'dev' of github.com:erxes/erxes-community into dev
nandinboldn Oct 9, 2023
aa06d74
feat(timeclock) schedule form improvement
nandinboldn Oct 9, 2023
21823c5
Merge branch 'dev' of github.com:erxes/erxes into dev
nandinboldn Oct 9, 2023
0f4069c
fix emailtemplate popover search
Oct 10, 2023
a75927b
exmFeed recipientType add
Gerelsukh Oct 10, 2023
7032594
posclient orders allow visitor
munkhsaikhan Oct 10, 2023
9cd0175
test case's errors fixed
enkhtuvshinD Oct 10, 2023
355ebfd
Merge branch 'dev' of https://github.com/erxes/erxes-community into m…
enkhtuvshinD Oct 10, 2023
2d5b2db
fix emailtemplate chooser in common email form
Oct 10, 2023
368e75c
fix(meetings): bug fixes after test cases (#364)
enkhtuvshinD Oct 10, 2023
6010344
fix add many at once not showing in team member
Oct 10, 2023
1acd5da
add beforesubmit alert in invite team member
Oct 10, 2023
fb89d11
Merge branch 'dev' of github.com:erxes/erxes-community into dev
Oct 10, 2023
2b4035d
update(contacts):add ability saarch contacts query
Wlkr123 Oct 10, 2023
408e519
Merge branch 'dev' of github.com:erxes/erxes into dev
Wlkr123 Oct 10, 2023
d6958ba
update(contacts):add fields keyword in schema in essyncer.js
Wlkr123 Oct 10, 2023
595dad9
Merge branch 'dev' of github.com:erxes/erxes into dev
Wlkr123 Oct 10, 2023
1acc162
remove broken code in messenger response rate
Oct 10, 2023
8833de2
Merge branch 'dev' of github.com:erxes/erxes-community into dev
Oct 10, 2023
a41fc6a
Fix pos bugs (#363)
KhBaterdene Oct 10, 2023
425c02e
fix timeformat
enkhtuvshinD Oct 11, 2023
da27ddc
Merge branch 'dev' of https://github.com/erxes/erxes-community into m…
enkhtuvshinD Oct 11, 2023
a4d6db5
Merge branch 'dev' of https://github.com/erxes/erxes into dev
soyombo-baterdene Oct 11, 2023
885d83c
add graphql-codegen
soyombo-baterdene Oct 11, 2023
43c8ed7
Merge branch 'dev' of github.com:erxes/erxes-community into dev
soyombo-baterdene Oct 11, 2023
dd9bb00
Merge remote-tracking branch 'upstream/dev' into dev
soyombo-baterdene Oct 11, 2023
cece466
Update yarn.lock
soyombo-baterdene Oct 11, 2023
394d2da
Update yarn.lock
soyombo-baterdene Oct 11, 2023
cee5108
update(meetings): change datetime format (#367)
enkhtuvshinD Oct 11, 2023
f3d91f2
update plugins from erxes-community
soyombo-baterdene Oct 11, 2023
de19219
Merge remote-tracking branch 'upstream/dev' into dev
soyombo-baterdene Oct 11, 2023
3b918d5
Update FieldForm.tsx
soyombo-baterdene Oct 11, 2023
c1a179d
update
soyombo-baterdene Oct 11, 2023
de72a91
update
soyombo-baterdene Oct 11, 2023
12c05e2
Update ConvertTrigger.tsx
soyombo-baterdene Oct 11, 2023
1d145cf
Update ConvertTrigger.tsx
soyombo-baterdene Oct 11, 2023
1347067
Merge branch 'dev' of github.com:erxes/erxes-community into dev
soyombo-baterdene Oct 11, 2023
9bf4dc1
Merge remote-tracking branch 'upstream/dev' into dev
soyombo-baterdene Oct 11, 2023
cc6d33f
little fix
Anu-Ujin Oct 11, 2023
ed71baf
Merge branch 'dev' of github.com:erxes/erxes into dev
Anu-Ujin Oct 11, 2023
8dbfab9
Merge branch 'dev' of https://github.com/erxes/erxes into dev
soyombo-baterdene Oct 11, 2023
8609642
add missing style
Anu-Ujin Oct 11, 2023
2a8320b
Merge branch 'dev' of github.com:erxes/erxes into dev
Anu-Ujin Oct 11, 2023
65f0311
Try to create RPC http endpoints only if express instance is provided
dulguun0225 Oct 11, 2023
7a51e05
debug cronjob
nandinboldn Oct 11, 2023
86f2c03
debug cronjobs
nandinboldn Oct 11, 2023
6f25bef
Merge branch 'dev' of github.com:erxes/erxes-community into dev
nandinboldn Oct 11, 2023
1138522
skip data needed TC
Oct 11, 2023
7bf6627
Merge pull request #4677 from erxes/cypress-01
uulaa Oct 11, 2023
d1726bf
perf(inbox): add shortcuts (#4670)
ariunzayarin Oct 11, 2023
ae51ae2
Inbox shortcut (#4678)
Anu-Ujin Oct 11, 2023
ccd6eae
fix (#368)
KhBaterdene Oct 11, 2023
f970b59
fix documents query permission
munkhsaikhan Oct 11, 2023
835a043
Merge branch 'dev' of github.com:erxes/erxes into dev
munkhsaikhan Oct 11, 2023
3c76fdd
perf(cards): add sales detail to boards and calendar (#4679)
ariunzayarin Oct 11, 2023
a47e543
Merge branch 'dev' of github.com:erxes/erxes into dev
munkhsaikhan Oct 11, 2023
44d0534
findBranch with fields
munkhsaikhan Oct 11, 2023
1691c9b
Merge branch 'dev' of github.com:erxes/erxes into dev
munkhsaikhan Oct 11, 2023
fcc41d7
Merge branch 'dev' of github.com:erxes/erxes into dev
munkhsaikhan Oct 11, 2023
cff8e06
poscBranches refactor
munkhsaikhan Oct 11, 2023
331d31f
add shorName on products
munkhsaikhan Oct 11, 2023
199baf7
Merge branch 'dev' of github.com:erxes/erxes into dev
munkhsaikhan Oct 11, 2023
07873d3
add shortName on products and ebarimt
munkhsaikhan Oct 11, 2023
67b6b8a
findActiveCustomers and findActiveCompanies with limit
munkhsaikhan Oct 11, 2023
c4c99e0
Merge branch 'dev' of github.com:erxes/erxes into dev
munkhsaikhan Oct 11, 2023
ba85977
poscCustomers query fix
munkhsaikhan Oct 11, 2023
e70de2c
posclient users refactor
munkhsaikhan Oct 11, 2023
e9ee89a
createOrUpdateOrdersMany try loop
munkhsaikhan Oct 11, 2023
9a9bc23
Merge branch 'dev' of https://github.com/erxes/erxes into dev
soyombo-baterdene Oct 12, 2023
4004bf3
contentType (#365)
batorshih Oct 12, 2023
6e7ab60
Merge branch 'dev' of github.com:erxes/erxes-community into dev
munkhsaikhan Oct 13, 2023
350bf43
hot fix for inbox convertto
Anu-Ujin Oct 13, 2023
7996cbc
fix(inbox): conversation messages not showing
Anu-Ujin Oct 13, 2023
d19816d
hot fix
Anu-Ujin Oct 13, 2023
115638e
fix emailtemplates length error
Anu-Ujin Oct 13, 2023
3947317
Merge branch 'dev' of https://github.com/erxes/erxes into dev
soyombo-baterdene Oct 13, 2023
3b2a50c
perf(inbox): Improve inbox help shortcuts
Anu-Ujin Oct 13, 2023
69bf3b4
Merge branch 'dev' of github.com:erxes/erxes into dev
Anu-Ujin Oct 13, 2023
e37d43c
polarissync (#370)
soyombo-baterdene Oct 13, 2023
21e61dd
update(cards): select departments/branches when creating new cards
soyombo-baterdene Oct 13, 2023
f92a3d1
Merge branch 'dev' of https://github.com/erxes/erxes into dev
soyombo-baterdene Oct 13, 2023
3b56b61
Merge remote-tracking branch 'upstream/dev' into dev
soyombo-baterdene Oct 13, 2023
d08f874
Merge branch 'dev' of github.com:erxes/erxes-community into dev
soyombo-baterdene Oct 13, 2023
63f7f73
Update GenerateAddFormFields.tsx
soyombo-baterdene Oct 13, 2023
bff7f13
Merge remote-tracking branch 'upstream/dev' into dev
soyombo-baterdene Oct 13, 2023
73f5cd0
improvements (#369)
KhBaterdene Oct 14, 2023
e27d2d5
fix team member loop loading
Anu-Ujin Oct 16, 2023
080465e
merge with dev
Anu-Ujin Oct 16, 2023
1987d16
Merge branch 'dev' of https://github.com/erxes/erxes-community into m…
enkhtuvshinD Oct 16, 2023
faeb7d6
hot fix
enkhtuvshinD Oct 16, 2023
417a527
little fix, sometime
munkhsaikhan Oct 16, 2023
6a4507e
ggpushMerge branch 'dev' of github.com:erxes/erxes into dev
munkhsaikhan Oct 16, 2023
1f506fd
Merge branch 'dev' of github.com:erxes/erxes into dev
munkhsaikhan Oct 16, 2023
7c42b13
add bichil timeclock table
nandinboldn Oct 16, 2023
6b872f2
Merge branch 'dev' of github.com:erxes/erxes-community into dev
nandinboldn Oct 16, 2023
f5b946f
hot fix in Meeting (#371)
enkhtuvshinD Oct 16, 2023
6babaa9
Merge branch 'dev' of https://github.com/erxes/erxes-community into m…
enkhtuvshinD Oct 16, 2023
f900c0d
kitchen only print config and banFraction config
munkhsaikhan Oct 16, 2023
89809e6
Merge branch 'dev' of github.com:erxes/erxes-community into dev
munkhsaikhan Oct 16, 2023
4d35cca
Merge branch 'dev' of https://github.com/erxes/erxes-community into m…
enkhtuvshinD Oct 17, 2023
52f563b
check empty meeting title
enkhtuvshinD Oct 17, 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
  •  
  •  
  •  
5 changes: 3 additions & 2 deletions .github/workflows/client_portal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches:
- dev
- staging
- build-test
paths:
- 'client-portal/**'
- '.github/workflows/client_portal.yaml'
Expand Down Expand Up @@ -51,9 +52,9 @@ jobs:
yarn build

- name: Build docker image
if: github.event_name == 'push' && ( github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging' )
if: github.event_name == 'push' && ( github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/build-test' )
run: |
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/}
19 changes: 10 additions & 9 deletions .github/workflows/core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches:
- dev
- staging
- build-test
paths:
- 'packages/api-utils/**'
- 'packages/api-plugin-template.erxes/**'
Expand All @@ -13,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 All @@ -46,9 +47,9 @@ jobs:
ls

- name: Build docker image
if: github.event_name == 'push' && ( github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging')
if: github.event_name == 'push' && ( github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/build-test' )
run: |
cd dist/core
echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
docker build -t erxes/core:${GITHUB_REF#refs/heads/} -f Dockerfile .
docker push erxes/core:${GITHUB_REF#refs/heads/}
docker push erxes/core:${GITHUB_REF#refs/heads/}
18 changes: 9 additions & 9 deletions .github/workflows/coreui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches:
- dev
- staging
- apollo-client-3-all
- build-test
paths:
- 'packages/erxes-ui/**'
- 'packages/core-ui/**'
Expand All @@ -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 All @@ -34,21 +34,21 @@ 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' || github.ref == 'refs/heads/apollo-client-3-all' )
if: github.event_name == 'push' && ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging')
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: us-west-2

- name: Deploy locales
if: github.event_name == 'push' && ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/apollo-client-3-all' )
if: github.event_name == 'push' && ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging')
run: |
tar -cf locales.tar --directory=packages/core-ui/public/locales .
aws s3 cp locales.tar s3://erxes-${GITHUB_REF#refs/heads/}-plugins/locales.tar

- name: Build docker image
if: github.event_name == 'push' && ( github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/apollo-client-3-all')
if: github.event_name == 'push' && ( github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging')
env:
BASE_IMAGE: erxes/erxes:base-1.18-alpine
run: |
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/crons.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,30 @@ on:
branches:
- 'dev'
- 'staging'
- build-test
paths:
- 'packages/api-utils/**'
- 'packages/crons/**'
- '.github/workflows/crons.yaml'

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
63 changes: 63 additions & 0 deletions .github/workflows/cypress.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
name: Cypress Tests

on:
pull_request:
branches:
- 'dev'
jobs:
runtest:
runs-on: ubuntu-latest
strategy:
fail-fast: false
steps:
- name: setup node -v
uses: actions/setup-node@v1
with:
node-version: 16.20.x

- uses: actions/checkout@v2

- name: docker up
run: |
cd docker
docker compose up -d

- name: yarn install & install pm2
run: |
sudo -i
yarn install --save
sudo npm install -g pm2

- name: Run 'yarn install' in the './cli' directory.
run: |
cd cli
yarn install --save
cp configs.json.cli.sample configs.json

- name: Run 'yarn watch template' in the './packages/gateway' directory.
run: |
cd packages/gateway
yarn install --save
yarn watchTemplateForCli

- name: start with "dev --deps"
run: |
cd cli
./bin/erxes.js dev --deps

- run: sleep 30

- name: "run test"
uses: cypress-io/github-action@v5
with:
wait-on: "http://localhost:3000"
wait-on-timeout: 1000
browser: chrome
record: true
spec: ./cypress/tests/**/*.cy.js
config-file: cypress.config.js
env:
CYPRESS_PROJECT_ID: ${{ secrets.CYPRESS_PROJECT_ID }}
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DEBUG: "cypress:server:args"
17 changes: 9 additions & 8 deletions .github/workflows/dashboard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches:
- 'dev'
- 'staging'
- build-test
paths:
- 'packages/api-utils/**'
- 'packages/api-plugin-template.erxes/**'
Expand All @@ -13,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/}
17 changes: 8 additions & 9 deletions .github/workflows/essyncer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ on:
branches:
- master
- dev
- staging
paths:
- 'essyncer/**'
- '.github/workflows/essyncer.yaml'
Expand All @@ -23,12 +22,12 @@ jobs:
runs-on: ubuntu-20.04

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

- name: Build docker image
if: github.event_name == 'push' && ( github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging' )
run: |
cd essyncer
echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
docker build -t erxes/essyncer:${GITHUB_REF#refs/heads/} -f Dockerfile .
docker push erxes/essyncer:${GITHUB_REF#refs/heads/}
- name: Build docker image
if: github.event_name == 'push' && ( github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/build-test' )
run: |
cd essyncer
echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
docker build -t erxes/essyncer:${GITHUB_REF#refs/heads/} -f Dockerfile .
docker push erxes/essyncer:${GITHUB_REF#refs/heads/}
45 changes: 45 additions & 0 deletions .github/workflows/exm.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: EXM WEB CI

on:
push:
branches:
- dev
- staging
paths:
- 'exm-web/**'
- '.github/workflows/exmweb.yaml'

pull_request:
branches:
- dev
- staging
paths:
- 'exm-web/**'
- '.github/workflows/exmweb.yaml'

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

steps:
- uses: actions/checkout@v3

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

- name: Build
run: |
cd exm-web
rm -rf node_modules
yarn install --frozen-lockfile
yarn build

- name: Build docker image
if: github.event_name == 'push' && ( github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging')
run: |
cd exm-web
echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
DOCKER_BUILDKIT=1 docker build -t erxes/exm:${GITHUB_REF#refs/heads/} -f Dockerfile .
docker push erxes/exm:${GITHUB_REF#refs/heads/}
Loading
Loading