From 6a84a62d71c3ae3e4f607422bee99701cb0d338a Mon Sep 17 00:00:00 2001 From: Ron Date: Wed, 12 Aug 2020 14:22:00 +0300 Subject: [PATCH 01/18] Adding new tutorial file --- docs/tutorials/my-first-issue.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/tutorials/my-first-issue.md diff --git a/docs/tutorials/my-first-issue.md b/docs/tutorials/my-first-issue.md new file mode 100644 index 0000000000..26556b6e57 --- /dev/null +++ b/docs/tutorials/my-first-issue.md @@ -0,0 +1 @@ +### Thats Your Place To create Your First Issue \ No newline at end of file From 3317e7aa6823ffc8ba7e8cef58cb293b9082b5fe Mon Sep 17 00:00:00 2001 From: Bradley Schofield Date: Wed, 16 Sep 2020 15:27:32 +0100 Subject: [PATCH 02/18] Add fallback graphic for user.phtml + Fallback SVG + onError code to change src if image doesn't exist --- app/views/console/users/user.phtml | 2 +- public/images/unknown.svg | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 public/images/unknown.svg diff --git a/app/views/console/users/user.phtml b/app/views/console/users/user.phtml index 7288d2f6a4..57dd0e7c85 100644 --- a/app/views/console/users/user.phtml +++ b/app/views/console/users/user.phtml @@ -179,7 +179,7 @@ - + on diff --git a/public/images/unknown.svg b/public/images/unknown.svg new file mode 100644 index 0000000000..001d61ad64 --- /dev/null +++ b/public/images/unknown.svg @@ -0,0 +1,25 @@ + + + + + + + From ac682684c1ef9ccae436b4b07296e494b727e613 Mon Sep 17 00:00:00 2001 From: Bradley Schofield Date: Wed, 16 Sep 2020 16:21:32 +0100 Subject: [PATCH 03/18] Improve Look and Add Unknown text aswell + Changed unknown.svg color from #26262F to #96b7eb + Added 'Unknown' text when the user agent cannot be identified in console --- app/views/console/users/user.phtml | 8 ++++---- public/images/unknown.svg | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/console/users/user.phtml b/app/views/console/users/user.phtml index 57dd0e7c85..4d704f005f 100644 --- a/app/views/console/users/user.phtml +++ b/app/views/console/users/user.phtml @@ -181,10 +181,10 @@ - on + Unknown on Unknown
- + /
@@ -239,11 +239,11 @@ - + - + diff --git a/public/images/unknown.svg b/public/images/unknown.svg index 001d61ad64..d0926cb301 100644 --- a/public/images/unknown.svg +++ b/public/images/unknown.svg @@ -5,7 +5,7 @@ width="1024.000000pt" height="1024.000000pt" viewBox="0 0 1024.000000 1024.000000" preserveAspectRatio="xMidYMid meet"> +fill="#96b7eb" stroke="none"> + - on + Unknown on Unknown   Current Session
- + /
@@ -294,11 +294,11 @@ - + - + diff --git a/app/views/console/users/user.phtml b/app/views/console/users/user.phtml index 4d704f005f..3788a9e3aa 100644 --- a/app/views/console/users/user.phtml +++ b/app/views/console/users/user.phtml @@ -181,7 +181,7 @@ - Unknown on Unknown + Unknown on Unknown
From 626d0d7281cdf0c5617d972618c571b31a42fc74 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Sat, 19 Sep 2020 07:09:18 +0300 Subject: [PATCH 05/18] Added user delete method to the console SDK --- app/sdks/client-web/README.md | 2 +- app/sdks/console-web/README.md | 2 +- .../docs/examples/users/delete-user.md | 15 ++++++++++++ app/sdks/console-web/src/sdk.js | 24 +++++++++++++++++++ app/sdks/console-web/src/sdk.min.js | 3 ++- app/sdks/console-web/types/index.d.ts | 11 +++++++++ 6 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 app/sdks/console-web/docs/examples/users/delete-user.md diff --git a/app/sdks/client-web/README.md b/app/sdks/client-web/README.md index 093783ab41..41e939b017 100644 --- a/app/sdks/client-web/README.md +++ b/app/sdks/client-web/README.md @@ -1,7 +1,7 @@ # Appwrite Web SDK ![License](https://img.shields.io/github/license/appwrite/sdk-for-js.svg?v=1) -![Version](https://img.shields.io/badge/api%20version-0.6.2-blue.svg?v=1) +![Version](https://img.shields.io/badge/api%20version-0.7.0-blue.svg?v=1) Appwrite is an open-source backend as a service server that abstract and simplify complex and repetitive development tasks behind a very simple to use REST API. Appwrite aims to help you develop your apps faster and in a more secure way. Use the Web SDK to integrate your app with the Appwrite server to easily start interacting with all of Appwrite backend APIs and tools. diff --git a/app/sdks/console-web/README.md b/app/sdks/console-web/README.md index 68b7e8ff9c..000e4988f1 100644 --- a/app/sdks/console-web/README.md +++ b/app/sdks/console-web/README.md @@ -1,7 +1,7 @@ # Appwrite Console SDK ![License](https://img.shields.io/github/license/appwrite/sdk-for-console.svg?v=1) -![Version](https://img.shields.io/badge/api%20version-0.6.2-blue.svg?v=1) +![Version](https://img.shields.io/badge/api%20version-0.7.0-blue.svg?v=1) Appwrite is an open-source backend as a service server that abstract and simplify complex and repetitive development tasks behind a very simple to use REST API. Appwrite aims to help you develop your apps faster and in a more secure way. Use the Console SDK to integrate your app with the Appwrite server to easily start interacting with all of Appwrite backend APIs and tools. diff --git a/app/sdks/console-web/docs/examples/users/delete-user.md b/app/sdks/console-web/docs/examples/users/delete-user.md new file mode 100644 index 0000000000..40f33e34c2 --- /dev/null +++ b/app/sdks/console-web/docs/examples/users/delete-user.md @@ -0,0 +1,15 @@ +let sdk = new Appwrite(); + +sdk + .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint + .setProject('5df5acd0d48c2') // Your project ID + .setKey('919c2d18fb5d4...a2ae413da83346ad2') // Your secret API key +; + +let promise = sdk.users.deleteUser('[USER_ID]'); + +promise.then(function (response) { + console.log(response); // Success +}, function (error) { + console.log(error); // Failure +}); \ No newline at end of file diff --git a/app/sdks/console-web/src/sdk.js b/app/sdks/console-web/src/sdk.js index b246db4cc5..fc8da5a1c2 100644 --- a/app/sdks/console-web/src/sdk.js +++ b/app/sdks/console-web/src/sdk.js @@ -4750,6 +4750,30 @@ }, payload); }, + /** + * Delete User + * + * Delete a user by its unique ID. + * + * @param {string} userId + * @throws {Error} + * @return {Promise} + */ + deleteUser: function(userId) { + if(userId === undefined) { + throw new Error('Missing required parameter: "userId"'); + } + + let path = '/users/{userId}'.replace(new RegExp('{userId}', 'g'), userId); + + let payload = {}; + + return http + .delete(path, { + 'content-type': 'application/json', + }, payload); + }, + /** * Get User Logs * diff --git a/app/sdks/console-web/src/sdk.min.js b/app/sdks/console-web/src/sdk.min.js index 6501248b84..2413458654 100644 --- a/app/sdks/console-web/src/sdk.min.js +++ b/app/sdks/console-web/src/sdk.min.js @@ -415,7 +415,8 @@ let path='/users';let payload={};if(email){payload.email=email} if(password){payload.password=password} if(name){payload.name=name} return http.post(path,{'content-type':'application/json',},payload)},get:function(userId){if(userId===undefined){throw new Error('Missing required parameter: "userId"')} -let path='/users/{userId}'.replace(new RegExp('{userId}','g'),userId);let payload={};return http.get(path,{'content-type':'application/json',},payload)},getLogs:function(userId){if(userId===undefined){throw new Error('Missing required parameter: "userId"')} +let path='/users/{userId}'.replace(new RegExp('{userId}','g'),userId);let payload={};return http.get(path,{'content-type':'application/json',},payload)},deleteUser:function(userId){if(userId===undefined){throw new Error('Missing required parameter: "userId"')} +let path='/users/{userId}'.replace(new RegExp('{userId}','g'),userId);let payload={};return http.delete(path,{'content-type':'application/json',},payload)},getLogs:function(userId){if(userId===undefined){throw new Error('Missing required parameter: "userId"')} let path='/users/{userId}/logs'.replace(new RegExp('{userId}','g'),userId);let payload={};return http.get(path,{'content-type':'application/json',},payload)},getPrefs:function(userId){if(userId===undefined){throw new Error('Missing required parameter: "userId"')} let path='/users/{userId}/prefs'.replace(new RegExp('{userId}','g'),userId);let payload={};return http.get(path,{'content-type':'application/json',},payload)},updatePrefs:function(userId,prefs){if(userId===undefined){throw new Error('Missing required parameter: "userId"')} if(prefs===undefined){throw new Error('Missing required parameter: "prefs"')} diff --git a/app/sdks/console-web/types/index.d.ts b/app/sdks/console-web/types/index.d.ts index b34f32c5bc..e6e7ba776a 100644 --- a/app/sdks/console-web/types/index.d.ts +++ b/app/sdks/console-web/types/index.d.ts @@ -1706,6 +1706,17 @@ declare namespace Appwrite { */ get(userId: string): Promise; + /** + * Delete User + * + * Delete a user by its unique ID. + * + * @param {string} userId + * @throws {Error} + * @return {Promise} + */ + deleteUser(userId: string): Promise; + /** * Get User Logs * From 7ed0ad1a6a2885a1ffb12a782b3c6a033a30914d Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Sat, 19 Sep 2020 07:15:50 +0300 Subject: [PATCH 06/18] Updated installation command --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 9c49005da1..ba01dc08f0 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 ``` From 99ea488995ac0345f712314b7f8d76b46f643b1d Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Sun, 20 Sep 2020 09:12:33 +0300 Subject: [PATCH 07/18] Updated console SDK --- public/dist/scripts/app-all.js | 3 ++- public/dist/scripts/app-dep.js | 3 ++- public/scripts/dependencies/appwrite.js | 24 ++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/public/dist/scripts/app-all.js b/public/dist/scripts/app-all.js index 211a3dfa73..6e2675b35c 100644 --- a/public/dist/scripts/app-all.js +++ b/public/dist/scripts/app-all.js @@ -432,7 +432,8 @@ let path='/users';let payload={};if(email){payload['email']=email;} if(password){payload['password']=password;} if(name){payload['name']=name;} return http.post(path,{'content-type':'application/json',},payload);},get:function(userId){if(userId===undefined){throw new Error('Missing required parameter: "userId"');} -let path='/users/{userId}'.replace(new RegExp('{userId}','g'),userId);let payload={};return http.get(path,{'content-type':'application/json',},payload);},getLogs:function(userId){if(userId===undefined){throw new Error('Missing required parameter: "userId"');} +let path='/users/{userId}'.replace(new RegExp('{userId}','g'),userId);let payload={};return http.get(path,{'content-type':'application/json',},payload);},deleteUser:function(userId){if(userId===undefined){throw new Error('Missing required parameter: "userId"');} +let path='/users/{userId}'.replace(new RegExp('{userId}','g'),userId);let payload={};return http.delete(path,{'content-type':'application/json',},payload);},getLogs:function(userId){if(userId===undefined){throw new Error('Missing required parameter: "userId"');} let path='/users/{userId}/logs'.replace(new RegExp('{userId}','g'),userId);let payload={};return http.get(path,{'content-type':'application/json',},payload);},getPrefs:function(userId){if(userId===undefined){throw new Error('Missing required parameter: "userId"');} let path='/users/{userId}/prefs'.replace(new RegExp('{userId}','g'),userId);let payload={};return http.get(path,{'content-type':'application/json',},payload);},updatePrefs:function(userId,prefs){if(userId===undefined){throw new Error('Missing required parameter: "userId"');} if(prefs===undefined){throw new Error('Missing required parameter: "prefs"');} diff --git a/public/dist/scripts/app-dep.js b/public/dist/scripts/app-dep.js index 264cc488df..ab36b9cf03 100644 --- a/public/dist/scripts/app-dep.js +++ b/public/dist/scripts/app-dep.js @@ -432,7 +432,8 @@ let path='/users';let payload={};if(email){payload['email']=email;} if(password){payload['password']=password;} if(name){payload['name']=name;} return http.post(path,{'content-type':'application/json',},payload);},get:function(userId){if(userId===undefined){throw new Error('Missing required parameter: "userId"');} -let path='/users/{userId}'.replace(new RegExp('{userId}','g'),userId);let payload={};return http.get(path,{'content-type':'application/json',},payload);},getLogs:function(userId){if(userId===undefined){throw new Error('Missing required parameter: "userId"');} +let path='/users/{userId}'.replace(new RegExp('{userId}','g'),userId);let payload={};return http.get(path,{'content-type':'application/json',},payload);},deleteUser:function(userId){if(userId===undefined){throw new Error('Missing required parameter: "userId"');} +let path='/users/{userId}'.replace(new RegExp('{userId}','g'),userId);let payload={};return http.delete(path,{'content-type':'application/json',},payload);},getLogs:function(userId){if(userId===undefined){throw new Error('Missing required parameter: "userId"');} let path='/users/{userId}/logs'.replace(new RegExp('{userId}','g'),userId);let payload={};return http.get(path,{'content-type':'application/json',},payload);},getPrefs:function(userId){if(userId===undefined){throw new Error('Missing required parameter: "userId"');} let path='/users/{userId}/prefs'.replace(new RegExp('{userId}','g'),userId);let payload={};return http.get(path,{'content-type':'application/json',},payload);},updatePrefs:function(userId,prefs){if(userId===undefined){throw new Error('Missing required parameter: "userId"');} if(prefs===undefined){throw new Error('Missing required parameter: "prefs"');} diff --git a/public/scripts/dependencies/appwrite.js b/public/scripts/dependencies/appwrite.js index b246db4cc5..fc8da5a1c2 100644 --- a/public/scripts/dependencies/appwrite.js +++ b/public/scripts/dependencies/appwrite.js @@ -4750,6 +4750,30 @@ }, payload); }, + /** + * Delete User + * + * Delete a user by its unique ID. + * + * @param {string} userId + * @throws {Error} + * @return {Promise} + */ + deleteUser: function(userId) { + if(userId === undefined) { + throw new Error('Missing required parameter: "userId"'); + } + + let path = '/users/{userId}'.replace(new RegExp('{userId}', 'g'), userId); + + let payload = {}; + + return http + .delete(path, { + 'content-type': 'application/json', + }, payload); + }, + /** * Get User Logs * From 990a25014894609d3eeb4a51ad2a0d95c515e6da Mon Sep 17 00:00:00 2001 From: Suraj Patil <48085134+spielers@users.noreply.github.com> Date: Sun, 20 Sep 2020 17:02:22 +0530 Subject: [PATCH 08/18] Translated into marathi -mr --- .../locale/translations/mr.continents.php | 11 + .../locale/translations/mr.countries.php | 203 ++++++++++++++++++ app/config/locale/translations/mr.php | 21 ++ .../templates/mr.email.auth.confirm.tpl | 16 ++ .../templates/mr.email.auth.invitation.tpl | 18 ++ .../templates/mr.email.auth.recovery.tpl | 15 ++ 6 files changed, 284 insertions(+) create mode 100644 app/config/locale/translations/mr.continents.php create mode 100644 app/config/locale/translations/mr.countries.php create mode 100644 app/config/locale/translations/mr.php create mode 100644 app/config/locale/translations/templates/mr.email.auth.confirm.tpl create mode 100644 app/config/locale/translations/templates/mr.email.auth.invitation.tpl create mode 100644 app/config/locale/translations/templates/mr.email.auth.recovery.tpl 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}} टीम +

