diff --git a/CHANGES.md b/CHANGES.md
index b1c6906286..8607b28fb9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,6 +8,7 @@
- Added option to delete team from the console
- Added option to view team members from the console
- Added option to join a user to any team from the console
+- Added option to delete user from the API (@TorstenDittmann)
- Added support for Brotli compression (@PedroCisnerosSantana, @Rohitub222)
- New UI micro-interactions and CSS fixes (@AnatoleLucet)
- UI performance & accessibility improvments (#406)
@@ -33,6 +34,8 @@
- Task name max length is now 128 chars and not 256 for better API consistency
- Platform name max length is now 128 chars and not 256 for better API consistency
- Webhooks payloads are now exactly the same as any of the API response objects
+- Added new locale: Marathi -mr (@spielers)
+>>>>>>> b12097efecffcefe89cbc411148acb45fbdfc374
- New and consistent response format for all API object + new response examples in the docs
- Removed user roles attribute from user object (can be fetched from /v1/teams/memberships) **
- Removed type attribute from session object response (used only internally)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 78623e08fc..f5c467cad9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,6 +10,52 @@ If you are worried or don’t know where to start, check out our next section ex
Help us keep Appwrite open and inclusive. Please read and follow our [Code of Conduct](/CODE_OF_CONDUCT.md).
+## Submit a Pull Request 🚀
+
+Branch naming convention is as following
+
+`TYPE-ISSUE_ID-DESCRIPTION`
+
+example:
+```
+doc-548-submit-a-pull-request-section-to-contribution-guide
+```
+
+When `TYPE` can be:
+
+- **feat** - is a new feature
+- **doc** - documentation only changes
+- **cicd** - changes related to CI/CD system
+- **fix** - a bug fix
+- **refactor** - code change that neither fixes a bug nor adds a feature
+
+**All PRs must include commit message with the changes description!**
+
+For the initial start, fork the project and use git clone command to download the repository to your computer. A standard procedure for working on an issue would be to:
+
+1. `git pull`, before creating a new branch, pull the changes from upstream. Your master needs to be up to date.
+```
+$ git pull
+```
+2. Create new branch from `master` like: `doc-548-submit-a-pull-request-section-to-contribution-guide`
+```
+$ git checkout -b [name_of_your_new_branch]
+```
+3. Work - commit - repeat ( be sure to be in your branch )
+
+4. Push changes to GitHub
+```
+$ git push origin [name_of_your_new_branch]
+```
+
+6. Submit your changes for review
+If you go to your repository on GitHub, you'll see a `Compare & pull request` button. Click on that button.
+7. Start a Pull Request
+Now submit the pull request and , click on `Create pull request`.
+6. Get a code review approval / reject
+7. After approval, merge your PR
+8. GitHub will automatically delete the branch, after the merge is done. (they can still be restored).
+
## Setup From Source
To set up a working **development environment**, just fork the project git repository and install the backend and frontend dependencies using the proper package manager and create run the docker-compose stack.
@@ -32,6 +78,59 @@ After finishing the installation process, you can start writing and editing code
Appwrite's current structure is a combination of both [Monolithic](https://en.wikipedia.org/wiki/Monolithic_application) and [Microservice](https://en.wikipedia.org/wiki/Microservices) architectures, but our final goal, as we grow, is to be using only microservices.
+### File Structure
+
+```bash
+.
+├── app # Main application
+│ ├── config # Config files
+│ ├── controllers # API & dashboard controllers
+│ │ ├── api
+│ │ ├── shared
+│ │ └── web
+│ ├── db # DB schemas
+│ ├── sdks # SDKs generated copies (used for generating code examples)
+│ ├── tasks # Server CLI commands
+│ ├── views # HTML server-side templates
+│ └── workers # Background workers
+├── bin # Server executables (tasks & workers)
+├── docker # Docker related resources and configs
+├── docs # Docs and tutorials
+│ ├── examples
+│ ├── references
+│ ├── sdks
+│ ├── services
+│ ├── specs
+│ └── tutorials
+├── public # Public files
+│ ├── dist
+│ ├── fonts
+│ ├── images
+│ ├── scripts
+│ └── styles
+├── src # Supporting libraries (each lib has one role, common libs are released as individual projects)
+│ └── Appwrite
+│ ├── Auth
+│ ├── Database
+│ ├── Docker
+│ ├── Event
+│ ├── Extend
+│ ├── Network
+│ ├── OpenSSL
+│ ├── Preloader
+│ ├── Resize
+│ ├── Storage
+│ ├── Swoole
+│ ├── Task
+│ ├── Template
+│ ├── URL
+│ └── Utopia
+└── tests # End to end & unit tests
+ ├── e2e
+ ├── resources
+ └── unit
+```
+
---

---
diff --git a/README.md b/README.md
index 4013df3eb3..df56e99084 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,7 @@ The easiest way to start running your Appwrite server is by running our docker-c
docker run -it --rm \
--volume /var/run/docker.sock:/var/run/docker.sock \
--volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
+ --entrypoint="install" \
appwrite/appwrite:0.7.0
```
@@ -62,6 +63,7 @@ docker run -it --rm \
docker run -it --rm ^
--volume //var/run/docker.sock:/var/run/docker.sock ^
--volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
+ --entrypoint="install" ^
appwrite/appwrite:0.7.0
```
@@ -71,6 +73,7 @@ docker run -it --rm ^
docker run -it --rm ,
--volume /var/run/docker.sock:/var/run/docker.sock ,
--volume ${pwd}/appwrite:/usr/src/code/appwrite:rw ,
+ --entrypoint="install" ,
appwrite/appwrite:0.7.0
```
diff --git a/app/config/locale/translations/mr.continents.php b/app/config/locale/translations/mr.continents.php
new file mode 100644
index 0000000000..70fc337ba3
--- /dev/null
+++ b/app/config/locale/translations/mr.continents.php
@@ -0,0 +1,11 @@
+ 'अफ़्रीका',
+ 'AN' => 'अंटार्कटिका',
+ 'AS' => 'एशिया',
+ 'EU' => 'यूरोप',
+ 'NA' => 'उत्तर अमेरिका',
+ 'OC' => 'ओशिनिया',
+ 'SA' => 'दक्षिण अमेरिका',
+];
diff --git a/app/config/locale/translations/mr.countries.php b/app/config/locale/translations/mr.countries.php
new file mode 100644
index 0000000000..f9f40230a0
--- /dev/null
+++ b/app/config/locale/translations/mr.countries.php
@@ -0,0 +1,203 @@
+ 'अफगानिस्तान',
+ 'AO' => 'अंगोला',
+ 'AL' => 'अल्बानिया',
+ 'AD' => 'अंडोरा',
+ 'AE' => 'संयुक्त अरब अमीरात',
+ 'AR' => 'अर्जेंटीना',
+ 'AM' => 'आर्मेनिया',
+ 'AG' => 'एंटीगुआ और बारबुडा',
+ 'AU' => 'ऑस्ट्रेलिया',
+ 'AT' => 'ऑस्ट्रिया',
+ 'AZ' => 'अजरबैजान',
+
+ 'BI' => 'बुरुंडी',
+ 'BE' => 'बेल्जियम',
+ 'BJ' => 'बेनिन',
+ 'BF' => 'बुर्किना फ़ासो',
+ 'BD' => 'बांग्लादेश',
+ 'BG' => 'बुल्गारिया',
+ 'BH' => 'बहरीन',
+ 'BS' => 'बहामास',
+ 'BA' => 'बोस्निया और हर्ज़ेगोविना',
+ 'BY' => 'बेलारूस',
+ 'BZ' => 'बेलीज',
+ 'BO' => 'बोलीविया',
+ 'BR' => 'ब्राज़ील',
+ 'BB' => 'बारबाडोस',
+ 'BN' => 'ब्रुनेई',
+ 'BT' => 'भूटान',
+ 'BW' => 'बोत्सवाना',
+ 'CF' => 'मध्य अफ्रीकी गणराज्य',
+ 'CA' => 'कनाडा',
+ 'CH' => 'स्विटज़रलैंड',
+ 'CL' => 'चिली',
+ 'CN' => 'चीन',
+ 'CI' => 'आइवरी कोस्ट',
+ 'CM' => 'कैमरून',
+ 'CD' => 'डीआर कांगो',
+ 'CG' => 'कांगो गणराज्य',
+ 'CO' => 'कोलंबिया',
+ 'KM' => 'कोमोरोस',
+ 'CV' => 'केप वर्डे',
+ 'CR' => 'कोस्टा रिका',
+ 'CU' => 'क्यूबा',
+ 'CY' => 'साइप्रस',
+ 'CZ' => 'चेकिया',
+ 'DE' => 'जर्मनी',
+ 'DJ' => 'जिबूती',
+ 'DM' => 'डोमिनिका',
+ 'DK' => 'डेनमार्क',
+ 'DO' => 'डोमिनिकन रिपब्लिक',
+ 'DZ' => 'अल्जीरिया',
+ 'ER' => 'इरिट्रिया',
+ 'EC' => 'इक्वाडोर',
+ 'EG' => 'मिस्र',
+ 'IR' => 'इरिट्रिया',
+ 'ES' => 'स्पेन',
+ 'EE' => 'एस्टोनिया',
+ 'ET' => 'इथियोपिया',
+ 'FI' => 'फिनलैंड',
+ 'FJ' => 'फिजी',
+ 'FR' => 'फ्रांस',
+ 'FM' => 'माइक्रोनेशिया',
+ 'GA' => 'गैबॉन',
+ 'GB' => 'यूनाइटेड किंगडम',
+ 'GE' => 'जॉर्जिया',
+ 'GH' => 'घाना',
+ 'GN' => 'गिनी',
+ 'GM' => 'गाम्बिया',
+ 'GW' => 'गिनी-बिसाऊ',
+ 'GQ' => 'इक्वेटोरियल गिनी',
+ 'GR' => 'ग्रीस',
+ 'GD' => 'ग्रेनाडा',
+ 'GT' => 'ग्वाटेमाला',
+ 'GY' => 'गुयाना',
+ 'HN' => 'होंडुरास',
+ 'HR' => 'क्रोएशिया',
+ 'HT' => 'हैती',
+ 'HU' => 'हंगरी',
+ 'ID' => 'इंडोनेशिया',
+ 'IN' => 'भारत',
+ 'IE' => 'आयरलैंड',
+ 'IR' => 'ईरान',
+ 'IQ' => 'इराक',
+ 'IS' => 'आइसलैंड',
+ 'IL' => 'इज़राइल',
+ 'IT' => 'इटली',
+ 'JM' => 'जमैका',
+ 'JO' => 'जॉर्डन',
+ 'JP' => 'जापान',
+ 'KZ' => 'कजाकिस्तान',
+ 'KE' => 'केन्या',
+ 'KG' => 'किर्गिस्तान',
+ 'KH' => 'कंबोडिया',
+ 'KI' => 'किरीबाती',
+ 'KN' => 'सेंट किट्स एंड नेविस',
+ 'KR' => 'दक्षिण कोरिया',
+ 'KW' => 'कुवैत',
+
+ 'LA' => 'लाओस',
+ 'LB' => 'लेबनान',
+ 'LR' => 'लाइबेरिया',
+ 'LY' => 'लीबिया',
+ 'LC' => 'सेंट लूसिया',
+ 'LI' => 'लिकटेंस्टीन',
+ 'LK' => 'श्रीलंका',
+ 'LS' => 'लेसोथो',
+ 'LT' => 'लिथुआनिया',
+ 'LU' => 'लक्ज़मबर्ग',
+ 'LV' => 'लातविया',
+ 'MA' => 'मोरक्को',
+ 'MC' => 'मोनाको',
+ 'MD' => 'मोल्दोवा',
+ 'MG' => 'मेडागास्कर',
+ 'MV' => 'मालदीव',
+ 'MX' => 'मेक्सिको',
+ 'MH' => 'मार्शल आइलैंड्स',
+ 'MK' => 'मैसिडोनिया',
+ 'ML' => 'रक्त',
+ 'MT' => 'माल्टा',
+ 'MM' => 'म्यांमार',
+ 'ME' => 'मोंटेनेग्रो',
+ 'MN' => 'मंगोलिया',
+ 'MZ' => 'मोज़ाम्बिक',
+ 'MR' => 'मॉरिटानिया',
+ 'MU' => 'मॉरीशस',
+ 'MW' => 'मलावी',
+ 'MY' => 'मलेशिया',
+ 'NA' => 'नामीबिया',
+ 'NE' => 'नाइजर',
+ 'NG' => 'नाइजीरिया',
+ 'NI' => 'निकारागुआ',
+ 'NL' => 'नीदरलैंड',
+ 'NO' => 'नॉर्वे',
+ 'NP' => 'नेपाल',
+ 'NR' => 'नारू',
+ 'NZ' => 'न्यूजीलैंड',
+ 'OM' => 'ओमान',
+ 'PK' => 'पाकिस्तान',
+ 'PA' => 'पनामा',
+ 'PE' => 'पेरू',
+ 'PH' => 'फिलीपींस',
+ 'PW' => 'पलाऊ',
+ 'PG' => 'पापुआ न्यू गिनी',
+ 'PL' => 'पोलैंड',
+ 'KP' => 'उत्तर कोरिया',
+ 'PT' => 'पुर्तगाल',
+ 'PY' => 'पराग्वे',
+
+ 'QA' => 'कतर',
+ 'RO' => 'रोमानिया',
+ 'RU' => 'रूस',
+ 'RW' => 'रवांडा',
+ 'SA' => 'सऊदी अरब',
+ 'SD' => 'सूडान',
+ 'SN' => 'सेनेगल',
+ 'SG' => 'सिंगापुर',
+ 'SB' => 'सोलोमन द्वीप',
+ 'SL' => 'सिएरा लियोन',
+ 'SV' => 'अल साल्वाडोर',
+ 'SM' => 'सैन मैरिनो',
+ 'SO' => 'सोमालिया',
+ 'RS' => 'सर्बिया',
+ 'SS' => 'दक्षिण सूडान',
+ 'ST' => 'साओ तोमे और प्रिंसिपे',
+ 'SR' => 'सूरीनाम',
+ 'SK' => 'स्लोवाकिया',
+ 'SI' => 'स्लोवेनिया',
+ 'SE' => 'स्वीडन',
+ 'SZ' => 'स्वाज़ीलैंड',
+ 'SC' => 'सेशेल्स',
+ 'SY' => 'सीरिया',
+ 'TD' => 'चाड',
+ 'TG' => 'टोगो',
+ 'TH' => 'थाईलैंड',
+ 'TJ' => 'ताजिकिस्तान',
+ 'TM' => 'तुर्कमेनिस्तान',
+ 'TL' => 'तिमोर-लेस्ते',
+ 'TO' => 'टोंगा',
+ 'TT' => 'त्रिनिदाद और टोबैगो',
+ 'TN' => 'ट्यूनीशिया',
+ 'TR' => 'तुर्की',
+ 'TV' => 'तुवालु',
+ 'TZ' => 'तंजानिया',
+ 'UG' => 'युगांडा',
+ 'UA' => 'यूक्रेन',
+ 'UY' => 'उरुग्वे',
+ 'US' => 'संयुक्त राज्य अमेरिका',
+ 'UZ' => 'उज्बेकिस्तान',
+ 'VA' => 'वेटिकन सिटी',
+ 'VC' => 'सेंट विंसेंट और ग्रेनेडाइंस',
+ 'VE' => 'वेनेजुएला',
+ 'VN' => 'वियतनाम',
+ 'VU' => 'वानुअतु',
+ 'WS' => 'समोआ',
+ 'YE' => 'यमन',
+ 'ZA' => 'दक्षिण अफ्रीका',
+ 'ZM' => 'ज़ाम्बिया',
+ 'ZW' => 'जिम्बाब्वे',
+];
diff --git a/app/config/locale/translations/mr.php b/app/config/locale/translations/mr.php
new file mode 100644
index 0000000000..bacc8ded84
--- /dev/null
+++ b/app/config/locale/translations/mr.php
@@ -0,0 +1,21 @@
+ '"हुशार असण्याची कला म्हणजे कोणत्या गोष्टीकडे दुर्लक्ष करावे हे जाणून घेण्याची कला."', // Tmrs is the line printed in the homepage and console 'view-source'
+ 'settings.locale' => 'mr',
+ 'settings.direction' => 'ltr',
+
+ // Service - Users
+ 'account.emails.team' => '%s टीम',
+ 'account.emails.verification.title' => 'अकाउंट कन्फर्मेशन ',
+ 'account.emails.verification.body' => 'mr.email.auth.confirm.tpl',
+ 'account.emails.recovery.title' => 'पासवर्ड रिसेट ',
+ 'account.emails.recovery.body' => 'mr.email.auth.recovery.tpl',
+ 'account.emails.invitation.title' => 'इनविटेशन %s टीम %s',
+ 'account.emails.invitation.body' => 'mr.email.auth.invitation.tpl',
+
+ 'locale.country.unknown' => 'अज्ञात',
+
+ 'countries' => include 'mr.countries.php',
+ 'continents' => include 'mr.continents.php',
+];
diff --git a/app/config/locale/translations/templates/mr.email.auth.confirm.tpl b/app/config/locale/translations/templates/mr.email.auth.confirm.tpl
new file mode 100644
index 0000000000..9ca8e0a5b7
--- /dev/null
+++ b/app/config/locale/translations/templates/mr.email.auth.confirm.tpl
@@ -0,0 +1,16 @@
+
+ +नमस्कार {{name}}, +
++ आपला ईमेल पत्ता वेरीफाई करण्यासाठी या लिंक वर क्लिक करा. +
+{{cta}} ++ आपण हे ईमेल वेरीफाई करण्यास सांगितले नसल्यास आपण या संदेशाकडे दुर्लक्ष करू शकता. +
+
+ धन्यवाद,
+
+ {{project}} टीम
+
+ नमस्कार, +
++ हा मेल आपल्याला पाठविला गेला कारण {{owner}} आपल्याला {{project}} या कारणास्तव {{team}} येथे सदस्य होण्यासाठी आमंत्रित करू इच्छित होते. +
++ टीम {{team}}मध्ये सामील होण्यासाठी या लिंक वर क्लिक करा : +
+{{cta}} ++ आपल्याला स्वारस्य नसल्यास आपण या संदेशाकडे दुर्लक्ष करू शकता. +
+
+ धन्यवाद,
+
+ {{project}} टीम
+
+ नमस्कार {{name}}, +
++ {{project}} पासवर्ड रीसेट करण्यासाठी या लिंक वर क्लिक करा. +
+{{cta}} ++ आपण आपला पासवर्ड रीसेट करण्यास सांगितले नसेल तर, आपण हा संदेश दुर्लक्षित करू शकता. +
+
+ धन्यवाद,
+
+ {{project}} टीम
+