diff --git a/.env b/.env
index 6faa0d99db..65bca4efc4 100644
--- a/.env
+++ b/.env
@@ -18,7 +18,7 @@ _APP_REDIS_PORT=6379
_APP_DB_HOST=mariadb
_APP_DB_PORT=3306
_APP_DB_SCHEMA=appwrite
-_APP_DB_USER=user
+_APP_DB_USER=root
_APP_DB_PASS=password
_APP_STORAGE_ANTIVIRUS=disabled
_APP_STORAGE_ANTIVIRUS_HOST=clamav
diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
deleted file mode 100644
index 63e0e64f94..0000000000
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ /dev/null
@@ -1,44 +0,0 @@
----
-name: 🐛 Bug Report
-about: Submit a bug report to help us improve
-labels: "bug"
----
-
-## 🐛 Bug Report
-
-(A clear and concise description of what the bug is)
-
-## Have you spent some time to check if this issue has been raised before?
-
-(Have you googled for a similar issue or checked our older issues for a similar bug)
-
-## To Reproduce
-
-(Write your steps here:)
-
-## Expected behavior
-
-
-
-(Write what you thought would happen.)
-
-## Actual Behavior
-
-
-
-(Write what happened. Add screenshots, if applicable.)
-
-## Your Environment
-
-
-
-(Write Environment, Operating system and version etc.)
diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml
new file mode 100644
index 0000000000..2551c366bf
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.yaml
@@ -0,0 +1,82 @@
+name: "🐛 Bug Report"
+description: "Submit a bug report to help us improve"
+title: "🐛 Bug Report: "
+labels: [bug]
+body:
+ - type: markdown
+ attributes:
+ value: |
+ Thanks for taking the time to fill out our bug report form 🙏
+ - type: textarea
+ id: steps-to-reproduce
+ validations:
+ required: true
+ attributes:
+ label: "👟 Reproduction steps"
+ description: "How do you trigger this bug? Please walk us through it step by step."
+ placeholder: "When I ..."
+ - type: textarea
+ id: expected-behavior
+ validations:
+ required: true
+ attributes:
+ label: "👍 Expected behavior"
+ description: "What did you think would happen?"
+ placeholder: "It should ..."
+ - type: textarea
+ id: actual-behavior
+ validations:
+ required: true
+ attributes:
+ label: "👎 Actual Behavior"
+ description: "What did actually happen? Add screenshots, if applicable."
+ placeholder: "It actually ..."
+ - type: dropdown
+ id: appwrite-version
+ attributes:
+ label: "🎲 Appwrite version"
+ description: "What version of Appwrite are you running?"
+ options:
+ - Version 0.10.x
+ - Version 0.9.x
+ - Version 0.8.x
+ - Version 0.7.x
+ - Version 0.6.x
+ - Different version (specify in environment)
+ validations:
+ required: true
+ - type: dropdown
+ id: operating-system
+ attributes:
+ label: "💻 Operating system"
+ description: "What OS is your server / device running on?"
+ options:
+ - Linux
+ - MacOS
+ - Windows
+ - Something else
+ validations:
+ required: true
+ - type: textarea
+ id: environment
+ validations:
+ required: false
+ attributes:
+ label: "🧱 Your Environment"
+ description: "Is your environment customized in any way?"
+ placeholder: "I use Cloudflare for ..."
+ - type: checkboxes
+ id: no-duplicate-issues
+ attributes:
+ label: "👀 Have you spent some time to check if this issue has been raised before?"
+ description: "Have you Googled for a similar issue or checked our older issues for a similar bug?"
+ options:
+ - label: "I checked and didn't find similar issue"
+ required: true
+ - type: checkboxes
+ id: read-code-of-conduct
+ attributes:
+ label: "🏢 Have you read the Code of Conduct?"
+ options:
+ - label: "I have read the [Code of Conduct](https://github.com/appwrite/appwrite/blob/HEAD/CODE_OF_CONDUCT.md)"
+ required: true
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
deleted file mode 100644
index 9aa7e59e19..0000000000
--- a/.github/ISSUE_TEMPLATE/documentation.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-name: 📚 Documentation
-about: Report an issue related to documentation
-labels: "documentation"
----
-
-## 📚 Documentation
-
-(A clear and concise description of what the issue is.)
-
-## Have you spent some time to check if this issue has been raised before?
-
-(Have you googled for a similar issue or checked our older issues for a similar bug)
-
-### Have you read the [Code of Conduct](https://github.com/appwrite/appwrite/blob/master/CODE_OF_CONDUCT.md)?
-
-(Write your answer here.)
diff --git a/.github/ISSUE_TEMPLATE/documentation.yaml b/.github/ISSUE_TEMPLATE/documentation.yaml
new file mode 100644
index 0000000000..c2f829df39
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/documentation.yaml
@@ -0,0 +1,32 @@
+name: "📚 Documentation"
+description: "Report an issue related to documentation"
+title: "📚 Documentation: "
+labels: [documentation]
+body:
+ - type: markdown
+ attributes:
+ value: |
+ Thanks for taking the time to make our documentation better 🙏
+ - type: textarea
+ id: issue-description
+ validations:
+ required: true
+ attributes:
+ label: "💭 Description"
+ description: "A clear and concise description of what the issue is."
+ placeholder: "Documentation should not ..."
+ - type: checkboxes
+ id: no-duplicate-issues
+ attributes:
+ label: "👀 Have you spent some time to check if this issue has been raised before?"
+ description: "Have you Googled for a similar issue or checked our older issues for a similar bug?"
+ options:
+ - label: "I checked and didn't find similar issue"
+ required: true
+ - type: checkboxes
+ id: read-code-of-conduct
+ attributes:
+ label: "🏢 Have you read the Code of Conduct?"
+ options:
+ - label: "I have read the [Code of Conduct](https://github.com/appwrite/appwrite/blob/HEAD/CODE_OF_CONDUCT.md)"
+ required: true
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
deleted file mode 100644
index 35ad1b9d8f..0000000000
--- a/.github/ISSUE_TEMPLATE/feature.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-name: 🚀 Feature
-about: Submit a proposal for a new feature
-labels: "feature"
----
-
-## 🚀 Feature
-
-(A clear and concise description of what the feature is.)
-
-## Have you spent some time to check if this issue has been raised before?
-
-(Have you googled for a similar issue or checked our older issues for a similar bug)
-
-### Have you read the [Code of Conduct](https://github.com/appwrite/appwrite/blob/master/CODE_OF_CONDUCT.md)?
-
-(Write your answer here.)
-
-## Pitch
-
-(Please explain why this feature should be implemented and how it would be used. Add examples, if applicable.)
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
new file mode 100644
index 0000000000..6181cda753
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -0,0 +1,40 @@
+name: 🚀 Feature
+description: "Submit a proposal for a new feature"
+title: "🚀 Feature: "
+labels: [feature]
+body:
+ - type: markdown
+ attributes:
+ value: |
+ Thanks for taking the time to fill out our feature request form 🙏
+ - type: textarea
+ id: feature-description
+ validations:
+ required: true
+ attributes:
+ label: "🔖 Feature description"
+ description: "A clear and concise description of what the feature is."
+ placeholder: "You should add ..."
+ - type: textarea
+ id: pitch
+ validations:
+ required: true
+ attributes:
+ label: "🎤 Pitch"
+ description: "Please explain why this feature should be implemented and how it would be used. Add examples, if applicable."
+ placeholder: "In my use-case, ..."
+ - type: checkboxes
+ id: no-duplicate-issues
+ attributes:
+ label: "👀 Have you spent some time to check if this issue has been raised before?"
+ description: "Have you Googled for a similar issue or checked our older issues for a similar bug?"
+ options:
+ - label: "I checked and didn't find similar issue"
+ required: true
+ - type: checkboxes
+ id: read-code-of-conduct
+ attributes:
+ label: "🏢 Have you read the Code of Conduct?"
+ options:
+ - label: "I have read the [Code of Conduct](https://github.com/appwrite/appwrite/blob/HEAD/CODE_OF_CONDUCT.md)"
+ required: true
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 3381c3ecb2..e433217a96 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,9 @@ arch:
os: linux
+vm:
+ size: large
+
language: shell
notifications:
@@ -13,33 +16,65 @@ notifications:
- team@appwrite.io
before_install:
+# Install latest Docker
- curl -fsSL https://get.docker.com | sh
+# Enable Buildkit in Docker config
- echo '{"experimental":"enabled"}' | sudo tee /etc/docker/daemon.json
- mkdir -p $HOME/.docker
- echo '{"experimental":"enabled"}' | sudo tee $HOME/.docker/config.json
- sudo service docker start
+# Login to increase Docker Hub ratelimit
- >
if [ ! -z "${DOCKERHUB_PULL_USERNAME:-}" ]; then
echo "${DOCKERHUB_PULL_PASSWORD}" | docker login --username "${DOCKERHUB_PULL_USERNAME}" --password-stdin
fi
- docker --version
-- docker buildx create --use
-- chmod -R u+x ./.travis-ci
-- export COMPOSE_INTERACTIVE_NO_CLI=1
+# Install latest Compose
+- sudo rm /usr/local/bin/docker-compose
+- curl -L https://github.com/docker/compose/releases/download/1.29.2/docker-compose-`uname -s`-`uname -m` > docker-compose
+- chmod +x docker-compose
+- sudo mv docker-compose /usr/local/bin
+- docker-compose --version
+# Enable Buildkit
+- docker buildx create --name travis_builder --use
+- export COMPOSE_INTERACTIVE_NO_CLI
+- export DOCKER_BUILDKIT=1
+- export COMPOSE_DOCKER_CLI_BUILD=1
+- export BUILDKIT_PROGRESS=plain
# Only pass a single runtime for CI stability
- echo "_APP_FUNCTIONS_RUNTIMES=php-8.0" >> .env
+# Ensure Travis scripts are executable
+- chmod -R u+x ./.travis-ci
install:
-- docker-compose up -d --build
+- docker-compose pull
+# Upstream bug causes buildkit pulls to fail so prefetch base images
+# https://github.com/moby/moby/issues/41864
+- docker pull composer:2.0
+- docker pull php:8.0-cli-alpine
+- docker-compose build
+- docker-compose up -d
- sleep 10
script:
-- docker ps
+- docker ps -a
+# Tests should fail if any container is in exited status
+- ALL_UP=`docker ps -aq --filter "status=exited"`
+- >
+ if [[ "$ALL_UP" != "" ]]; then
+ exit 1
+ fi
- docker-compose logs appwrite
+- docker-compose logs mariadb
- docker-compose logs appwrite-worker-functions
- docker-compose exec appwrite doctor
- docker-compose exec appwrite vars
- docker-compose exec appwrite test --debug
+- docker-compose logs appwrite
+
+after_script:
+# travis re-uses their build nodes so clean them up
+- docker buildx rm travis_builder
after_failure:
- docker-compose logs appwrite
diff --git a/CHANGES.md b/CHANGES.md
index 98b28de710..6d86aab62d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,25 @@
-# Unreleased Version 0.11.0
+
+# Unreleased Version 1.1.0
- Added ability to create syncronous function executions
- Introduced new execution model for functions
+
+# Version 1.0.0
+
+## Features
+
+- Grouped auth related attributes in project collection. Introduced new attribute `auths` and removed all attributes related to auth methods and `usersAuthLimit` as well, all these are grouped under `auths` attribute
+- Grouped oAuth related attributes in project collection. Introduced new attribute `providers` and removed all attributes related to OAuth2 providers. All OAuth2 attributes are grouped under `providers`
+- Project model changed, `userAuth