Skip to content

Commit

Permalink
Merge branch 'erxes:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
saurabharch authored Jun 26, 2022
2 parents 20a4628 + e52cf19 commit db90a7e
Show file tree
Hide file tree
Showing 710 changed files with 61,372 additions and 18,268 deletions.
1 change: 1 addition & 0 deletions .buildpacks
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
https://github.com/heroku/heroku-buildpack-nodejs
114 changes: 0 additions & 114 deletions .drone.yml

This file was deleted.

66 changes: 14 additions & 52 deletions .env.sample
Original file line number Diff line number Diff line change
@@ -1,66 +1,28 @@
# general
PORT=3300
PORT_CRONS=3600
PORT_WORKERS=3700
NODE_ENV=development

JWT_TOKEN_SECRET=token

# MongoDB
MONGO_URL=mongodb://localhost/erxes
TEST_MONGO_URL=mongodb://localhost/test

# Redis
REDIS_HOST=localhost
REDIS_PORT=6379
REDIS_PASSWORD=

# erxes-api
HTTPS=false
# RabbitMQ
RABBITMQ_HOST=amqp://localhost

# ELASTICSEARCH
ELASTICSEARCH_URL=http://localhost:9200

# frontend domain
MAIN_APP_DOMAIN=http://localhost:3000
DOMAIN=http://localhost:3300
INTEGRATIONS_API_DOMAIN=http://localhost:3400
CRONS_API_DOMAIN=http://localhost:3600
WORKERS_API_DOMAIN=http://localhost:3700
WIDGETS_DOMAIN=http://localhost:3200
WIDGETS_API_DOMAIN=http://localhost:3100
LOGS_API_DOMAIN=http://localhost:3800

NODE_ENV=development

# Email
COMPANY_EMAIL_FROM=[email protected]
DEFAULT_EMAIL_SERVICE=sendgrid
MAIL_SERVICE=sendgrid
MAIL_PORT=''
MAIL_USER=''
MAIL_PASS=''
MAIL_HOST=''

# Aws S3
AWS_ACCESS_KEY_ID=''
AWS_SECRET_ACCESS_KEY=''
AWS_BUCKET=''
AWS_PREFIX=''

# Aws SES
AWS_SES_ACCESS_KEY_ID=''
AWS_SES_SECRET_ACCESS_KEY=''
AWS_SES_CONFIG_SET=''
AWS_REGION=''
AWS_ENDPOINT=''

# Google Cloud Storage
GOOGLE_CLIENT_ID=''
GOOGLE_CLIENT_SECRET=''
GOOGLE_APPLICATION_CREDENTIALS=''
GOOGLE_TOPIC=''
GOOGLE_SUBSCRIPTION_NAME=''
GOOGLE_PROJECT_ID=''
GOOGLE_CLOUD_STORAGE_BUCKET=''

# AWS | GCS
UPLOAD_SERVICE_TYPE='AWS'

# File system: true | false
FILE_SYSTEM_PUBLIC='true'
INTEGRATIONS_API_DOMAIN=http://localhost:3400
DASHBOARD_DOMAIN=http://localhost:4200
CLIENT_PORTAL_DOMAIN=http://localhost:4300

# Pubsub REDIS | GOOGLE
PUBSUB_TYPE='REDIS'
ELK_SYNCER=false
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# workflow owner
/.github/workflows/ @Jason-2020
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# These are supported funding model platforms

github: erxes
open_collective: erxes
patreon: erxes
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Bug report
about: Create a report to help us improve
title: "[Bug]"
title: ''
labels: bug
assignees: ''

Expand Down
7 changes: 2 additions & 5 deletions .github/ISSUE_TEMPLATE/enhancement-request.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,11 @@ assignees: ''

---

**Is your feature request related to a problem? Please describe.**
**Is your enhancement request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
Add any other context or screenshots about the enhancement request here.
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Additional context**
Add any other context or screenshots about the feature request here.
58 changes: 58 additions & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# Configuration for probot-stale - https://github.com/probot/stale

# Number of days of inactivity before an Issue or Pull Request becomes stale
daysUntilStale: 30

# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
daysUntilClose: 5

# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
onlyLabels: []

# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
exemptLabels:
- pinned
- security
- "[Status] Maybe Later"

# Set to true to ignore issues in a project (defaults to false)
exemptProjects: false

# Set to true to ignore issues in a milestone (defaults to false)
exemptMilestones: false

# Set to true to ignore issues with an assignee (defaults to false)
exemptAssignees: false

# Label to use when marking as stale
staleLabel: stale

# Comment to post when marking as stale. Set to `false` to disable
markComment: >
# Limit the number of actions per hour, from 1-30. Default is 30
limitPerRun: 30

# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
pulls:
markComment: >
Thank you for your contribution! However, it has
not had any activity on it in the past 30 days and will be closed in
5 days if no updates occur. If you believe the changes are still valid then please verify your
branch has no conflicts with target and rebase if needed. If you
are awaiting a (re-)review then please let us know.
issues:
markComment: >
Thank you for your contribution! However, it has
not had any activity on it in the past 30 days and will be closed in
5 days if no updates occur. If you would like this issue to remain open:
1. Verify that you can still reproduce the issue in the latest version of erxes
1. Comment that the issue is still reproducible and include:
* What version of erxes you reproduced the issue on
* What OS and version you reproduced the issue on
* What steps you followed to reproduce the issue
# exemptLabels:
# - confirmed
Loading

0 comments on commit db90a7e

Please sign in to comment.