diff --git a/app/config/locale/translations/templates/mr.email.auth.invitation.tpl b/app/config/locale/translations/templates/mr.email.auth.invitation.tpl new file mode 100644 index 0000000000..e9507ec409 --- /dev/null +++ b/app/config/locale/translations/templates/mr.email.auth.invitation.tpl @@ -0,0 +1,18 @@ +

+ नमस्कार, +

+

+ हा मेल आपल्‍याला पाठविला गेला कारण {{owner}} आपल्‍याला {{project}} या कारणास्तव {{team}} येथे सदस्य होण्यासाठी आमंत्रित करू इच्छित होते. +

+

+ टीम {{team}}मध्ये सामील होण्यासाठी या लिंक वर क्लिक करा : +

+{{cta}} +

+ आपल्याला स्वारस्य नसल्यास आपण या संदेशाकडे दुर्लक्ष करू शकता. +

+

+ धन्यवाद, +
+ {{project}} टीम +

diff --git a/app/config/locale/translations/templates/mr.email.auth.recovery.tpl b/app/config/locale/translations/templates/mr.email.auth.recovery.tpl new file mode 100644 index 0000000000..ea93107ea2 --- /dev/null +++ b/app/config/locale/translations/templates/mr.email.auth.recovery.tpl @@ -0,0 +1,15 @@ +

