From e55019e8a54d81c5d122b35b775d8173c2efeaa5 Mon Sep 17 00:00:00 2001
From: Alexey Pyltsyn <lex61rus@gmail.com>
Date: Tue, 1 Oct 2019 20:10:16 +0300
Subject: [PATCH 01/12] Replace Github with GitHub

---
 README.md                            | 46 ++++++++++++++--------------
 app/views/console/comps/footer.phtml |  2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index d6568bc8e..a82d9c2a2 100644
--- a/README.md
+++ b/README.md
@@ -100,26 +100,26 @@ We really ❤️ pull requests! If you wish to help, you can learn more about ho
 
 Created by [Eldad Fux](https://twitter.com/eldadfux) with the amazing help of our **amazing contributors:**
 
-* 🇺🇸 Justin Dorfman ([Github](https://github.com/jdorfman), [Twitter](https://twitter.com/jdorfman))
-* 🇺🇳 0xflotus ([Github](https://github.com/0xflotus))
-* 🇳🇴 Petter Charles Redfern ([Github](https://github.com/Chaaarles))
-* 🇧🇷 Jessé Souza ([Github](https://github.com/jessescn))
-* 🇪🇸 Esther Álvarez Feijoo ([Github](https://github.com/EstherAF))
-* 🇮🇳 Christy Jacob ([Github](https://github.com/christyjacob4), [Linkedin](https://www.linkedin.com/in/christyjacob4/))
-* 🇺🇦 Dmitriy Danilov ([Github](https://github.com/daniloff200), [Twitter](https://twitter.com/daniloff200))
-* 🇮🇩 Zeet ([Github](https://github.com/Kiy4h))
-* 🇫🇮 Pessi Päivärinne ([Github](https://github.com/pessip))
-* 🇺🇳 Sergi Vos ([Github](https://github.com/sergivb01), [Twitter](https://twitter.com/sergivb01), [Linkedin](https://www.linkedin.com/in/sergivb01/))
-* 🇮🇱 Tomer Cohen ([Github](https://github.com/tomer), [Twitter](https://twitter.com/tomer))
-* 🇧🇷 Tatiana ([Github](https://github.com/tacoelho))
-* 🇬🇷 Panagiotis Skarlas ([Github](https://github.com/1qk1), [Twitter](https://twitter.com/qktweets))
-* 🇷🇺 Alexey Pyltsyn ([Github](https://github.com/lex111))
-* 🇩🇪 Robin C ([Github](https://github.com/Taminoful))
-* 🇮🇳 Parikshit Hooda ([Github](https://github.com/Parikshit-Hooda))
-* 🇫🇷 Corentin Le Fur ([Github](https://github.com/crtlf))
-* 🇬🇧 Callum Lowry ([Github](https://github.com/Girxffe))
-* 🇷🇴 Bogdan Covrig ([Github](https://github.com/BogDAAAMN), [Twitter](https://twitter.com/BogdanCovrig))
-* 🇳🇱 Kolkies ([Github](https://github.com/kolkies.dev))
-* 🇹🇷 Mustafa Dur ([Github](https://github.com/tosbaha))
-* 🇵🇹 Luís Pinto ([Github](https://github.com/LiTO773))
-* 🇮🇳 Saksham Saxena ([Github](https://github.com/sakkshm))
+* 🇺🇸 Justin Dorfman ([GitHub](https://github.com/jdorfman), [Twitter](https://twitter.com/jdorfman))
+* 🇺🇳 0xflotus ([GitHub](https://github.com/0xflotus))
+* 🇳🇴 Petter Charles Redfern ([GitHub](https://github.com/Chaaarles))
+* 🇧🇷 Jessé Souza ([GitHub](https://github.com/jessescn))
+* 🇪🇸 Esther Álvarez Feijoo ([GitHub](https://github.com/EstherAF))
+* 🇮🇳 Christy Jacob ([GitHub](https://github.com/christyjacob4), [Linkedin](https://www.linkedin.com/in/christyjacob4/))
+* 🇺🇦 Dmitriy Danilov ([GitHub](https://github.com/daniloff200), [Twitter](https://twitter.com/daniloff200))
+* 🇮🇩 Zeet ([GitHub](https://github.com/Kiy4h))
+* 🇫🇮 Pessi Päivärinne ([GitHub](https://github.com/pessip))
+* 🇺🇳 Sergi Vos ([GitHub](https://github.com/sergivb01), [Twitter](https://twitter.com/sergivb01), [Linkedin](https://www.linkedin.com/in/sergivb01/))
+* 🇮🇱 Tomer Cohen ([GitHub](https://github.com/tomer), [Twitter](https://twitter.com/tomer))
+* 🇧🇷 Tatiana ([GitHub](https://github.com/tacoelho))
+* 🇬🇷 Panagiotis Skarlas ([GitHub](https://github.com/1qk1), [Twitter](https://twitter.com/qktweets))
+* 🇷🇺 Alexey Pyltsyn ([GitHub](https://github.com/lex111))
+* 🇩🇪 Robin C ([GitHub](https://github.com/Taminoful))
+* 🇮🇳 Parikshit Hooda ([GitHub](https://github.com/Parikshit-Hooda))
+* 🇫🇷 Corentin Le Fur ([GitHub](https://github.com/crtlf))
+* 🇬🇧 Callum Lowry ([GitHub](https://github.com/Girxffe))
+* 🇷🇴 Bogdan Covrig ([GitHub](https://github.com/BogDAAAMN), [Twitter](https://twitter.com/BogdanCovrig))
+* 🇳🇱 Kolkies ([GitHub](https://github.com/kolkies.dev))
+* 🇹🇷 Mustafa Dur ([GitHub](https://github.com/tosbaha))
+* 🇵🇹 Luís Pinto ([GitHub](https://github.com/LiTO773))
+* 🇮🇳 Saksham Saxena ([GitHub](https://github.com/sakkshm))
diff --git a/app/views/console/comps/footer.phtml b/app/views/console/comps/footer.phtml
index 13b1b3e78..bde82eeb0 100644
--- a/app/views/console/comps/footer.phtml
+++ b/app/views/console/comps/footer.phtml
@@ -4,7 +4,7 @@ $home = $this->getParam('home', '');
 <footer class="clear margin-top-xl">
     <ul class="copyright pull-start">
         <li>
-            <a href="https://github.com/appwrite/appwrite" target="_blank"><i class="icon-github-circled"></i> Github Repository</a>
+            <a href="https://github.com/appwrite/appwrite" target="_blank"><i class="icon-github-circled"></i> GitHub Repository</a>
         </li>
         <li>
             <a href="https://github.com/appwrite/appwrite/issues/new?body=%0A%0A%0A---%0AAppwrite Version:%20<?php echo VERSION; ?>" target="_blank">Open an Issue</a>

From 5167ce8858253e3dcaf834975d7370492dc2e4fb Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Wed, 2 Oct 2019 02:08:29 +0530
Subject: [PATCH 02/12] fix: removed instagram oAuth due to technical
 difficulties

---
 app/config/providers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/config/providers.php b/app/config/providers.php
index 01b7b6b42..f4d7e6ca8 100644
--- a/app/config/providers.php
+++ b/app/config/providers.php
@@ -34,7 +34,7 @@ return [
     'microsoft' => [
         'developers' => 'https://developer.microsoft.com/en-us/',
         'icon' => 'icon-windows',
-        'enabled' => false,
+        'enabled' => true,
     ],
     'twitter' => [
         'developers' => 'https://developer.twitter.com/',

From 400c332315197831770879b6684402eab0b09d8f Mon Sep 17 00:00:00 2001
From: Nam Pham <nam.pham@inspireventures.com>
Date: Wed, 2 Oct 2019 10:00:00 +0700
Subject: [PATCH 03/12] Add Vietnamese for email template

---
 .../templates/vi.email.auth.confirm.tpl       |  24 +++
 .../templates/vi.email.auth.invitation.tpl    |  27 +++
 .../templates/vi.email.auth.recovery.tpl      |  24 +++
 app/config/locale/vi.continents.php           |  11 +
 app/config/locale/vi.countries.php            | 198 ++++++++++++++++++
 app/config/locale/vi.php                      |  21 ++
 6 files changed, 305 insertions(+)
 create mode 100644 app/config/locale/templates/vi.email.auth.confirm.tpl
 create mode 100644 app/config/locale/templates/vi.email.auth.invitation.tpl
 create mode 100644 app/config/locale/templates/vi.email.auth.recovery.tpl
 create mode 100644 app/config/locale/vi.continents.php
 create mode 100644 app/config/locale/vi.countries.php
 create mode 100644 app/config/locale/vi.php

diff --git a/app/config/locale/templates/vi.email.auth.confirm.tpl b/app/config/locale/templates/vi.email.auth.confirm.tpl
new file mode 100644
index 000000000..40c7d496e
--- /dev/null
+++ b/app/config/locale/templates/vi.email.auth.confirm.tpl
@@ -0,0 +1,24 @@
+<style>
+    * {
+        font-family: sans-serif,Arial;
+        -webkit-font-smoothing: antialiased;
+        font-weight: lighter;
+    }
+</style>
+
+<div style="direction: {{direction}}">
+    Xin chào {{name}},
+    <br />
+    <br />
+    Hãy vào liên kết này để xác nhận địa chỉ email của bạn.
+    <br />
+    <a href="{{redirect}}">{{redirect}}</a>
+    <br />
+    <br />
+    Xin hãy bỏ qua email này nếu bạn không yêu cầu xác nhận địa chỉ này.
+    <br />
+    <br />
+    Xin cảm ơn,
+    <br />
+    {{project}} team
+</div>
\ No newline at end of file
diff --git a/app/config/locale/templates/vi.email.auth.invitation.tpl b/app/config/locale/templates/vi.email.auth.invitation.tpl
new file mode 100644
index 000000000..387c537f5
--- /dev/null
+++ b/app/config/locale/templates/vi.email.auth.invitation.tpl
@@ -0,0 +1,27 @@
+<style>
+    * {
+        font-family: sans-serif,Arial;
+        -webkit-font-smoothing: antialiased;
+        font-weight: lighter;
+    }
+</style>
+
+<div style="direction: {{direction}}">
+    Xin chào,
+    <br />
+    <br />
+    Bạn nhận được email này vì <b>{{owner}}</b> muốn mời bạn tham gia {{project}} cùng với <b>{{team}}</b> team.
+    <br />
+    <br />
+    Hãy theo liên kết này để tham gia vào <b>{{team}}</b> team:
+    <br />
+    <a href="{{redirect}}">{{redirect}}</a>
+    <br />
+    <br />
+    Nếu bạn không thích tham gia, hãy bỏ qua lời nhắn này.
+    <br />
+    <br />
+    Xin cảm ơn,
+    <br />
+    {{project}} team
+</div>
diff --git a/app/config/locale/templates/vi.email.auth.recovery.tpl b/app/config/locale/templates/vi.email.auth.recovery.tpl
new file mode 100644
index 000000000..57c704f0c
--- /dev/null
+++ b/app/config/locale/templates/vi.email.auth.recovery.tpl
@@ -0,0 +1,24 @@
+<style>
+    * {
+        font-family: sans-serif,Arial;
+        -webkit-font-smoothing: antialiased;
+        font-weight: lighter;
+    }
+</style>
+
+<div style="direction: {{direction}}">
+    Xin chào {{name}},
+    <br />
+    <br />
+    Hãy theo liên kết này để khôi phục mật khẩu của bạn ở {{project}}.
+    <br />
+    <a href="{{redirect}}">{{redirect}}</a>
+    <br />
+    <br />
+    Hãy bỏ qua lời nhắn này nếu bạn không yêu cầu khôi phục mật khẩu.
+    <br />
+    <br />
+    Xin cảm ơn,
+    <br />
+    {{project}} team
+</div>
diff --git a/app/config/locale/vi.continents.php b/app/config/locale/vi.continents.php
new file mode 100644
index 000000000..bb6e5d9ad
--- /dev/null
+++ b/app/config/locale/vi.continents.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+    'AF' => 'Châu Phi',
+    'AN' => 'Nam Cực',
+    'AS' => 'Châu Á',
+    'EU' => 'Châu Âu',
+    'NA' => 'Bắc Mỹ',
+    'OC' => 'Châu Đại Dương',
+    'SA' => 'Nam Mỹ',
+];
diff --git a/app/config/locale/vi.countries.php b/app/config/locale/vi.countries.php
new file mode 100644
index 000000000..f8f8de74a
--- /dev/null
+++ b/app/config/locale/vi.countries.php
@@ -0,0 +1,198 @@
+<?php
+
+return [
+    'AF' => 'Afghanistan',
+    'AO' => 'Angola',
+    'AL' => 'Albania',
+    'AD' => 'Andorra',
+    'AE' => 'United Arab Emirates',
+    'AR' => 'Argentina',
+    'AM' => 'Armenia',
+    'AG' => 'Antigua and Barbuda',
+    'AU' => 'Australia',
+    'AT' => 'Austria',
+    'AZ' => 'Azerbaijan',
+    'BI' => 'Burundi',
+    'BE' => 'Belgium',
+    'BJ' => 'Benin',
+    'BF' => 'Burkina Faso',
+    'BD' => 'Bangladesh',
+    'BG' => 'Bulgaria',
+    'BH' => 'Bahrain',
+    'BS' => 'Bahamas',
+    'BA' => 'Bosnia and Herzegovina',
+    'BY' => 'Belarus',
+    'BZ' => 'Belize',
+    'BO' => 'Bolivia',
+    'BR' => 'Brazil',
+    'BB' => 'Barbados',
+    'BN' => 'Brunei',
+    'BT' => 'Bhutan',
+    'BW' => 'Botswana',
+    'CF' => 'Central African Republic',
+    'CA' => 'Canada',
+    'CH' => 'Switzerland',
+    'CL' => 'Chile',
+    'CN' => 'China',
+    'CI' => 'Ivory Coast',
+    'CM' => 'Cameroon',
+    'CD' => 'DR Congo',
+    'CG' => 'Republic of the Congo',
+    'CO' => 'Colombia',
+    'KM' => 'Comoros',
+    'CV' => 'Cape Verde',
+    'CR' => 'Costa Rica',
+    'CU' => 'Cuba',
+    'CY' => 'Cyprus',
+    'CZ' => 'Czechia',
+    'DE' => 'Germany',
+    'DJ' => 'Djibouti',
+    'DM' => 'Dominica',
+    'DK' => 'Denmark',
+    'DO' => 'Dominican Republic',
+    'DZ' => 'Algeria',
+    'EC' => 'Ecuador',
+    'EG' => 'Egypt',
+    'ER' => 'Eritrea',
+    'ES' => 'Spain',
+    'EE' => 'Estonia',
+    'ET' => 'Ethiopia',
+    'FI' => 'Finland',
+    'FJ' => 'Fiji',
+    'FR' => 'France',
+    'FM' => 'Micronesia',
+    'GA' => 'Gabon',
+    'GB' => 'United Kingdom',
+    'GE' => 'Georgia',
+    'GH' => 'Ghana',
+    'GN' => 'Guinea',
+    'GM' => 'Gambia',
+    'GW' => 'Guinea-Bissau',
+    'GQ' => 'Equatorial Guinea',
+    'GR' => 'Greece',
+    'GD' => 'Grenada',
+    'GT' => 'Guatemala',
+    'GY' => 'Guyana',
+    'HN' => 'Honduras',
+    'HR' => 'Croatia',
+    'HT' => 'Haiti',
+    'HU' => 'Hungary',
+    'ID' => 'Indonesia',
+    'IN' => 'India',
+    'IE' => 'Ireland',
+    'IR' => 'Iran',
+    'IQ' => 'Iraq',
+    'IS' => 'Iceland',
+    'IL' => 'Israel',
+    'IT' => 'Italy',
+    'JM' => 'Jamaica',
+    'JO' => 'Jordan',
+    'JP' => 'Japan',
+    'KZ' => 'Kazakhstan',
+    'KE' => 'Kenya',
+    'KG' => 'Kyrgyzstan',
+    'KH' => 'Cambodia',
+    'KI' => 'Kiribati',
+    'KN' => 'Saint Kitts and Nevis',
+    'KR' => 'South Korea',
+    'KW' => 'Kuwait',
+    'LA' => 'Laos',
+    'LB' => 'Lebanon',
+    'LR' => 'Liberia',
+    'LY' => 'Libya',
+    'LC' => 'Saint Lucia',
+    'LI' => 'Liechtenstein',
+    'LK' => 'Sri Lanka',
+    'LS' => 'Lesotho',
+    'LT' => 'Lithuania',
+    'LU' => 'Luxembourg',
+    'LV' => 'Latvia',
+    'MA' => 'Morocco',
+    'MC' => 'Monaco',
+    'MD' => 'Moldova',
+    'MG' => 'Madagascar',
+    'MV' => 'Maldives',
+    'MX' => 'Mexico',
+    'MH' => 'Marshall Islands',
+    'MK' => 'Macedonia',
+    'ML' => 'Mali',
+    'MT' => 'Malta',
+    'MM' => 'Myanmar',
+    'ME' => 'Montenegro',
+    'MN' => 'Mongolia',
+    'MZ' => 'Mozambique',
+    'MR' => 'Mauritania',
+    'MU' => 'Mauritius',
+    'MW' => 'Malawi',
+    'MY' => 'Malaysia',
+    'NA' => 'Namibia',
+    'NE' => 'Niger',
+    'NG' => 'Nigeria',
+    'NI' => 'Nicaragua',
+    'NL' => 'Netherlands',
+    'NO' => 'Norway',
+    'NP' => 'Nepal',
+    'NR' => 'Nauru',
+    'NZ' => 'New Zealand',
+    'OM' => 'Oman',
+    'PK' => 'Pakistan',
+    'PA' => 'Panama',
+    'PE' => 'Peru',
+    'PH' => 'Philippines',
+    'PW' => 'Palau',
+    'PG' => 'Papua New Guinea',
+    'PL' => 'Poland',
+    'KP' => 'North Korea',
+    'PT' => 'Portugal',
+    'PY' => 'Paraguay',
+    'QA' => 'Qatar',
+    'RO' => 'Romania',
+    'RU' => 'Russia',
+    'RW' => 'Rwanda',
+    'SA' => 'Saudi Arabia',
+    'SD' => 'Sudan',
+    'SN' => 'Senegal',
+    'SG' => 'Singapore',
+    'SB' => 'Solomon Islands',
+    'SL' => 'Sierra Leone',
+    'SV' => 'El Salvador',
+    'SM' => 'San Marino',
+    'SO' => 'Somalia',
+    'RS' => 'Serbia',
+    'SS' => 'South Sudan',
+    'ST' => 'São Tomé and Príncipe',
+    'SR' => 'Suriname',
+    'SK' => 'Slovakia',
+    'SI' => 'Slovenia',
+    'SE' => 'Sweden',
+    'SZ' => 'Swaziland',
+    'SC' => 'Seychelles',
+    'SY' => 'Syria',
+    'TD' => 'Chad',
+    'TG' => 'Togo',
+    'TH' => 'Thailand',
+    'TJ' => 'Tajikistan',
+    'TM' => 'Turkmenistan',
+    'TL' => 'Timor-Leste',
+    'TO' => 'Tonga',
+    'TT' => 'Trinidad and Tobago',
+    'TN' => 'Tunisia',
+    'TR' => 'Turkey',
+    'TV' => 'Tuvalu',
+    'TZ' => 'Tanzania',
+    'UG' => 'Uganda',
+    'UA' => 'Ukraine',
+    'UY' => 'Uruguay',
+    'US' => 'United States',
+    'UZ' => 'Uzbekistan',
+    'VA' => 'Vatican City',
+    'VC' => 'Saint Vincent and the Grenadines',
+    'VE' => 'Venezuela',
+    'VN' => 'Việt Nam',
+    'VU' => 'Vanuatu',
+    'WS' => 'Samoa',
+    'YE' => 'Yemen',
+    'ZA' => 'South Africa',
+    'ZM' => 'Zambia',
+    'ZW' => 'Zimbabwe',
+];
diff --git a/app/config/locale/vi.php b/app/config/locale/vi.php
new file mode 100644
index 000000000..b444b1153
--- /dev/null
+++ b/app/config/locale/vi.php
@@ -0,0 +1,21 @@
+<?php
+
+return [
+    'settings.inspire' => '"Nghệ thuật khôn ngoan là nghệ thuật biết những gì cần bỏ qua."', // This is the line printed in the homepage and console 'view-source'
+    'settings.locale' => 'vi',
+    'settings.direction' => 'ltr',
+
+    // Service - Users
+    'auth.emails.team' => '%s Team',
+    'auth.emails.confirm.title' => 'Xác nhận tài khoản',
+    'auth.emails.confirm.body' => 'vi.email.auth.confirm.tpl',
+    'auth.emails.recovery.title' => 'Đặt lại mật khẩu',
+    'auth.emails.recovery.body' => 'vi.email.auth.recovery.tpl',
+    'auth.emails.invitation.title' => 'Lời mới vào %s Team ở %s',
+    'auth.emails.invitation.body' => 'vi.email.auth.invitation.tpl',
+
+    'locale.country.unknown' => 'Chưa xác định',
+
+    'countries' => include 'vi.countries.php',
+    'continents' => include 'vi.continents.php',
+];

From eb47cf8d9b6695fd33ece6c4f53e6f973d0a69be Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Wed, 2 Oct 2019 12:30:59 +0530
Subject: [PATCH 04/12] feat: added Microsoft OAuth Support

---
 public/images/oauth/microsoft.png | Bin 0 -> 1026 bytes
 src/Auth/OAuth/Microsoft.php      | 132 ++++++++++++++++++++++++++++++
 2 files changed, 132 insertions(+)
 create mode 100644 public/images/oauth/microsoft.png
 create mode 100644 src/Auth/OAuth/Microsoft.php

diff --git a/public/images/oauth/microsoft.png b/public/images/oauth/microsoft.png
new file mode 100644
index 0000000000000000000000000000000000000000..11eebf919797006e8f470718acd9a39762a91d4e
GIT binary patch
literal 1026
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j3?$ucQqzDGOS+@4BLl<6e(pbstU$g(vPY0F
z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a><YADU|{SC@CkAK;LQH_$(;wE
zP6q8__~63v_vzgSpH7AC#?1z)2dN3(#qi#e;qSv6cRwC++Xl3UfnnL(YoGuAd$;fB
z5(b9l?{0qi`|th1pG)EFLqIlA5GHl#=Q5y{cTg>h7(RN7HJ#P|;3e94Rtudxqxr#8
z<b#JW0yzuSoKmhlC0hkXKt}Z`dA7Ch+14Ns&&qed_lW)8!;6IY*non2h1gaBNkJfj
zFu<hH$3STi3Xp0zqX9&?*dVC@DP&ZCMje70&Zsl2eGf;!_i(}yE<vCIpcIh&|NlS#
z?mKzFV2msY@(TtBDA7c7dvhBYwl_64Ha0uEHUp`qW*}&Facu=sEg%&jCGET|?dO2z
zGA4PuyEOmVa{dyK!&%@FSq!8TfH<CE#nz0^Kn8n>r>`sfV=hJ!Q?bW~4uBHfPfr)e
zkc@k8&px+eN|0!H=zn6GZ&={X>i0(6f!{Q48dtkH_1)2|dEX!Nx8j}fj;nn~@)kHR
zl?bwKu2%Az((-NhrAxh%ciB6AtBf{pDz4)9^gsoZ>^MDTWWPUs_H_0ye?Qf8SAHH{
zx^MLd2gk&~j}N}~9(X%fN=ojcxs_R5P*j-R!xG<DvuA~g{%>%ZcIM2vm&Mi3&Q1-z
z%H4fWwf3}K>3@X}Kc1{#xiunuUVI$uy%3j2f0MVayO$Q<U3X07N$26T`2J)2R8Sq@
z;W5eX=e>-KoUD6)JTrvuXJzJQ-~TsNwZ3ne!lkEtdhNhKP%UwdC`m~yNwrEYN(E93
zMh1qKx`qb221X$UMpi~fR>o%924+?U28UEO0rMM@hTQy=%(O}@8jK(s+|BgNff^V*
MUHx3vIVCg!0BOg(*#H0l

literal 0
HcmV?d00001

diff --git a/src/Auth/OAuth/Microsoft.php b/src/Auth/OAuth/Microsoft.php
new file mode 100644
index 000000000..f98049ce0
--- /dev/null
+++ b/src/Auth/OAuth/Microsoft.php
@@ -0,0 +1,132 @@
+<?php
+
+namespace Auth\OAuth;
+
+use Auth\OAuth;
+
+// Reference Material
+// https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-auth-code-flow
+// https://docs.microsoft.com/en-us/graph/auth-v2-user
+class Microsoft extends OAuth
+{
+    /**
+     * @var array
+     */
+    protected $user = [];
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return 'microsoft';
+    }
+
+    /**
+     * @return string
+     */
+    public function getLoginURL(): string
+    {
+        return 'https://login.microsoftonline.com/common/oauth2/v2.0/authorize?'.
+            'client_id='.urlencode($this->appID).
+            '&redirect_uri='.urlencode($this->callback).
+            '&state='.urlencode(json_encode($this->state)).
+            '&scope=offline_access+user.read'.
+            '&response_type=code'.
+            '&response_mode=query';
+    }
+
+    /**
+     * @param string $code
+     *
+     * @return string
+     */
+    public function getAccessToken(string $code): string
+    {
+        $headers[] = 'Content-Type: application/x-www-form-urlencoded';
+
+        $accessToken = $this->request(
+            'POST',
+            'https://login.microsoftonline.com/common/oauth2/v2.0/token',
+            $headers,
+            'code='.urlencode($code).
+            '&client_id='.urlencode($this->appID).
+            '&client_secret='.urlencode($this->appSecret).
+            '&redirect_uri='.urlencode($this->callback).
+            '&scope=offline_access+user.read'.
+            '&grant_type=authorization_code'
+        );
+
+        $accessToken = json_decode($accessToken, true);
+
+        if (isset($accessToken['access_token'])) {
+            return $accessToken['access_token'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @param string $accessToken
+     *
+     * @return string
+     */
+    public function getUserID(string $accessToken): string
+    {
+        $user = $this->getUser($accessToken);
+
+        if (isset($user['id'])) {
+            return $user['id'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @param string $accessToken
+     *
+     * @return string
+     */
+    public function getUserEmail(string $accessToken): string
+    {
+        $user = $this->getUser($accessToken);
+
+        if (isset($user['userPrincipalName'])) {
+            return $user['userPrincipalName'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @param string $accessToken
+     *
+     * @return string
+     */
+    public function getUserName(string $accessToken): string
+    {
+        $user = $this->getUser($accessToken);
+
+        if (isset($user['displayName'])) {
+            return $user['displayName'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @param string $accessToken
+     *
+     * @return array
+     */
+    protected function getUser(string $accessToken): array
+    {
+        if (empty($this->user)) {
+            $headers[] = 'Authorization: Bearer '. urlencode($accessToken);
+            $user = $this->request('GET', 'https://graph.microsoft.com/v1.0/me', $headers);
+            $this->user = json_decode($user, true);
+        }
+
+        return $this->user;
+    }
+}

From f89b7c02c08fe47e4ef44134649dc8d4a3e86a68 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Wed, 2 Oct 2019 12:57:49 +0530
Subject: [PATCH 05/12] chore: updated Microsoft Image

---
 public/images/oauth/microsoft.png | Bin 1026 -> 769 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/images/oauth/microsoft.png b/public/images/oauth/microsoft.png
index 11eebf919797006e8f470718acd9a39762a91d4e..9e40f2342d3303c98732400e58cfdd5d7a45f586 100644
GIT binary patch
literal 769
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U^?OH;uum9_jZn9o^YT*+yCho
z+#K{8n0QS~b~Zd^;>>y<sHEg-$=Ow1e!^?M-pb1Yc?qrDKNglUibUGHe|feqseWC0
z`j-3lpWm<9dr!q~Axlt3X%{zR(`*Jt0fiY31(j+Hj7^*@)6<zK=Kc&+d+_n{?8#pq
zec1AH=d&$UJAZuKd;VwX%9TqVPy2cO(%Gjj_R-I3w61F~{rUB&Y}%%EQS*Ezz3UU>
zm;XKI`So3)*V?E3EDkF-ytpUTk40laCqs0CAtUSE7FOQFkE9F^uyG%1;<8Ee)(~r9
z6)hJAk>+O~Fh&T7h1~H4lO_=XtVVf9b_lM{kY4$}TK#@o)Wwag8(AZ(pZd#03q%JL
zUf#eOs*ucmt6TTQ=iM(GKc%`h|9L;*_u`|6*YI1!XRTx2n?KWjeQBBD#b@sI=g(^h
zKd59nZ)?uPqHWQ~5Wafl6shQdUE$xek{x$$SJ=8$!81KGT_<DTEY0Q1&a-;%3jSX8
zIVK?PRan;Vm<dbt-kvIUbZT&1EPcF5fPqnK-PVW;Vi_^aXJT7f6CIzW{gmzi(xSPa
zpD2Qyf6*IEnneUin!IaiuS|4|2)Jp&>%JN2gU~NRK>vnr;f)4LZd2H{U{l{u^;zo|
zpM9~<cHWDEyFXH8qgGnqv)MjbHtw3@OSQMBPFtOEdYkyb;(CKEOSWw)%Z5osUCs>Z
z8?J5PNKkz$($3(Qur^chfY&KaKE^o*qAn{nOq~)e!(`F8b(t%Jw&rpRmI9`1-)@Gm
zAiqM62Q1fSi7~EOGUt)N0nRn1x=azCmPZvEgd?(}h%@+3{<Z3d1;5V+lme4BgQu&X
J%Q~loCIBl*J%s=O

literal 1026
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j3?$ucQqzDGOS+@4BLl<6e(pbstU$g(vPY0F
z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a><YADU|{SC@CkAK;LQH_$(;wE
zP6q8__~63v_vzgSpH7AC#?1z)2dN3(#qi#e;qSv6cRwC++Xl3UfnnL(YoGuAd$;fB
z5(b9l?{0qi`|th1pG)EFLqIlA5GHl#=Q5y{cTg>h7(RN7HJ#P|;3e94Rtudxqxr#8
z<b#JW0yzuSoKmhlC0hkXKt}Z`dA7Ch+14Ns&&qed_lW)8!;6IY*non2h1gaBNkJfj
zFu<hH$3STi3Xp0zqX9&?*dVC@DP&ZCMje70&Zsl2eGf;!_i(}yE<vCIpcIh&|NlS#
z?mKzFV2msY@(TtBDA7c7dvhBYwl_64Ha0uEHUp`qW*}&Facu=sEg%&jCGET|?dO2z
zGA4PuyEOmVa{dyK!&%@FSq!8TfH<CE#nz0^Kn8n>r>`sfV=hJ!Q?bW~4uBHfPfr)e
zkc@k8&px+eN|0!H=zn6GZ&={X>i0(6f!{Q48dtkH_1)2|dEX!Nx8j}fj;nn~@)kHR
zl?bwKu2%Az((-NhrAxh%ciB6AtBf{pDz4)9^gsoZ>^MDTWWPUs_H_0ye?Qf8SAHH{
zx^MLd2gk&~j}N}~9(X%fN=ojcxs_R5P*j-R!xG<DvuA~g{%>%ZcIM2vm&Mi3&Q1-z
z%H4fWwf3}K>3@X}Kc1{#xiunuUVI$uy%3j2f0MVayO$Q<U3X07N$26T`2J)2R8Sq@
z;W5eX=e>-KoUD6)JTrvuXJzJQ-~TsNwZ3ne!lkEtdhNhKP%UwdC`m~yNwrEYN(E93
zMh1qKx`qb221X$UMpi~fR>o%924+?U28UEO0rMM@hTQy=%(O}@8jK(s+|BgNff^V*
MUHx3vIVCg!0BOg(*#H0l


From 119f5de6b06e61af439f85f4c861c6cffad712db Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Wed, 2 Oct 2019 12:58:59 +0530
Subject: [PATCH 06/12] chore: lint fix

---
 src/Auth/OAuth/Microsoft.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Auth/OAuth/Microsoft.php b/src/Auth/OAuth/Microsoft.php
index f98049ce0..6bbf0bad8 100644
--- a/src/Auth/OAuth/Microsoft.php
+++ b/src/Auth/OAuth/Microsoft.php
@@ -21,7 +21,7 @@ class Microsoft extends OAuth
     {
         return 'microsoft';
     }
-
+    
     /**
      * @return string
      */

From 2e428732d05492977fd5b16a4c7bb743625f772a Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Wed, 2 Oct 2019 13:30:57 +0530
Subject: [PATCH 07/12] feat: started Reddit OAuth

---
 app/config/providers.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/config/providers.php b/app/config/providers.php
index f4d7e6ca8..c141ed11b 100644
--- a/app/config/providers.php
+++ b/app/config/providers.php
@@ -46,4 +46,9 @@ return [
         'icon' => 'icon-linkedin',
         'enabled' => true,
     ],
+    'reddit' => [
+        'developers' => 'https://www.reddit.com/dev/api/',
+        'icon' => 'icon-reddit',
+        'enabled' => true,
+    ],
 ];

From ba7db4b80b9fc04d31566c692922ec452c749a0c Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Wed, 2 Oct 2019 19:09:40 +0530
Subject: [PATCH 08/12] feat: started Dropbox OAuth Support

---
 app/config/providers.php        |   6 +-
 public/images/oauth/dropbox.png | Bin 0 -> 2814 bytes
 src/Auth/OAuth/Dropbox.php      | 132 ++++++++++++++++++++++++++++++++
 3 files changed, 135 insertions(+), 3 deletions(-)
 create mode 100644 public/images/oauth/dropbox.png
 create mode 100644 src/Auth/OAuth/Dropbox.php

diff --git a/app/config/providers.php b/app/config/providers.php
index c141ed11b..9a84950ac 100644
--- a/app/config/providers.php
+++ b/app/config/providers.php
@@ -46,9 +46,9 @@ return [
         'icon' => 'icon-linkedin',
         'enabled' => true,
     ],
-    'reddit' => [
-        'developers' => 'https://www.reddit.com/dev/api/',
-        'icon' => 'icon-reddit',
+    'dropbox' => [
+        'developers' => 'https://www.dropbox.com/developers/documentation',
+        'icon' => 'icon-dropbox',
         'enabled' => true,
     ],
 ];
diff --git a/public/images/oauth/dropbox.png b/public/images/oauth/dropbox.png
new file mode 100644
index 0000000000000000000000000000000000000000..20df74c103fe1c021d28c0ea69caa0dc28982178
GIT binary patch
literal 2814
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

literal 0
HcmV?d00001

diff --git a/src/Auth/OAuth/Dropbox.php b/src/Auth/OAuth/Dropbox.php
new file mode 100644
index 000000000..3082e4ec4
--- /dev/null
+++ b/src/Auth/OAuth/Dropbox.php
@@ -0,0 +1,132 @@
+<?php
+
+namespace Auth\OAuth;
+
+use Auth\OAuth;
+
+// Reference Material
+// https://www.dropbox.com/developers/reference/oauth-guide
+// https://www.dropbox.com/developers/documentation/http/documentation#users-get_current_account 
+class Dropbox extends OAuth
+{
+    /**
+     * @var array
+     */
+    protected $user = [];
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return 'dropbox';
+    }
+    
+    /**
+     * @return string
+     */
+    public function getLoginURL(): string
+    {
+        return 'https://login.microsoftonline.com/common/oauth2/v2.0/authorize?'.
+            'client_id='.urlencode($this->appID).
+            '&redirect_uri='.urlencode($this->callback).
+            '&state='.urlencode(json_encode($this->state)).
+            '&scope=offline_access+user.read'.
+            '&response_type=code'.
+            '&response_mode=query';
+    }
+
+    /**
+     * @param string $code
+     *
+     * @return string
+     */
+    public function getAccessToken(string $code): string
+    {
+        $headers[] = 'Content-Type: application/x-www-form-urlencoded';
+
+        $accessToken = $this->request(
+            'POST',
+            'https://login.microsoftonline.com/common/oauth2/v2.0/token',
+            $headers,
+            'code='.urlencode($code).
+            '&client_id='.urlencode($this->appID).
+            '&client_secret='.urlencode($this->appSecret).
+            '&redirect_uri='.urlencode($this->callback).
+            '&scope=offline_access+user.read'.
+            '&grant_type=authorization_code'
+        );
+
+        $accessToken = json_decode($accessToken, true);
+
+        if (isset($accessToken['access_token'])) {
+            return $accessToken['access_token'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @param string $accessToken
+     *
+     * @return string
+     */
+    public function getUserID(string $accessToken): string
+    {
+        $user = $this->getUser($accessToken);
+
+        if (isset($user['id'])) {
+            return $user['id'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @param string $accessToken
+     *
+     * @return string
+     */
+    public function getUserEmail(string $accessToken): string
+    {
+        $user = $this->getUser($accessToken);
+
+        if (isset($user['userPrincipalName'])) {
+            return $user['userPrincipalName'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @param string $accessToken
+     *
+     * @return string
+     */
+    public function getUserName(string $accessToken): string
+    {
+        $user = $this->getUser($accessToken);
+
+        if (isset($user['displayName'])) {
+            return $user['displayName'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @param string $accessToken
+     *
+     * @return array
+     */
+    protected function getUser(string $accessToken): array
+    {
+        if (empty($this->user)) {
+            $headers[] = 'Authorization: Bearer '. urlencode($accessToken);
+            $user = $this->request('GET', 'https://graph.microsoft.com/v1.0/me', $headers);
+            $this->user = json_decode($user, true);
+        }
+
+        return $this->user;
+    }
+}

From 44c179bb022941593c2b1cb588b521d64eab0379 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Wed, 2 Oct 2019 19:27:52 +0530
Subject: [PATCH 09/12] chore: added getAccessToken adapter

---
 src/Auth/OAuth/Dropbox.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/Auth/OAuth/Dropbox.php b/src/Auth/OAuth/Dropbox.php
index 3082e4ec4..05c122b19 100644
--- a/src/Auth/OAuth/Dropbox.php
+++ b/src/Auth/OAuth/Dropbox.php
@@ -27,13 +27,11 @@ class Dropbox extends OAuth
      */
     public function getLoginURL(): string
     {
-        return 'https://login.microsoftonline.com/common/oauth2/v2.0/authorize?'.
+        return 'https://www.dropbox.com/oauth2/authorize?'.
             'client_id='.urlencode($this->appID).
             '&redirect_uri='.urlencode($this->callback).
             '&state='.urlencode(json_encode($this->state)).
-            '&scope=offline_access+user.read'.
-            '&response_type=code'.
-            '&response_mode=query';
+            '&response_type=code';
     }
 
     /**
@@ -43,17 +41,16 @@ class Dropbox extends OAuth
      */
     public function getAccessToken(string $code): string
     {
+        
         $headers[] = 'Content-Type: application/x-www-form-urlencoded';
-
         $accessToken = $this->request(
             'POST',
-            'https://login.microsoftonline.com/common/oauth2/v2.0/token',
+            'https://api.dropboxapi.com/oauth2/token',
             $headers,
             'code='.urlencode($code).
             '&client_id='.urlencode($this->appID).
             '&client_secret='.urlencode($this->appSecret).
             '&redirect_uri='.urlencode($this->callback).
-            '&scope=offline_access+user.read'.
             '&grant_type=authorization_code'
         );
 
@@ -123,7 +120,7 @@ class Dropbox extends OAuth
     {
         if (empty($this->user)) {
             $headers[] = 'Authorization: Bearer '. urlencode($accessToken);
-            $user = $this->request('GET', 'https://graph.microsoft.com/v1.0/me', $headers);
+            $user = $this->request('GET', 'https://api.dropboxapi.com/2/users/get_current_account', $headers);
             $this->user = json_decode($user, true);
         }
 

From 4e6541b8f622aa59f2d0b9006fb7e35bfb78b91c Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Wed, 2 Oct 2019 19:35:02 +0530
Subject: [PATCH 10/12] feat: Dropbox OAuth Added

---
 src/Auth/OAuth/Dropbox.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Auth/OAuth/Dropbox.php b/src/Auth/OAuth/Dropbox.php
index 05c122b19..d24991139 100644
--- a/src/Auth/OAuth/Dropbox.php
+++ b/src/Auth/OAuth/Dropbox.php
@@ -72,8 +72,8 @@ class Dropbox extends OAuth
     {
         $user = $this->getUser($accessToken);
 
-        if (isset($user['id'])) {
-            return $user['id'];
+        if (isset($user['account_id'])) {
+            return $user['account_id'];
         }
 
         return '';
@@ -88,8 +88,8 @@ class Dropbox extends OAuth
     {
         $user = $this->getUser($accessToken);
 
-        if (isset($user['userPrincipalName'])) {
-            return $user['userPrincipalName'];
+        if (isset($user['email'])) {
+            return $user['email'];
         }
 
         return '';
@@ -104,8 +104,8 @@ class Dropbox extends OAuth
     {
         $user = $this->getUser($accessToken);
 
-        if (isset($user['displayName'])) {
-            return $user['displayName'];
+        if (isset($user['name'])) {
+            return $user['name']['display_name'];
         }
 
         return '';
@@ -120,8 +120,9 @@ class Dropbox extends OAuth
     {
         if (empty($this->user)) {
             $headers[] = 'Authorization: Bearer '. urlencode($accessToken);
-            $user = $this->request('GET', 'https://api.dropboxapi.com/2/users/get_current_account', $headers);
+            $user = $this->request('POST', 'https://api.dropboxapi.com/2/users/get_current_account', $headers);
             $this->user = json_decode($user, true);
+
         }
 
         return $this->user;

From 80f09862b462c4fa8f4da15cf9c9019d9e9316e4 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Wed, 2 Oct 2019 19:37:52 +0530
Subject: [PATCH 11/12] chore: lint fix

---
 src/Auth/OAuth/Dropbox.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Auth/OAuth/Dropbox.php b/src/Auth/OAuth/Dropbox.php
index d24991139..a4a6335f3 100644
--- a/src/Auth/OAuth/Dropbox.php
+++ b/src/Auth/OAuth/Dropbox.php
@@ -6,7 +6,7 @@ use Auth\OAuth;
 
 // Reference Material
 // https://www.dropbox.com/developers/reference/oauth-guide
-// https://www.dropbox.com/developers/documentation/http/documentation#users-get_current_account 
+// https://www.dropbox.com/developers/documentation/http/documentation#users-get_current_account
 class Dropbox extends OAuth
 {
     /**
@@ -41,7 +41,6 @@ class Dropbox extends OAuth
      */
     public function getAccessToken(string $code): string
     {
-        
         $headers[] = 'Content-Type: application/x-www-form-urlencoded';
         $accessToken = $this->request(
             'POST',
@@ -122,7 +121,6 @@ class Dropbox extends OAuth
             $headers[] = 'Authorization: Bearer '. urlencode($accessToken);
             $user = $this->request('POST', 'https://api.dropboxapi.com/2/users/get_current_account', $headers);
             $this->user = json_decode($user, true);
-
         }
 
         return $this->user;

From 333153a4cd38d712497306642d37392bac3fcfbe Mon Sep 17 00:00:00 2001
From: Alexey Pyltsyn <lex61rus@gmail.com>
Date: Wed, 2 Oct 2019 20:43:45 +0300
Subject: [PATCH 12/12] Improve Russian translation

---
 app/config/locale/ru.php                             | 12 ++++++------
 .../locale/templates/ru.email.auth.confirm.tpl       |  4 ++--
 .../locale/templates/ru.email.auth.invitation.tpl    |  4 ++--
 .../locale/templates/ru.email.auth.recovery.tpl      |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/config/locale/ru.php b/app/config/locale/ru.php
index c2f53ad3e..49cd3f19e 100644
--- a/app/config/locale/ru.php
+++ b/app/config/locale/ru.php
@@ -1,16 +1,16 @@
 <?php
 
 return [
-    'settings.inspire' => '"The art of being wise is the art of knowing what to overlook."', // This is the line printed in the homepage and console 'view-source'
+    'settings.inspire' => '"Искусство быть мудрым — это искусство знать, чем можно пренебречь."', // This is the line printed in the homepage and console 'view-source'
     'settings.locale' => 'ru',
-    'settings.direction' => 'rtl',
+    'settings.direction' => 'ltr',
 
-    'auth.emails.team' => '%s Команда',
-    'auth.emails.confirm.title' => 'Подтверждение Аккаунта',
+    'auth.emails.team' => 'Команда %s',
+    'auth.emails.confirm.title' => 'Подтверждение аккаунта',
     'auth.emails.confirm.body' => 'ru.email.auth.confirm.tpl',
-    'auth.emails.recovery.title' => 'Сброс Пароля',
+    'auth.emails.recovery.title' => 'Сброс пароля',
     'auth.emails.recovery.body' => 'ru.email.auth.recovery.tpl',
-    'auth.emails.invitation.title' => 'Приглашение в %s Команду в %s',
+    'auth.emails.invitation.title' => 'Приглашение в команду %s по проекту %s',
     'auth.emails.invitation.body' => 'ru.email.auth.invitation.tpl',
 
     'locale.country.unknown' => 'Неизвестно',
diff --git a/app/config/locale/templates/ru.email.auth.confirm.tpl b/app/config/locale/templates/ru.email.auth.confirm.tpl
index 31299fa77..29993e988 100644
--- a/app/config/locale/templates/ru.email.auth.confirm.tpl
+++ b/app/config/locale/templates/ru.email.auth.confirm.tpl
@@ -7,10 +7,10 @@
 </style>
 
 <div style="direction: {{direction}}">
-    Здравствуйте {{name}},
+    Здравствуйте, {{name}},
     <br />
     <br />
-    Перейдите по ссылке чтобы подтвердить свою адрес электронной почты.
+    Перейдите по ссылке, чтобы подтвердить свой адрес электронной почты.
     <br />
     <a href="{{redirect}}">{{redirect}}</a>
     <br />
diff --git a/app/config/locale/templates/ru.email.auth.invitation.tpl b/app/config/locale/templates/ru.email.auth.invitation.tpl
index 52ce1bf52..41de21d09 100644
--- a/app/config/locale/templates/ru.email.auth.invitation.tpl
+++ b/app/config/locale/templates/ru.email.auth.invitation.tpl
@@ -10,10 +10,10 @@
     Здравствуйте,
     <br />
     <br />
-    Это письмо было отправлено вам потому что <b>{{owner}}</b> хочет пригласить вас стать членом команды <b>{{team}}</b> в {{project}}.
+    Это письмо отправлено вам, потому что <b>{{owner}}</b> приглашает стать членом команды <b>{{team}}</b> в проекте {{project}}.
     <br />
     <br />
-    Перейдите по ссылке чтобы присоединиться к команде <b>{{team}}</b> :
+    Перейдите по ссылке, чтобы присоединиться к команде <b>{{team}}</b> :
     <br />
     <a href="{{redirect}}">{{redirect}}</a>
     <br />
diff --git a/app/config/locale/templates/ru.email.auth.recovery.tpl b/app/config/locale/templates/ru.email.auth.recovery.tpl
index 9f091f13b..680278e42 100644
--- a/app/config/locale/templates/ru.email.auth.recovery.tpl
+++ b/app/config/locale/templates/ru.email.auth.recovery.tpl
@@ -7,10 +7,10 @@
 </style>
 
 <div style="direction: {{direction}}">
-    Здравствуйте {{name}},
+    Здравствуйте, {{name}},
     <br />
     <br />
-    Перейдите по ссылке чтобы сбросить свой пароль для {{project}} .
+    Перейдите по ссылке, чтобы сбросить пароль для проекта {{project}}.
     <br />
     <a href="{{redirect}}">{{redirect}}</a>
     <br />