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.

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

Develop erxes #9

Merged
merged 146 commits into from
May 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
146 commits
Select commit Hold shift + click to select a range
e08a2be
Change button style
ganzorig Mar 31, 2020
e6da7a7
[ImgBot] Optimize images
ImgBotApp Apr 1, 2020
1e5467c
Merge branch 'develop' of github.com:erxes/erxes into perf-onboarding
ganzorig Apr 2, 2020
941050a
Add some style
ganzorig Apr 2, 2020
1347b9b
fix: edit in troubleshooting doc
munkhorgil Apr 4, 2020
538caf7
feat: nylas exchange provider
munkhorgil Apr 4, 2020
0f568fa
fix board item issue when other popups are open
Apr 4, 2020
b8443f1
add missing exchange type
munkhorgil Apr 5, 2020
28a4c6f
Merge pull request #1892 from erxes/feat-exchange
munkhorgil Apr 5, 2020
26d75ef
perf(deal/task/ticket/growthHack) able to show what you write when ac…
munkhjin0223 Apr 6, 2020
e468fcd
Fix integration icon and some text
ganzorig Apr 6, 2020
90afc76
fix deepScan error
munkhjin0223 Apr 6, 2020
ad36cd7
Update mongodb url (#1883)
batnasan Apr 6, 2020
f07bf16
smooch line doc
soyombo-baterdene Apr 6, 2020
95813e4
Minor updates to localization. (#1889)
sergeychikanov Apr 6, 2020
e2f892f
perf(teaminbox): implemented escape to dismiss response templates
jrrcdev Apr 6, 2020
aa6f978
fix conflict
ganzorig Apr 6, 2020
ded9f09
Merge branch 'imgbot' into develop
ganzorig Apr 6, 2020
156b3ad
Merge branch 'develop' of github.com:erxes/erxes into perf-onboarding
ganzorig Apr 6, 2020
8eec36d
perf(settings): email appreareance menu has been removed because it i…
ganzorig Apr 7, 2020
462747b
Merge branch 'develop' of github.com:erxes/erxes into perf-onboarding
ganzorig Apr 7, 2020
a4552a4
fix: mail optimistic response
munkhorgil Apr 7, 2020
ac6200f
Merge branch 'develop' of github.com:erxes/erxes into develop
munkhorgil Apr 7, 2020
1f1392e
remove docs job from gitlab ci, migrating to github actions [skip ci]
Jason-2020 Apr 8, 2020
c1e0de5
Add welcome section on onboarding
ganzorig Apr 8, 2020
30ff757
fix filter name bug
ganzorig Apr 8, 2020
d0a6813
fix: add userId in uploadHandler
munkhorgil Apr 8, 2020
55dd4a8
update segment doc
MujiGMJ Apr 9, 2020
bffe1b8
hide container div after popup is closed (#1902)
Buyantogtokh Apr 9, 2020
043972b
fix: typo in generatel settings google
munkhorgil Apr 9, 2020
e3791a6
Merge branch 'develop' of github.com:erxes/erxes into develop
munkhorgil Apr 9, 2020
1ca4272
fix(segments): wrong preview count for the segment with parent segment
Apr 9, 2020
c1ec388
Merge branch 'develop' of github.com:erxes/erxes into develop
Apr 9, 2020
4fbb772
little fix for drag and drop
munkhjin0223 Apr 9, 2020
336c374
Merge branch 'develop' of github.com:erxes/erxes into develop
munkhjin0223 Apr 9, 2020
a5a15a8
refactor segment constant
Apr 9, 2020
9aab816
Merge branch 'develop' of github.com:erxes/erxes into develop
Apr 9, 2020
b283626
perf(firebase): add google credential field
munkhorgil Apr 9, 2020
4802db1
docs/actions: Integrate Github Actions on our documentation website. …
Jason-2020 Apr 10, 2020
1b12477
docs/actions: correct cache key
Jason-2020 Apr 10, 2020
0d08b65
docs/actions: add more specific cache restore key
Jason-2020 Apr 10, 2020
afa9a69
widgets/actions: Integrate Github Actions on widgets project. (#1913)
Jason-2020 Apr 10, 2020
e49f1b1
widgets: remove gitlab-ci.yml file [ci-skip]
Jason-2020 Apr 10, 2020
ba2a9a7
feat(segments): new rules
Apr 10, 2020
faf5907
Merge branch 'develop' of github.com:erxes/erxes into develop
Apr 10, 2020
2857899
Change feature list step in onboard
ganzorig Apr 10, 2020
7ce200c
perf(segments): added lead, visitor content types
Apr 11, 2020
e8c3f8f
#1920
Apr 11, 2020
be4bfc4
ui/actions: Integrate Github Actions on ui project (#1926)
Jason-2020 Apr 12, 2020
c7c2a38
widgets/actions: more specific cache key
Jason-2020 Apr 12, 2020
d7b66a4
close #1927
Buyantogtokh Apr 13, 2020
9ae0602
Some improvements
ganzorig Apr 13, 2020
96d4407
add email appearance menu in settings
ganzorig Apr 13, 2020
0c8e8c5
Merge branch 'develop' of github.com:erxes/erxes into perf-onboarding
ganzorig Apr 13, 2020
04ff6da
deal drag, without update order (#1919)
munkhsaikhan Apr 13, 2020
03fa86a
Merge branch 'develop' of github.com:erxes/erxes into perf-onboarding
ganzorig Apr 14, 2020
e2aa3d3
Complete onboarding
ganzorig Apr 14, 2020
4d3c8d0
close #1930
Buyantogtokh Apr 14, 2020
4cc4195
erxes/erxes-api#747
Apr 14, 2020
fc47107
Merge branch 'develop' of github.com:erxes/erxes into develop
Apr 14, 2020
e944a1a
Merge branch 'develop' of github.com:erxes/erxes into perf-onboarding
ganzorig Apr 14, 2020
468f434
add tutorial page
ganzorig Apr 14, 2020
f2e1269
Complete tutorial page
ganzorig Apr 15, 2020
3d148ac
perf(widget): add allow attribute on video call iframe
ganzorig Apr 15, 2020
bad88fb
add allow attribute on parent iframe
ganzorig Apr 15, 2020
5bab780
Update README.md (#1916)
Anu-Ujin Apr 15, 2020
a749c50
Fixed inconsistency in styling.
notpallav Apr 15, 2020
4300aae
added some transifex languages (#1909)
MujiGMJ Apr 15, 2020
2cc0d14
improved indonesia (#1904)
MrFatoni Apr 15, 2020
98e4df4
improved indonesia (locales file) (#1905)
MrFatoni Apr 15, 2020
0c0575e
Update contributing.md (#1896)
indraganzorig Apr 15, 2020
79d1c3e
Revert 1905 patch 2 (#1933)
ganzorig Apr 15, 2020
7ef1b63
Revert 1922 patch 1 (#1934)
ganzorig Apr 15, 2020
c3f23fa
Revert 1905 patch 2 (#1935)
ganzorig Apr 15, 2020
d89612c
Revert 1904 patch 1 (#1936)
ganzorig Apr 15, 2020
c585c74
Merge branch 'develop' of github.com:erxes/erxes into perf-onboarding
ganzorig Apr 15, 2020
1f9e253
move `export pop-ups data` to import & export section
munkhjin0223 Apr 15, 2020
e926de3
fix merge conflict
munkhjin0223 Apr 15, 2020
769447e
close #1937
Buyantogtokh Apr 15, 2020
71c869c
removed view link from gathered count
Apr 16, 2020
ea5c95f
refactor some code
ganzorig Apr 16, 2020
9599d92
Merge branch 'develop' of github.com:erxes/erxes into perf-onboarding
ganzorig Apr 16, 2020
4a53b4d
Add doc link in tuorial page
ganzorig Apr 16, 2020
fda9839
perf(onboard): improve onboarding and add tutorial page
ganzorig Apr 16, 2020
a310d22
add rel attribute on external link on tutorila
ganzorig Apr 16, 2020
7188bfb
fix type
ganzorig Apr 16, 2020
f16e69e
#1940
Apr 16, 2020
189557f
Merge branch 'develop' of github.com:erxes/erxes into develop
Apr 16, 2020
21c0cd0
not checking invalid email in auto messages #1940
Apr 17, 2020
55cefdc
fix loader position and change tutorial text
ganzorig Apr 17, 2020
e17f3a1
update DO doc
batnasan Apr 17, 2020
2274a38
add some tutorial video
ganzorig Apr 20, 2020
3b25a87
remove duplication for timezone
munkhjin0223 Apr 20, 2020
0a7972a
fix some bugs for user profile
munkhjin0223 Apr 20, 2020
6f32083
refactor email signature
munkhjin0223 Apr 20, 2020
2fdfca1
fixed deals
Apr 20, 2020
9e6ca29
fix contacts
Apr 20, 2020
85d94cc
fix live chat
Apr 20, 2020
d8f4c29
onboarding fixes
Apr 20, 2020
bf727e1
Merge branch 'develop' of github.com:erxes/erxes into develop
munkhjin0223 Apr 21, 2020
5e22544
fix(engage): typo link in engage config
munkhorgil Apr 21, 2020
1425a42
Add some tutorial videos
ganzorig Apr 21, 2020
9a8b67a
Change integrations descriptions
ganzorig Apr 21, 2020
0cd9f51
perf(appstore): fix confirmation message when delete, archive
ganzorig Apr 22, 2020
8b25b08
perf(widget): fix full message bug when send engage message (close #1…
ganzorig Apr 22, 2020
045b453
fix(contacts): add default value to integrations in LeadFilter
munkhorgil Apr 22, 2020
3143342
fix tooltip position bug
ganzorig Apr 22, 2020
879e59f
close #1946
Buyantogtokh Apr 23, 2020
6cf2f09
fix popup confirm dialog text
Buyantogtokh Apr 23, 2020
24d2dad
close #1947
Buyantogtokh Apr 23, 2020
3ec9f12
close #1948
Buyantogtokh Apr 23, 2020
b5a51c7
Merge branch 'develop' of github.com:erxes/erxes into develop
ganzorig Apr 24, 2020
b2edfdd
Update README.md
Jason-2020 Apr 24, 2020
97cd1b1
Change avatar to gender neutral
ganzorig Apr 24, 2020
1526bdd
change avatar to high contrast
ganzorig Apr 24, 2020
5dff5d4
feat(activity log): show archive history on activity log (deal,ticket…
Enkhtuvshin0513 Apr 25, 2020
552ebcf
Trackeddataupdate (#1950)
MujiGMJ Apr 25, 2020
f70aa2f
Segmentcase (#1949)
MujiGMJ Apr 25, 2020
e86f173
Merge branch 'master' of github.com:erxes/erxes into develop
Apr 25, 2020
105f55b
style(customer): improve quick message form
ganzorig Apr 27, 2020
5ef5582
fix(customer): fix can not insert hyperlink in email form
ganzorig Apr 27, 2020
95a7932
perf(segment): add select options to segment condition
munkhorgil Apr 27, 2020
b7377e8
style(common): refactor label component
ganzorig Apr 28, 2020
6b61bf9
fix(tutorial): complete and fix video tutorial
ganzorig Apr 28, 2020
d122b20
Merge branch 'develop' of github.com:erxes/erxes into perf-visitors
ganzorig Apr 28, 2020
368062d
make upload file size limit to 20mb
Buyantogtokh Apr 28, 2020
438d5a5
rm(emailTemplate): remove pagination param
munkhorgil Apr 28, 2020
faca719
Merge branch 'develop' of github.com:erxes/erxes into develop
munkhorgil Apr 28, 2020
7aced58
fix(engae): fix not showing all email templates, improve select ui (c…
ganzorig Apr 28, 2020
8aecf1c
fix conflict
ganzorig Apr 28, 2020
07cb463
Merge branch 'develop' of github.com:erxes/erxes into develop
Apr 28, 2020
4445434
fix(emailTemplate): fix conflict and revert change
munkhorgil Apr 28, 2020
8cd658b
added some command
Apr 28, 2020
1786a26
typo
Apr 28, 2020
51c15ae
Merge branch 'develop' of github.com:erxes/erxes into perf-visitors
ganzorig Apr 29, 2020
dbd450e
ci: build docker image on tag events
Jason-2020 Apr 29, 2020
6fefd37
Merge branch 'develop' of github.com:erxes/erxes into perf-visitors
ganzorig Apr 29, 2020
e389c99
Merge branch 'perf-visitors' into develop
ganzorig Apr 29, 2020
2dbbb8b
Update heroku doc (#1965)
batnasan Apr 30, 2020
b1f215d
Doc reference link (#1961)
MujiGMJ Apr 30, 2020
baa1fb6
Merge branch 'develop' of github.com:erxes/erxes into develop
May 1, 2020
d33f3f8
showing sending status for auto messages
May 2, 2020
a9f974c
remove office link from docs
May 2, 2020
fea09d2
#1931
May 2, 2020
8fcbdca
erxes/erxes-api#774
May 6, 2020
1570173
Merge branch 'develop' into develop-erxes
jrrcdev May 7, 2020
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: 2 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# workflow owner
/.github/workflows/ @Jason-2020
71 changes: 71 additions & 0 deletions .github/workflows/documentation.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
name: Publish documentation

on:
push:
branches:
- develop
paths:
- 'docs/**'
- '.github/workflows/documentation.yaml'
pull_request:
branches:
- develop
paths:
- 'docs/**'

jobs:
docs:
runs-on: ubuntu-18.04

# name: Node ${{ matrix.node-version }}

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2

- name: Use Node.js 10.x
uses: actions/setup-node@v1
with:
node-version: 10.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)"

- name: Cache Node.js modules
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
uses: actions/cache@v1
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-docs-${{ hashFiles('docs/**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-docs-${{ hashFiles('docs/**/yarn.lock') }}
${{ runner.os }}-yarn-docs-
${{ runner.os }}-yarn-

- name: Install
run: |
cd docs/website
yarn install

- name: Build
if: github.event_name == 'pull_request'
run: |
cd docs/website
yarn run build
env:
CI: true

- name: Publish
if: github.event_name == 'push'
run: |
cd docs/website
git config --global user.email "$DOC_USERNAME@users.noreply.github.com"
git config --global user.name "$DOC_USERNAME"
echo "machine github.com login $DOC_USERNAME password $DOC_TOKEN" > ~/.netrc
GIT_USER=$DOC_USERNAME CURRENT_BRANCH=develop yarn run publish-gh-pages
env:
CI: true
DOC_USERNAME: ${{ secrets.DOC_USERNAME }}
DOC_TOKEN: ${{ secrets.DOC_TOKEN }}
85 changes: 85 additions & 0 deletions .github/workflows/ui.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
name: UI CI

on:
push:
branches:
- '**'
paths:
- 'ui/**'
- '.github/workflows/ui.yaml'
tags:
- '*'
pull_request:
branches:
- master
- develop
- apm
- automations
paths:
- 'ui/**'

jobs:
ui:
runs-on: ubuntu-18.04

# name: Node ${{ matrix.node-version }}

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2

- name: Use Node.js 10.x
uses: actions/setup-node@v1
with:
node-version: 10.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)"

- name: Cache Node.js modules
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
uses: actions/cache@v1
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-ui-${{ hashFiles('ui/**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-ui-${{ hashFiles('ui/**/yarn.lock') }}
${{ runner.os }}-yarn-ui-
${{ runner.os }}-yarn-

- name: Install
run: |
cd ui
yarn install

- name: Lint
run: |
cd ui
yarn lint

- name: Tsc
run: |
cd ui
yarn tsc

- name: Build
run: |
cd ui
yarn build

- name: Build docker image [push]
if: github.event_name == 'push' && ( github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/apm' || github.ref == 'refs/heads/automations')
run: |
cd ui
echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
docker build -t erxes/erxes:${GITHUB_REF#refs/heads/} -f Dockerfile .
docker push erxes/erxes:${GITHUB_REF#refs/heads/}

- name: Build docker image [tag]
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
run: |
cd ui
docker build -t erxes/erxes:${GITHUB_REF#refs/tags/} -f Dockerfile .
docker push erxes/erxes:${GITHUB_REF#refs/tags/}
79 changes: 79 additions & 0 deletions .github/workflows/widgets.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
name: Widgets CI

on:
push:
branches:
- '**'
paths:
- 'widgets/**'
- '.github/workflows/widgets.yaml'
tags:
- '*'
pull_request:
branches:
- master
- develop
- apm
paths:
- 'widgets/**'

jobs:
widgets:
runs-on: ubuntu-18.04

# name: Node ${{ matrix.node-version }}

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2

- name: Use Node.js 10.x
uses: actions/setup-node@v1
with:
node-version: 10.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)"

- name: Cache Node.js modules
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
uses: actions/cache@v1
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-widgets-${{ hashFiles('widgets/**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-widgets-${{ hashFiles('widgets/**/yarn.lock') }}
${{ runner.os }}-yarn-widgets-
${{ runner.os }}-yarn-

- name: Install
run: |
cd widgets
yarn install

- name: Lint
run: |
cd widgets
yarn lint

- name: Build
run: |
cd widgets
yarn build

- name: Build docker image [push]
if: github.event_name == 'push' && ( github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/apm' )
run: |
cd widgets
echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
docker build -t erxes/erxes-widgets:${GITHUB_REF#refs/heads/} -f Dockerfile .
docker push erxes/erxes-widgets:${GITHUB_REF#refs/heads/}

- name: Build docker image [tag]
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
run: |
cd widgets
docker build -t erxes/erxes-widgets:${GITHUB_REF#refs/tags/} -f Dockerfile .
docker push erxes/erxes-widgets:${GITHUB_REF#refs/tags/}
17 changes: 0 additions & 17 deletions .gitlab-ci.yml

This file was deleted.

43 changes: 40 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

erxes is an open source growth marketing platform. Marketing, sales, and customer service platform designed to help your business attract more engaged customers. Replace Hubspot with the mission and community-driven ecosystem.

<a href="https://demo.erxes.io/">Live demo</a> <b>| </b> <a href="https://community.erxes.io/register/Gw4WRJnk9fSbyAXTq">Join us on RocketChat</a>
<a href="https://demo.erxes.io/">Live demo</a> <b>| </b> <a href="https://community.erxes.io/register/Gw4WRJnk9fSbyAXTq">Join our community</a>

[![Codacy Badge](https://api.codacy.com/project/badge/Grade/ed8c207f4351446b8ace7a323630889f)](https://www.codacy.com/app/erxes/erxes)
[![Codeclimate Badge](https://api.codeclimate.com/v1/badges/693e2ffc40bc2601630d/maintainability)](https://codeclimate.com/github/erxes/erxes/maintainability)
Expand All @@ -13,7 +13,7 @@ erxes is an open source growth marketing platform. Marketing, sales, and custome
[![Backer](https://opencollective.com/erxes/backers/badge.svg?label=Backer&color=brightgreen)](https://opencollective.com/erxes/)
[![Sponsor](https://opencollective.com/erxes/sponsors/badge.svg?label=Sponsor&color=brightgreen)](https://opencollective.com/erxes/)

<a href="https://erxes.io" target="_blank"><img src="https://s3.amazonaws.com/erxes/github/git-erxes.gif" alt="Open Source Growth Marketing Platform "></a>
<a href="https://erxes.io" target="_blank"><img src="https://erxes-os.s3-us-west-2.amazonaws.com/github/git-erxes.gif" alt="Open Source Growth Marketing Platform "></a>

## Features

Expand All @@ -35,10 +35,47 @@ erxes helps you attract and engage more customers while giving you high lead con
* <a href="https://docs.erxes.io/installation/docker">Install erxes</a> <br>
* <a href="https://docs.erxes.io">erxes documentation</a> <br>
* <a href="https://docs.erxes.io/developer/contributing">Contributing to erxes</a> <br>

## Deployment

### Ubuntu 16.04/18.04 LTS
Follow these deployment instructions.

[![ubuntu](https://erxes-os.s3-us-west-2.amazonaws.com/github/ubuntu-logo.png)](https://docs.erxes.io/installation/ubuntu)

### Debian 10
Follow these deployment instructions.

[![debian](https://erxes-os.s3-us-west-2.amazonaws.com/github/debian-logo.png)](https://docs.erxes.io/installation/debian10)

### CentOS 8
Follow these deployment instructions.

[![debian](https://erxes-os.s3-us-west-2.amazonaws.com/github/centos-logo.png)](https://docs.erxes.io/installation/centos8)

### Docker
Follow these deployment instructions.

[![debian](https://erxes-os.s3-us-west-2.amazonaws.com/github/docker-logo.png)](https://docs.erxes.io/installation/docker)

### Heroku
Host your own erxes server with One-Click Deploy.

[![debian](https://erxes-os.s3-us-west-2.amazonaws.com/github/heroku.png)](https://heroku.com/deploy?template=https://github.com/erxes/erxes/tree/develop)

### AWS Marketplace
Launch an EC2 instance using erxes in the AWS Marketplace.

[![debian](https://erxes-os.s3-us-west-2.amazonaws.com/github/aws-logo.png)](https://aws.amazon.com/marketplace/pp/B086MZ9FVS/)

### DigitalOcean Droplet
Deploy to a DigitalOcean droplet with our one-click install listing from the DigitalOcean Marketplace.

[![debian](https://erxes-os.s3-us-west-2.amazonaws.com/github/droplet.png)](https://marketplace.digitalocean.com/apps/erxes)

## Contributors

This project exists thanks to all the people who contribute. [[Contribute]](CONTRIBUTING.md).
This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)]
<a href="graphs/contributors"><img src="https://opencollective.com/erxes/contributors.svg?width=890" /></a>


Expand Down
2 changes: 1 addition & 1 deletion app.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
],
"website": "https://erxes.io",
"repository": "https://github.com/erxes/erxes",
"logo": "https://raw.githubusercontent.com/erxes/erxes/master/public/images/logo-dark.png",
"logo": "https://raw.githubusercontent.com/erxes/erxes/master/ui/public/images/logo-dark.png",
"success_url": "/",
"env": {
"PORT": {
Expand Down
46 changes: 0 additions & 46 deletions docs/.docs.gitlab-ci.yml

This file was deleted.

Loading