+ नमस्कार {{name}}, +

+

+ {{project}} पासवर्ड रीसेट करण्यासाठी या लिंक वर क्लिक करा. +

+{{cta}} +

+ आपण आपला पासवर्ड रीसेट करण्यास सांगितले नसेल तर, आपण हा संदेश दुर्लक्षित करू शकता. +

+

+ धन्यवाद, +
+ {{project}} टीम +

From e8905f3a8a941992c188510d45b76a1b7b248d6d Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Sun, 20 Sep 2020 14:55:21 +0300 Subject: [PATCH 09/18] Updated changelog --- CHANGES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 44fd40aec6..66e4c7f720 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) @@ -30,6 +31,7 @@ - API Key name max length is now 128 chars and not 256 for better API consistency - 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 +- Added new locale: Marathi -mr (@spielers) - 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) From dee1d98f8252a1626565d8940272f22a7bf8c10c Mon Sep 17 00:00:00 2001 From: Ron Date: Tue, 22 Sep 2020 13:09:30 +0300 Subject: [PATCH 10/18] addinng submit pull request section doc section --- CONTRIBUTING.md | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4e6d85ab42..70d21b14ef 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,6 +6,59 @@ We would ❤️ for you to contribute to Appwrite and help make it better! We wa If you are worried or don’t know where to start, check out our next section explaining what kind of help we could use and where can you get involved. You can reach out with questions to [Eldad Fux (@eldadfux)](https://twitter.com/eldadfux) or [@appwrite_io](https://twitter.com/appwrite_io) on Twitter, and anyone from the [Appwrite team on Discord](https://discord.gg/GSeTUeA). You can also submit an issue, and a maintainer can guide you! + +## 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 using the command `git push`
+
+ +### 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). +
+ ## Where to Start? Pull requests are great, but there are many other areas where you can help Appwrite. From 2150a2238e4ccd794fcff14b978b4729c341fc10 Mon Sep 17 00:00:00 2001 From: Ron Date: Tue, 22 Sep 2020 13:12:46 +0300 Subject: [PATCH 11/18] fixing submit pull request section --- CONTRIBUTING.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 70d21b14ef..9be5ef39c2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -47,7 +47,10 @@ $ git checkout -b [name_of_your_new_branch] ### 3. Work - commit - repeat ( be sure to be in your branch )
-### 4. Push changes to GitHub using the command `git push`
+### 4. Push changes to GitHub +``` +$ git push origin [name_of_your_new_branch] +```
### 6. Submit your changes for review From 7bde6bb4816bfee1fba00706213e503c1ad1b7bf Mon Sep 17 00:00:00 2001 From: "Eldad A. Fux" Date: Tue, 22 Sep 2020 15:46:28 +0300 Subject: [PATCH 12/18] Update CONTRIBUTING.md --- CONTRIBUTING.md | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9e2bb82a65..230d08981b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -32,6 +32,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 +│ └── 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 +``` + --- ![Appwrite](docs/specs/overview.drawio.svg) --- From b973282c3376d0042ce7233b0f276f34079f989f Mon Sep 17 00:00:00 2001 From: "Eldad A. Fux" Date: Tue, 22 Sep 2020 15:47:43 +0300 Subject: [PATCH 13/18] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 230d08981b..ee701b937f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -62,7 +62,7 @@ Appwrite's current structure is a combination of both [Monolithic](https://en.wi │ ├── images │ ├── scripts │ └── styles -├── src # Supporting libraries +├── src # Supporting libraries (each lib should have one specific role, common libraries are released as independent projects) │ └── Appwrite │ ├── Auth │ ├── Database From 157b7c5aa253a4476f0aa57f8dd1874993bd608d Mon Sep 17 00:00:00 2001 From: "Eldad A. Fux" Date: Tue, 22 Sep 2020 15:49:01 +0300 Subject: [PATCH 14/18] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ee701b937f..c91e165abc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -62,7 +62,7 @@ Appwrite's current structure is a combination of both [Monolithic](https://en.wi │ ├── images │ ├── scripts │ └── styles -├── src # Supporting libraries (each lib should have one specific role, common libraries are released as independent projects) +├── src # Supporting libraries (each lib has one role, common libs are released as individual projects) │ └── Appwrite │ ├── Auth │ ├── Database From 0a50f66d08fa5adf637404717e36f1efb030283d Mon Sep 17 00:00:00 2001 From: "Eldad A. Fux" Date: Wed, 23 Sep 2020 06:58:36 +0300 Subject: [PATCH 15/18] Removed un-needed titles --- CONTRIBUTING.md | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 39b16bf0c5..7f89e48065 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -39,31 +39,28 @@ For the initial start, fork the project and use git clone command to do
### 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. +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`
+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 ) -
+3. Work - commit - repeat ( be sure to be in your branch ) -### 4. Push changes to GitHub +4. Push changes to GitHub ``` $ git push origin [name_of_your_new_branch] ``` -
-### 6. Submit your changes for review +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 +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). -
+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 From 86fa6551d3bed21324579b29529c661a66da2f9d Mon Sep 17 00:00:00 2001 From: "Eldad A. Fux" Date: Wed, 23 Sep 2020 06:59:42 +0300 Subject: [PATCH 16/18] Update CONTRIBUTING.md --- CONTRIBUTING.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7f89e48065..af914f9c6d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -29,15 +29,9 @@ When `TYPE` can be: - **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: +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. ``` From 0fd543074a928fa51c1f7dc742ac8908df46e86f Mon Sep 17 00:00:00 2001 From: "Eldad A. Fux" Date: Wed, 23 Sep 2020 07:01:40 +0300 Subject: [PATCH 17/18] Update CONTRIBUTING.md --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index af914f9c6d..0cb27cde28 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,10 +14,10 @@ Help us keep Appwrite open and inclusive. Please read and follow our [Code of Co Branch naming convention is as following -``` -TYPE-ISSUE_ID-DESCRIPTION +`TYPE-ISSUE_ID-DESCRIPTION` example: +``` doc-548-submit-a-pull-request-section-to-contribution-guide ``` From 71a9d1e514816edde8db43635269d069fd9d67f5 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Wed, 23 Sep 2020 20:10:05 +0300 Subject: [PATCH 18/18] Updated resque --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 484f73b42f..132fe9f2c2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -355,7 +355,7 @@ services: # - "8081:8081" # resque: - # image: registry.gitlab.com/appwrite/appwrite/resque-web:v1.0.2 + # image: appwrite/resque-web:1.1.0 # restart: unless-stopped # networks: # - appwrite