From 128ad27c1aecb7f1384f7c1975da533458a61782 Mon Sep 17 00:00:00 2001 From: TafadzwaD Date: Mon, 11 Oct 2021 13:58:50 +0200 Subject: [PATCH 01/12] Created sn.json file in the translations folder as the ISO 639-1 code for Shona is sn. The file will contain Shona Translations --- app/config/locale/translations/sn.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/config/locale/translations/sn.json diff --git a/app/config/locale/translations/sn.json b/app/config/locale/translations/sn.json new file mode 100644 index 000000000..e69de29bb From 61cdd6ce59300e4afefd6e9aa5cc8614f6aa5a64 Mon Sep 17 00:00:00 2001 From: TafadzwaD Date: Mon, 11 Oct 2021 16:20:12 +0200 Subject: [PATCH 02/12] Generated translations for Shona --- app/config/locale/translations/sn.json | 232 +++++++++++++++++++++++++ 1 file changed, 232 insertions(+) diff --git a/app/config/locale/translations/sn.json b/app/config/locale/translations/sn.json index e69de29bb..20ab4e986 100644 --- a/app/config/locale/translations/sn.json +++ b/app/config/locale/translations/sn.json @@ -0,0 +1,232 @@ +{ + "settings.inspire": "\"Unyanzvi hwekuchenjera kuziva zvekufuratira.\"", + "settings.locale": "sn", + "settings.direction": "ltr", + "emails.sender": "Chikwata che%s", + "emails.verification.subject": "Kuratidzi kuti ndiwe muridzi weakaundi", + "emails.verification.hello": "Hesi {{name}}", + "emails.verification.body": "Tevedza link iyi kuti uratidze kuti kero iyi ndeyako.", + "emails.verification.footer": "Kana usina kukumbira kuti uratidze kuti kero iyi ndeyako, unogona kufuratira meseji iyi.", + "emails.verification.thanks": "Ndatenda", + "emails.verification.signature": "Chikwata che{{project}}", + "emails.magicSession.subject": "Pinda", + "emails.magicSession.hello": "Hesi,", + "emails.magicSession.body": "Baya link iyi kuti upinde muakaundi yako.", + "emails.magicSession.footer": "Kana usina kukumbira kupinda muakaundi yako uchishandisa email iyi, unogona kufuratira meseji iyi.", + "emails.magicSession.thanks": "Ndatenda", + "emails.magicSession.signature": "Chikwata che{{project}}", + "emails.recovery.subject": "Kuchinja pasiwedhi", + "emails.recovery.hello": "Mhoro {{name}}", + "emails.recovery.body": "Baya link iyi kuti uchinje pasiwedhi yako ye{{project}}.", + "emails.recovery.footer": "Kana usina kukumbira kuchinja pasiwedhi yako, unogona kufuratira meseji iyi.", + "emails.recovery.thanks": "Ndatenda", + "emails.recovery.signature": "Chikwata che{{project}}", + "emails.invitation.subject": "Kukokwa kuchikwata che%s ku%s", + "emails.invitation.hello": "Mhoro", + "emails.invitation.body": "Tsamba iyi yatumirwa kwauri nekuti {{owner}} anga achida kuti uve nhengo yechikwata che{{team}} pachirongwa che{{project}}.", + "emails.invitation.footer": "Kana usiri kufarira kuve nhengo yechikwata ichi, unogona kufuratira iyi meseji.", + "emails.invitation.thanks": "Ndatenda", + "emails.invitation.signature": "Chikwata che{{project}}", + "locale.country.unknown": "Haizivikanwe", + "countries.af": "Afuganisitani", + "countries.ao": "Angola", + "countries.al": "Albania", + "countries.ad": "Andorra", + "countries.ae": "Mubatanidzwa wenyika dzeArab Emirates", + "countries.ar": "Argentina", + "countries.am": "Armenia", + "countries.ag": "Antigua and Barbuda", + "countries.au": "Australia", + "countries.at": "Austria", + "countries.az": "Azerbaijan", + "countries.bi": "Burundi", + "countries.be": "Belgium", + "countries.bj": "Benin", + "countries.bf": "Burkina Faso", + "countries.bd": "Bangladesh", + "countries.bg": "Bulgaria", + "countries.bh": "Bahrain", + "countries.bs": "Bahamas", + "countries.ba": "Bosnia and Herzegovina", + "countries.by": "Belarus", + "countries.bz": "Belize", + "countries.bo": "Bolivia", + "countries.br": "Brazil", + "countries.bb": "Barbados", + "countries.bn": "Brunei", + "countries.bt": "Bhutan", + "countries.bw": "Botswana", + "countries.cf": "Central African Republic", + "countries.ca": "Canada", + "countries.ch": "Switzerland", + "countries.cl": "Chile", + "countries.cn": "China", + "countries.ci": "Ivory Coast", + "countries.cm": "Cameroon", + "countries.cd": "DR Congo", + "countries.cg": "Republic of the Congo", + "countries.co": "Colombia", + "countries.km": "Comoros", + "countries.cv": "Cape Verde", + "countries.cr": "Costa Rica", + "countries.cu": "Cuba", + "countries.cy": "Cyprus", + "countries.cz": "Czechia", + "countries.de": "Germany", + "countries.dj": "Djibouti", + "countries.dm": "Dominica", + "countries.dk": "Denmark", + "countries.do": "Dominican Republic", + "countries.dz": "Algeria", + "countries.ec": "Ecuador", + "countries.eg": "Egypt", + "countries.er": "Eritrea", + "countries.es": "Spain", + "countries.ee": "Estonia", + "countries.et": "Ethiopia", + "countries.fi": "Finland", + "countries.fj": "Fiji", + "countries.fr": "France", + "countries.fm": "Micronesia", + "countries.ga": "Gabon", + "countries.gb": "United Kingdom", + "countries.ge": "Georgia", + "countries.gh": "Ghana", + "countries.gn": "Guinea", + "countries.gm": "Gambia", + "countries.gw": "Guinea-Bissau", + "countries.gq": "Equatorial Guinea", + "countries.gr": "Girisi", + "countries.gd": "Grenada", + "countries.gt": "Guatemala", + "countries.gy": "Guyana", + "countries.hn": "Honduras", + "countries.hr": "Croatia", + "countries.ht": "Haiti", + "countries.hu": "Hungary", + "countries.id": "Indonesia", + "countries.in": "India", + "countries.ie": "Ireland", + "countries.ir": "Iran", + "countries.iq": "Iraki", + "countries.is": "Aisirendi", + "countries.il": "Izirayeri", + "countries.it": "Itari", + "countries.jm": "Jamaika", + "countries.jo": "Jodhani", + "countries.jp": "Japani", + "countries.kz": "Khazakisitani", + "countries.ke": "Kenya", + "countries.kg": "Kyrgyzstan", + "countries.kh": "Kambodhiya", + "countries.ki": "Kiribati", + "countries.kn": "Saint Kitts and Nevis", + "countries.kr": "Koria yekuChamhembe", + "countries.kw": "Kuweiti", + "countries.la": "Laos", + "countries.lb": "Lebanon", + "countries.lr": "Liberia", + "countries.ly": "Libya", + "countries.lc": "Saint Lucia", + "countries.li": "Liechtenstein", + "countries.lk": "Sri Lanka", + "countries.ls": "Lesotho", + "countries.lt": "Lithuania", + "countries.lu": "Luxembourg", + "countries.lv": "Latvia", + "countries.ma": "Morocco", + "countries.mc": "Monaco", + "countries.md": "Moldova", + "countries.mg": "Madagascar", + "countries.mv": "Maldives", + "countries.mx": "Mexico", + "countries.mh": "Marshall Islands", + "countries.mk": "Macedonia", + "countries.ml": "Mali", + "countries.mt": "Malta", + "countries.mm": "Myanmar", + "countries.me": "Montenegro", + "countries.mn": "Mongolia", + "countries.mz": "Mozambiki", + "countries.mr": "Moritaniya", + "countries.mu": "Morishiyasi", + "countries.mw": "Malawi", + "countries.my": "Malaysia", + "countries.na": "Namibia", + "countries.ne": "Naija", + "countries.ng": "Naijeriya", + "countries.ni": "Nicaragua", + "countries.nl": "Netherlands", + "countries.no": "Noweyi", + "countries.np": "Nepal", + "countries.nr": "Nauru", + "countries.nz": "New Zealand", + "countries.om": "Oman", + "countries.pk": "Pakisitani", + "countries.pa": "Panama", + "countries.pe": "Peru", + "countries.ph": "Philippines", + "countries.pw": "Palau", + "countries.pg": "Papua New Guinea", + "countries.pl": "Poland", + "countries.kp": "North Korea", + "countries.pt": "Portugal", + "countries.py": "Paraguay", + "countries.qa": "Qatar", + "countries.ro": "Romania", + "countries.ru": "Russia", + "countries.rw": "Rwanda", + "countries.sa": "Saudi Arabia", + "countries.sd": "Sudan", + "countries.sn": "Senegal", + "countries.sg": "Singapore", + "countries.sb": "Solomon Islands", + "countries.sl": "Sierra Leone", + "countries.sv": "El Salvador", + "countries.sm": "San Marino", + "countries.so": "Somalia", + "countries.rs": "Serbia", + "countries.ss": "South Sudan", + "countries.st": "São Tomé and Príncipe", + "countries.sr": "Suriname", + "countries.sk": "Slovakia", + "countries.si": "Slovenia", + "countries.se": "Sweden", + "countries.sz": "Swaziland", + "countries.sc": "Seychelles", + "countries.sy": "Syria", + "countries.td": "Chad", + "countries.tg": "Togo", + "countries.th": "Thailand", + "countries.tj": "Tajikistan", + "countries.tm": "Turkmenistan", + "countries.tl": "Timor-Leste", + "countries.to": "Tonga", + "countries.tt": "Trinidad and Tobago", + "countries.tn": "Tunisia", + "countries.tr": "Turkey", + "countries.tv": "Tuvalu", + "countries.tz": "Tanzania", + "countries.ug": "Uganda", + "countries.ua": "Ukraine", + "countries.uy": "Uruguay", + "countries.us": "United States", + "countries.uz": "Uzbekistan", + "countries.va": "Vatican City", + "countries.vc": "Saint Vincent and the Grenadines", + "countries.ve": "Venezuela", + "countries.vn": "Vietnam", + "countries.vu": "Vanuatu", + "countries.ws": "Samoa", + "countries.ye": "Yemen", + "countries.za": "South Africa", + "countries.zm": "Zambia", + "countries.zw": "Zimbabwe", + "continents.af": "Africa", + "continents.an": "Antarctica", + "continents.as": "Asia", + "continents.eu": "Europe", + "continents.na": "North America", + "continents.oc": "Oceania", + "continents.sa": "South America" +} \ No newline at end of file From 784fe73b376a0ed57c9c6604ee42e1a48905b23e Mon Sep 17 00:00:00 2001 From: TafadzwaD Date: Mon, 11 Oct 2021 16:28:15 +0200 Subject: [PATCH 03/12] Link translation --- app/config/locale/translations/sn.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/config/locale/translations/sn.json b/app/config/locale/translations/sn.json index 20ab4e986..c3f537f6d 100644 --- a/app/config/locale/translations/sn.json +++ b/app/config/locale/translations/sn.json @@ -5,19 +5,19 @@ "emails.sender": "Chikwata che%s", "emails.verification.subject": "Kuratidzi kuti ndiwe muridzi weakaundi", "emails.verification.hello": "Hesi {{name}}", - "emails.verification.body": "Tevedza link iyi kuti uratidze kuti kero iyi ndeyako.", + "emails.verification.body": "Tevedza chinongedzo ichi kuti uratidze kuti kero iyi ndeyako.", "emails.verification.footer": "Kana usina kukumbira kuti uratidze kuti kero iyi ndeyako, unogona kufuratira meseji iyi.", "emails.verification.thanks": "Ndatenda", "emails.verification.signature": "Chikwata che{{project}}", "emails.magicSession.subject": "Pinda", "emails.magicSession.hello": "Hesi,", - "emails.magicSession.body": "Baya link iyi kuti upinde muakaundi yako.", + "emails.magicSession.body": "Baya chinongedzo ichi kuti upinde muakaundi yako.", "emails.magicSession.footer": "Kana usina kukumbira kupinda muakaundi yako uchishandisa email iyi, unogona kufuratira meseji iyi.", "emails.magicSession.thanks": "Ndatenda", "emails.magicSession.signature": "Chikwata che{{project}}", "emails.recovery.subject": "Kuchinja pasiwedhi", "emails.recovery.hello": "Mhoro {{name}}", - "emails.recovery.body": "Baya link iyi kuti uchinje pasiwedhi yako ye{{project}}.", + "emails.recovery.body": "Baya chinongedzo ichi kuti uchinje pasiwedhi yako ye{{project}}.", "emails.recovery.footer": "Kana usina kukumbira kuchinja pasiwedhi yako, unogona kufuratira meseji iyi.", "emails.recovery.thanks": "Ndatenda", "emails.recovery.signature": "Chikwata che{{project}}", From bf5d2b94567ac226024fe8db4a91bdab5a7cfa86 Mon Sep 17 00:00:00 2001 From: TafadzwaD Date: Mon, 11 Oct 2021 16:31:08 +0200 Subject: [PATCH 04/12] Added Shona language as supported in codes.php --- app/config/locale/codes.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/config/locale/codes.php b/app/config/locale/codes.php index 2b15e96a6..e36227559 100644 --- a/app/config/locale/codes.php +++ b/app/config/locale/codes.php @@ -59,6 +59,7 @@ return [ 'si', // Sinhala 'sk', // Slovakia 'sl', // Slovenian + 'sn',// Shona 'sq', // Albanian 'sv', // Swedish 'ta', // Tamil From 99aea00e071fc9695021b586e66a618d2fb502b9 Mon Sep 17 00:00:00 2001 From: TafadzwaD Date: Mon, 11 Oct 2021 16:34:26 +0200 Subject: [PATCH 05/12] Added language as supported into app/init.php --- app/init.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/init.php b/app/init.php index 144db596f..ec954394e 100644 --- a/app/init.php +++ b/app/init.php @@ -318,6 +318,7 @@ Locale::setLanguageFromJSON('sa', __DIR__ . '/config/locale/translations/sa.json Locale::setLanguageFromJSON('si', __DIR__ . '/config/locale/translations/si.json'); Locale::setLanguageFromJSON('sk', __DIR__ . '/config/locale/translations/sk.json'); Locale::setLanguageFromJSON('sl', __DIR__ . '/config/locale/translations/sl.json'); +Locale::setLanguageFromJSON('sn', __DIR__ . '/config/locale/translations/sn.json'); Locale::setLanguageFromJSON('sq', __DIR__ . '/config/locale/translations/sq.json'); Locale::setLanguageFromJSON('sv', __DIR__ . '/config/locale/translations/sv.json'); Locale::setLanguageFromJSON('ta', __DIR__ . '/config/locale/translations/ta.json'); From a25b4c242945aa0563e06f6fb6caabe93373b9f9 Mon Sep 17 00:00:00 2001 From: TafadzwaD Date: Mon, 11 Oct 2021 18:33:21 +0200 Subject: [PATCH 06/12] Added Shona translations --- app/config/locale/translations/sn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/locale/translations/sn.json b/app/config/locale/translations/sn.json index c3f537f6d..9d87509e9 100644 --- a/app/config/locale/translations/sn.json +++ b/app/config/locale/translations/sn.json @@ -24,7 +24,7 @@ "emails.invitation.subject": "Kukokwa kuchikwata che%s ku%s", "emails.invitation.hello": "Mhoro", "emails.invitation.body": "Tsamba iyi yatumirwa kwauri nekuti {{owner}} anga achida kuti uve nhengo yechikwata che{{team}} pachirongwa che{{project}}.", - "emails.invitation.footer": "Kana usiri kufarira kuve nhengo yechikwata ichi, unogona kufuratira iyi meseji.", + "emails.invitation.footer": "Kana usiri kufarira kuve nhengo yechikwata ichi, unogona kufuratira meseji iyi.", "emails.invitation.thanks": "Ndatenda", "emails.invitation.signature": "Chikwata che{{project}}", "locale.country.unknown": "Haizivikanwe", From d737294acb2b438fce08d13cf656566f9296a310 Mon Sep 17 00:00:00 2001 From: AmreshSinha Date: Wed, 20 Oct 2021 11:09:02 +0530 Subject: [PATCH 07/12] Added Yammer OAuth2 Provider --- app/config/providers.php | 10 ++ public/images/users/yammer.png | Bin 0 -> 4840 bytes src/Appwrite/Auth/OAuth2/Yammer.php | 137 ++++++++++++++++++++++++++++ 3 files changed, 147 insertions(+) create mode 100644 public/images/users/yammer.png create mode 100644 src/Appwrite/Auth/OAuth2/Yammer.php diff --git a/app/config/providers.php b/app/config/providers.php index 8525a4216..bb823c9ab 100644 --- a/app/config/providers.php +++ b/app/config/providers.php @@ -231,6 +231,16 @@ return [ // Ordered by ABC. 'beta' => false, 'mock' => false, ], + 'yammer' => [ + 'name' => 'Yammer', + 'developers' => 'https://developer.yammer.com/docs/oauth-2', + 'icon' => 'icon-yammer', + 'enabled' => true, + 'sandbox' => false, + 'form' => false, + 'beta' => false, + 'mock' => false, + ], 'yandex' => [ 'name' => 'Yandex', 'developers' => 'https://tech.yandex.com/oauth/', diff --git a/public/images/users/yammer.png b/public/images/users/yammer.png new file mode 100644 index 0000000000000000000000000000000000000000..2949d82c1bac19f13233a7bc15d4d4a6a502f782 GIT binary patch literal 4840 zcmZ`-cQhN``;J(tRjaMqyH+)b+Iv$gRkK>Fh){dPs;z2kY+@8`jaZ@7t`U@4C1!1^ z#E8}&U!OmJfBeop&wb8)&wcK>?|J^X?|tKp478{zm?;1N0JV;`I`oDe{sV~YX7*S~ zH@P7aCl!4a0H8K0_}uvY&6?9*8>$Zg#NGw~5^ivLBMMgr074J|z*al}AioX(+#m9m zkM_UWOJ=91r4G3MZxptD{7-$$L)*d|0HEpl4@Bw0G%PnkavvRi4f1sg268d7PhcN4 z0Dumsqpo5SFpJMeq&)8p!74564L5u-wbZGw=i^GD1%^wT+9>n!cr&rk+mqMC6?KZ5 zu@YkAjSTGaO47Ng9QyqKvRJ?$W}hoKm`J`QWi*njcNf2{K* zc(<*?Kbt@{_rIZ}6~^QjL*26;Uc%;KQyjgec3h-d2l!*n=|Jg7+Cs^wCtV5^md)<^ zEVkZ(e}}h>7}5J9QMj`wg^CjUgeBpi1((dq>rFyYRArYx?Jx#{04og-i{?VhIx^msn} z=!h?1)7)=x77Pz-(mgy3x#gEPq|dCWqpDo?>127ANsB&O5QeQJBD8eh51q&@KilUf zr7Cd?Z4%ZjGe7T#n*wH}91d0$#3+9B${bMYP)z#{uB@YY8-8322XLz0&)xLzd%MoR z+4G2(x^*_!?$`!hhR+^T7MWvNJhzK3KTY)30c=IAd<>%Jg-gToYL$^O*K#Rq_|=)5 zZUG$%X{O;r7x!|%4lzmn&+WftGnQ`-cX?;#jfugXKmDr-XYd`?<_sAFD$TO-I923G z9~|m{-dc%1`p4@c9$(<8Y?smPE%$-yRh}SAxj`ml&8kCEKJldgz66E#*yP3Dt~7bf zp>L!y^w-$MS1FAj=+{6mO`_AuE?#$b9UP=J|5HgAF%P1#pc0)v#KgIm-%nVv$gtfO zoSSsrs=kSVIJFpFkV#n^O?;EpO#=pgAXSuprGJ7lpW2W**P0F@?7$@*+gNM#d!F{cKwY#jYY6|6vhsi=eq=zBor$ z6&}7kb>5n-z}F+)9zQ; zG2RCZ2-eb6)x3#KLF)Kf)!@Cjf0a8-3-+$S1P9j`2@T{_VMBo(n&YF7%E9~(0W7@+ zFou&AOsg6O2ropT+WtKllZ0I4zd`5%W~;{1$ri zx*a1m*wGQ1w;Fem?LQeAw;vq4{!ycZ(Wf!me3o66nVyR}3JDTxAS$K>mNJ_D;?Hh; zTPh;n%-#6mVy~GqYN8Z*V~1wINm(x>nhG%Fe(?u%PVUV#A&7FoJa94dmUkJW_i&EO z0!f5Hh_$;bWf-|gEaC4oVomrBMY4I)9~${Q#~l5U&c^bW+UyNbos*BxH?>j&yur_U zQtZx>Cc-K@2OZuz6Z0?Nl?A=n1#5a}HldgPbjq^dNj;X-<+@{c)b5KNX zRoj6v=R`)2G;Ak0qnMTi0)hqHzD1Gc{3@cmU9$cCn#o==pF_!CLeXJC5TrOklEx;Dlk2cDVaSo7bIy@ zvq!>rwkcVy%il-oMaP;y z3cI&HJ>(8K!Hu9-XG`5cN?#5q@E=cF?wyZXe(2R8(G6vKH^oTt__Hg@e4N|5S7*+o z;m`0bGPB za{?!>eq|~%R!P@-P@S}zqPL;FQD5>fH`p^!dUK$EGN*g&`77a=7~0kej@5N*V!%4@ znp=fz6U;&wZB2qB!)eMq#@lv9F6ez11cl+XR$80v!*sogbp`91fyCW9fi%e;`@cbv zwN$2ER`ywOvDNr`@L&s#dngyouE zTLj&Y!3&{64#8?$+|Uf}D$47dXL~sy=EFyNs@^(tQkF$6Lpk!01A3~D@eIUJ3a4l! zQ_R4*7Q=-X_Euj^Q!Y-_VPS=zRW7-X5<IQIKzE-Fu zcaa;sZMJ>6aH?tVE>5-Z*o&j2v74>Yxa8lkH{wvDr2yrKyEF!-G?Zd<4q{NmD6g;!WC6t)| zalzILO*MhAqrH#{|0uI#8v87wsJ|i(M^sXi#$CpDUK7**A~9m(7bRO<^ot4)K<{AW zHX&YnzIx_ug>iE@pTIAG)8cObFYMf@W*?>wxDq5ve523n22HsYglD8umZSZXlUg=@ zZD$_-E}QhhsLMNvl2`@BAVRMDW2eN3o}s?%hun&ZqbD12m-|-hT;|FL&uBcHnZpHS z0%szI{Ttc2t$%V@Vo6NIQYNa_mW+}(E|;}WgP!U#t2u7jHSVxDYIN zM80w6x(9WFJB!~HKO!oyKPbXHv1||;c~J-jeVyfbCSBtlp7b)E)(lQ17rVShXL)Lh zt)!rRqE=(~qI>Q56(TZS9$r_|x>dwXqmZdy5)00kht7ZmM`N}g5ueL3JAT5%^c4;e zno|dWbnDJ~+N&5EtFs?(Y$m~s>%|0%62)i{hm=%PXIHgYE2D6bZqAUpH1lw486bZ1 z$=$a~t{|9^NyL+`QW;i2>%w+M_wS1jx~p#l14hyDjpJ`sX<$^`#B@F-_wT$`A!l)9 zWUaEDnJ3$LOjd5sH4c$s6ec*0>^gW_fdol-EOPN!38pfOmK0p_5(aA2ugn$670XGh z8H?={13vMWhRf!Ha=g5hqiCHqAFkm)-2Z92*DLbtPqDEtrHr8)AXwT$z(EYkC#}z( zXT&oI5?@$~0;W~mlOld5Z7&e@*UJoQ1JXfo=)hW>t)X~D)~cecNIRNrc9pE61COCX zoW-Ajazof}XNtN&6$YbHwE|Ub+R2%2tB`c5cSU&l>AT_#q!MrGT+}rzM~nE8_w67! zS>G_sRHfx;&$lUBqsgaD5`2=-S%h_%9eZ|MKB>Vphhx!{M^xDE9k-~9!#@%m!P>(p zvaqKlEn!1_U7&0IR`2&yaM+1fyw^5EsWdyC_& z-atp7{?F07w`vaF9eEbyzU=T8TbvI}`$b2I^EF1RrW*9M1t-$0y+0M#6jZGvO)b{Rcu zbiWfA&uVx*5NK-Mp0IeNej4&J0o5fk;N2-!x`b|EQwOdZ0njOq|R4%IJDpQ%d9_}ymQF>g9#0I(hUZYMXGaChjG$^pqTikq&J;) z28oQFY;0@-_2JhSy>n}B(U4&=Q|M(T+4D+Bjuo!TW_dn?;H1y>e!Io8xxFGC>u#;P zXO!{fY_)ZU#pyVXF&8&v4+~lw@@qj?SmSyKLWPD=oB3MrpS9x0mD21D)WUvD?cZO_h3acmm|$ksR^h#lwu-VMUu>LFn(-U{i%%K zaY6aXGwp_y3J9+9d1v3YXoY3A#7b2OUzPdK9}>xKj$0R|KTSIRUW$lQ4-m6dI~sU9 z5TZ|WjFkbe&D)}?73<;}H?*x|P0e6aX!B0%g^F^^-2`Hw$4HDYf)JieOOfSkWkr!g zcH6x@sktig{Ug@|M_$^nk%eZI*6!DK(duO1^p!qIy{3vF-^uT&T4i8aSAo(#-EQ;g z;6czkxJXq|GuO~6M@L*npV8#^f?8!j4vT8=zf^sn>Mg~8CMo? zCPbfqwP+4_Jv=Ke90r(gd`)Vo(3)E2QNzDnW1186xN_raZfXj{R!;`%lCK=;=xau9sJKt}t!ow?I3mOer9hqZ=m!T*NIuhp!mD6z6o={L?oJ4&^EJv= zBNmq{%BPhc;7&94*8Job9bV%GFNkBfPQN{9XI^;AF)~T z&9+MNc(E}CZED2>d3& zmkn7RfomUzU~wjlG%dQ`!>=e$&+Iwuuky-nEt*jeyKn;heXCa`o30O^kA}IAgRRdiS$nTn zHv|v|i;F!J13wg#F#$`-LZoFOGQwc6EEv396tVk%1a9sQFh|7yFUYx&{jZk=(9tkZ JN2}UI{12{eH4y*+ literal 0 HcmV?d00001 diff --git a/src/Appwrite/Auth/OAuth2/Yammer.php b/src/Appwrite/Auth/OAuth2/Yammer.php new file mode 100644 index 000000000..832d886ee --- /dev/null +++ b/src/Appwrite/Auth/OAuth2/Yammer.php @@ -0,0 +1,137 @@ +endpoint . 'oauth2/authorize?'. + \http_build_query([ + 'client_id' => $this->appID, + 'response_type' => 'code', + 'redirect_uri' => $this->callback, + 'state' => \json_encode($this->state) + ]); + } + + /** + * @param string $code + * + * @return string + */ + public function getAccessToken(string $code): string + { + $headers = ['Content-Type: application/x-www-form-urlencoded']; + + $accessToken = $this->request( + 'POST', + $this->endpoint . 'access_token?', + $headers, + \http_build_query([ + 'client_id' => $this->appID, + 'client_secret' => $this->appSecret, + 'code' => $code, + 'grant_type' => 'authorization_code' + ]) + ); + + $accessToken = \json_decode($accessToken, true); + + if (isset($accessToken['access_token']['token'])) { + return $accessToken['access_token']['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['email'])) { + return $user['email']; + } + + return ''; + } + + /** + * @param string $accessToken + * + * @return string + */ + public function getUserName(string $accessToken): string + { + $user = $this->getUser($accessToken); + + if (isset($user['full_name'])) { + return $user['full_name']; + } + + 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://www.yammer.com/api/v1/users/current.json', $headers); + $this->user = \json_decode($user, true); + } + + return $this->user; + } +} From 44ca72a7a5c3b3f62009bbe8221404fec46b19da Mon Sep 17 00:00:00 2001 From: Tafadzwa Demba Date: Sat, 4 Dec 2021 10:28:31 +0200 Subject: [PATCH 08/12] Update app/config/locale/codes.php Code formatting Co-authored-by: Christy Jacob --- app/config/locale/codes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/locale/codes.php b/app/config/locale/codes.php index e36227559..3eef6c5b6 100644 --- a/app/config/locale/codes.php +++ b/app/config/locale/codes.php @@ -59,7 +59,7 @@ return [ 'si', // Sinhala 'sk', // Slovakia 'sl', // Slovenian - 'sn',// Shona + 'sn', // Shona 'sq', // Albanian 'sv', // Swedish 'ta', // Tamil From cfd9938415326a227252167b97d57a32c0f0dee2 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Fri, 17 Dec 2021 17:26:36 +0545 Subject: [PATCH 09/12] update sdk generator --- composer.json | 2 +- composer.lock | 303 ++++++++++++++++++++++++++++++++------------------ 2 files changed, 194 insertions(+), 111 deletions(-) diff --git a/composer.json b/composer.json index 40542d8e6..910fac9bd 100644 --- a/composer.json +++ b/composer.json @@ -64,7 +64,7 @@ "slickdeals/statsd": "3.1.0" }, "require-dev": { - "appwrite/sdk-generator": "0.16.2", + "appwrite/sdk-generator": "0.16.3", "phpunit/phpunit": "9.5.6", "swoole/ide-helper": "4.6.7", "textalk/websocket": "1.5.2", diff --git a/composer.lock b/composer.lock index bd4240a99..3336f09ef 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a3aad9d7aba75e837b4c6e242c7a91a3", + "content-hash": "c118448e0047bca33e037cb54fa4b3a0", "packages": [ { "name": "adhocore/jwt", @@ -416,16 +416,16 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.4.0", + "version": "7.4.1", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "868b3571a039f0ebc11ac8f344f4080babe2cb94" + "reference": "ee0a041b1760e6a53d2a39c8c34115adc2af2c79" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/868b3571a039f0ebc11ac8f344f4080babe2cb94", - "reference": "868b3571a039f0ebc11ac8f344f4080babe2cb94", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ee0a041b1760e6a53d2a39c8c34115adc2af2c79", + "reference": "ee0a041b1760e6a53d2a39c8c34115adc2af2c79", "shasum": "" }, "require": { @@ -434,7 +434,7 @@ "guzzlehttp/psr7": "^1.8.3 || ^2.1", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", - "symfony/deprecation-contracts": "^2.2" + "symfony/deprecation-contracts": "^2.2 || ^3.0" }, "provide": { "psr/http-client-implementation": "1.0" @@ -520,7 +520,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.4.0" + "source": "https://github.com/guzzle/guzzle/tree/7.4.1" }, "funding": [ { @@ -536,7 +536,7 @@ "type": "tidelift" } ], - "time": "2021-10-18T09:52:00+00:00" + "time": "2021-12-06T18:43:05+00:00" }, { "name": "guzzlehttp/promises", @@ -1395,25 +1395,25 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v2.4.0", + "version": "v3.0.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627" + "reference": "c726b64c1ccfe2896cb7df2e1331c357ad1c8ced" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627", - "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/c726b64c1ccfe2896cb7df2e1331c357ad1c8ced", + "reference": "c726b64c1ccfe2896cb7df2e1331c357ad1c8ced", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=8.0.2" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "3.0-dev" }, "thanks": { "name": "symfony/contracts", @@ -1442,7 +1442,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.4.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.0" }, "funding": [ { @@ -1458,7 +1458,7 @@ "type": "tidelift" } ], - "time": "2021-03-23T23:28:01+00:00" + "time": "2021-11-01T23:48:49+00:00" }, { "name": "symfony/polyfill-ctype", @@ -2222,16 +2222,16 @@ }, { "name": "utopia-php/storage", - "version": "0.5.0", + "version": "0.5.1", "source": { "type": "git", "url": "https://github.com/utopia-php/storage.git", - "reference": "92ae20c7a2ac329f573a58a82dc245134cc63408" + "reference": "e672aa3fc2a8ba689aff65f68ff29f1d608223b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/storage/zipball/92ae20c7a2ac329f573a58a82dc245134cc63408", - "reference": "92ae20c7a2ac329f573a58a82dc245134cc63408", + "url": "https://api.github.com/repos/utopia-php/storage/zipball/e672aa3fc2a8ba689aff65f68ff29f1d608223b8", + "reference": "e672aa3fc2a8ba689aff65f68ff29f1d608223b8", "shasum": "" }, "require": { @@ -2268,9 +2268,9 @@ ], "support": { "issues": "https://github.com/utopia-php/storage/issues", - "source": "https://github.com/utopia-php/storage/tree/0.5.0" + "source": "https://github.com/utopia-php/storage/tree/0.5.1" }, - "time": "2021-04-15T16:43:12+00:00" + "time": "2021-12-13T15:17:14+00:00" }, { "name": "utopia-php/swoole", @@ -2669,16 +2669,16 @@ }, { "name": "appwrite/sdk-generator", - "version": "0.16.2", + "version": "0.16.3", "source": { "type": "git", "url": "https://github.com/appwrite/sdk-generator.git", - "reference": "e3a20c96a745a9c4aa048fd344650fcfbf41cf6f" + "reference": "6185cdfe4c4261287240639f3a7fdc05e7ae2337" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/e3a20c96a745a9c4aa048fd344650fcfbf41cf6f", - "reference": "e3a20c96a745a9c4aa048fd344650fcfbf41cf6f", + "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/6185cdfe4c4261287240639f3a7fdc05e7ae2337", + "reference": "6185cdfe4c4261287240639f3a7fdc05e7ae2337", "shasum": "" }, "require": { @@ -2712,9 +2712,9 @@ "description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms", "support": { "issues": "https://github.com/appwrite/sdk-generator/issues", - "source": "https://github.com/appwrite/sdk-generator/tree/0.16.2" + "source": "https://github.com/appwrite/sdk-generator/tree/0.16.3" }, - "time": "2021-11-12T11:09:38+00:00" + "time": "2021-12-16T23:56:47+00:00" }, { "name": "composer/package-versions-deprecated", @@ -2789,6 +2789,77 @@ ], "time": "2021-09-13T08:41:34+00:00" }, + { + "name": "composer/pcre", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/composer/pcre.git", + "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/pcre/zipball/3d322d715c43a1ac36c7fe215fa59336265500f2", + "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Pcre\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "PCRE wrapping library that offers type-safe preg_* replacements.", + "keywords": [ + "PCRE", + "preg", + "regex", + "regular expression" + ], + "support": { + "issues": "https://github.com/composer/pcre/issues", + "source": "https://github.com/composer/pcre/tree/1.0.0" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2021-12-06T15:17:27+00:00" + }, { "name": "composer/semver", "version": "3.2.6", @@ -2872,25 +2943,27 @@ }, { "name": "composer/xdebug-handler", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "84674dd3a7575ba617f5a76d7e9e29a7d3891339" + "reference": "6555461e76962fd0379c444c46fd558a0fcfb65e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/84674dd3a7575ba617f5a76d7e9e29a7d3891339", - "reference": "84674dd3a7575ba617f5a76d7e9e29a7d3891339", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6555461e76962fd0379c444c46fd558a0fcfb65e", + "reference": "6555461e76962fd0379c444c46fd558a0fcfb65e", "shasum": "" }, "require": { + "composer/pcre": "^1", "php": "^5.3.2 || ^7.0 || ^8.0", "psr/log": "^1 || ^2 || ^3" }, "require-dev": { - "phpstan/phpstan": "^0.12.55", - "symfony/phpunit-bridge": "^4.2 || ^5" + "phpstan/phpstan": "^1.0", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0" }, "type": "library", "autoload": { @@ -2916,7 +2989,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/2.0.2" + "source": "https://github.com/composer/xdebug-handler/tree/2.0.3" }, "funding": [ { @@ -2932,7 +3005,7 @@ "type": "tidelift" } ], - "time": "2021-07-31T17:03:58+00:00" + "time": "2021-12-08T13:07:32+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -3383,16 +3456,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.13.1", + "version": "v4.13.2", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "63a79e8daa781cac14e5195e63ed8ae231dd10fd" + "reference": "210577fe3cf7badcc5814d99455df46564f3c077" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/63a79e8daa781cac14e5195e63ed8ae231dd10fd", - "reference": "63a79e8daa781cac14e5195e63ed8ae231dd10fd", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077", + "reference": "210577fe3cf7badcc5814d99455df46564f3c077", "shasum": "" }, "require": { @@ -3433,9 +3506,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2" }, - "time": "2021-11-03T20:52:16+00:00" + "time": "2021-11-30T19:35:32+00:00" }, { "name": "openlss/lib-array2xml", @@ -3763,16 +3836,16 @@ }, { "name": "phpspec/prophecy", - "version": "1.14.0", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e" + "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e", - "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13", + "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13", "shasum": "" }, "require": { @@ -3824,22 +3897,22 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/1.14.0" + "source": "https://github.com/phpspec/prophecy/tree/v1.15.0" }, - "time": "2021-09-10T09:02:12+00:00" + "time": "2021-12-08T12:19:24+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "9.2.8", + "version": "9.2.10", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "cf04e88a2e3c56fc1a65488afd493325b4c1bc3e" + "reference": "d5850aaf931743067f4bfc1ae4cbd06468400687" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/cf04e88a2e3c56fc1a65488afd493325b4c1bc3e", - "reference": "cf04e88a2e3c56fc1a65488afd493325b4c1bc3e", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/d5850aaf931743067f4bfc1ae4cbd06468400687", + "reference": "d5850aaf931743067f4bfc1ae4cbd06468400687", "shasum": "" }, "require": { @@ -3895,7 +3968,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.8" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.10" }, "funding": [ { @@ -3903,20 +3976,20 @@ "type": "github" } ], - "time": "2021-10-30T08:01:38+00:00" + "time": "2021-12-05T09:12:13+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "3.0.5", + "version": "3.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8" + "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/aa4be8575f26070b100fccb67faabb28f21f66f8", - "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", + "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", "shasum": "" }, "require": { @@ -3955,7 +4028,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.5" + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6" }, "funding": [ { @@ -3963,7 +4036,7 @@ "type": "github" } ], - "time": "2020-09-28T05:57:25+00:00" + "time": "2021-12-02T12:48:52+00:00" }, { "name": "phpunit/php-invoker", @@ -4251,22 +4324,27 @@ }, { "name": "psr/container", - "version": "1.1.2", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", + "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", "shasum": "" }, "require": { "php": ">=7.4.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, "autoload": { "psr-4": { "Psr\\Container\\": "src/" @@ -4293,9 +4371,9 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.2" + "source": "https://github.com/php-fig/container/tree/2.0.2" }, - "time": "2021-11-05T16:50:12+00:00" + "time": "2021-11-05T16:47:00+00:00" }, { "name": "sebastian/cli-parser", @@ -5315,26 +5393,26 @@ }, { "name": "symfony/console", - "version": "v5.3.10", + "version": "v5.4.1", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "d4e409d9fbcfbf71af0e5a940abb7b0b4bad0bd3" + "reference": "9130e1a0fc93cb0faadca4ee917171bd2ca9e5f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/d4e409d9fbcfbf71af0e5a940abb7b0b4bad0bd3", - "reference": "d4e409d9fbcfbf71af0e5a940abb7b0b4bad0bd3", + "url": "https://api.github.com/repos/symfony/console/zipball/9130e1a0fc93cb0faadca4ee917171bd2ca9e5f4", + "reference": "9130e1a0fc93cb0faadca4ee917171bd2ca9e5f4", "shasum": "" }, "require": { "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1", + "symfony/deprecation-contracts": "^2.1|^3", "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php73": "^1.8", + "symfony/polyfill-php73": "^1.9", "symfony/polyfill-php80": "^1.16", - "symfony/service-contracts": "^1.1|^2", - "symfony/string": "^5.1" + "symfony/service-contracts": "^1.1|^2|^3", + "symfony/string": "^5.1|^6.0" }, "conflict": { "psr/log": ">=3", @@ -5349,12 +5427,12 @@ }, "require-dev": { "psr/log": "^1|^2", - "symfony/config": "^4.4|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/event-dispatcher": "^4.4|^5.0", - "symfony/lock": "^4.4|^5.0", - "symfony/process": "^4.4|^5.0", - "symfony/var-dumper": "^4.4|^5.0" + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/event-dispatcher": "^4.4|^5.0|^6.0", + "symfony/lock": "^4.4|^5.0|^6.0", + "symfony/process": "^4.4|^5.0|^6.0", + "symfony/var-dumper": "^4.4|^5.0|^6.0" }, "suggest": { "psr/log": "For using the console logger", @@ -5394,7 +5472,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.3.10" + "source": "https://github.com/symfony/console/tree/v5.4.1" }, "funding": [ { @@ -5410,7 +5488,7 @@ "type": "tidelift" } ], - "time": "2021-10-26T09:30:15+00:00" + "time": "2021-12-09T11:22:43+00:00" }, { "name": "symfony/polyfill-intl-grapheme", @@ -5821,21 +5899,24 @@ }, { "name": "symfony/service-contracts", - "version": "v2.4.0", + "version": "v3.0.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb" + "reference": "36715ebf9fb9db73db0cb24263c79077c6fe8603" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb", - "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/36715ebf9fb9db73db0cb24263c79077c6fe8603", + "reference": "36715ebf9fb9db73db0cb24263c79077c6fe8603", "shasum": "" }, "require": { - "php": ">=7.2.5", - "psr/container": "^1.1" + "php": ">=8.0.2", + "psr/container": "^2.0" + }, + "conflict": { + "ext-psr": "<1.1|>=2" }, "suggest": { "symfony/service-implementation": "" @@ -5843,7 +5924,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "3.0-dev" }, "thanks": { "name": "symfony/contracts", @@ -5880,7 +5961,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.4.0" + "source": "https://github.com/symfony/service-contracts/tree/v3.0.0" }, "funding": [ { @@ -5896,35 +5977,37 @@ "type": "tidelift" } ], - "time": "2021-04-01T10:43:52+00:00" + "time": "2021-11-04T17:53:12+00:00" }, { "name": "symfony/string", - "version": "v5.3.10", + "version": "v6.0.1", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "d70c35bb20bbca71fc4ab7921e3c6bda1a82a60c" + "reference": "0cfed595758ec6e0a25591bdc8ca733c1896af32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/d70c35bb20bbca71fc4ab7921e3c6bda1a82a60c", - "reference": "d70c35bb20bbca71fc4ab7921e3c6bda1a82a60c", + "url": "https://api.github.com/repos/symfony/string/zipball/0cfed595758ec6e0a25591bdc8ca733c1896af32", + "reference": "0cfed595758ec6e0a25591bdc8ca733c1896af32", "shasum": "" }, "require": { - "php": ">=7.2.5", + "php": ">=8.0.2", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-intl-grapheme": "~1.0", "symfony/polyfill-intl-normalizer": "~1.0", - "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php80": "~1.15" + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "symfony/translation-contracts": "<2.0" }, "require-dev": { - "symfony/error-handler": "^4.4|^5.0", - "symfony/http-client": "^4.4|^5.0", - "symfony/translation-contracts": "^1.1|^2", - "symfony/var-exporter": "^4.4|^5.0" + "symfony/error-handler": "^5.4|^6.0", + "symfony/http-client": "^5.4|^6.0", + "symfony/translation-contracts": "^2.0|^3.0", + "symfony/var-exporter": "^5.4|^6.0" }, "type": "library", "autoload": { @@ -5963,7 +6046,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.3.10" + "source": "https://github.com/symfony/string/tree/v6.0.1" }, "funding": [ { @@ -5979,7 +6062,7 @@ "type": "tidelift" } ], - "time": "2021-10-27T18:21:46+00:00" + "time": "2021-12-08T15:13:44+00:00" }, { "name": "textalk/websocket", @@ -6082,16 +6165,16 @@ }, { "name": "twig/twig", - "version": "v2.14.7", + "version": "v2.14.8", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "8e202327ee1ed863629de9b18a5ec70ac614d88f" + "reference": "06b450a2326aa879faa2061ff72fe1588b3ab043" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/8e202327ee1ed863629de9b18a5ec70ac614d88f", - "reference": "8e202327ee1ed863629de9b18a5ec70ac614d88f", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/06b450a2326aa879faa2061ff72fe1588b3ab043", + "reference": "06b450a2326aa879faa2061ff72fe1588b3ab043", "shasum": "" }, "require": { @@ -6145,7 +6228,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v2.14.7" + "source": "https://github.com/twigphp/Twig/tree/v2.14.8" }, "funding": [ { @@ -6157,7 +6240,7 @@ "type": "tidelift" } ], - "time": "2021-09-17T08:39:54+00:00" + "time": "2021-11-25T13:38:06+00:00" }, { "name": "vimeo/psalm", From fb5fbaaefa33b35ffae5fc50838290e1b2e19222 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Fri, 17 Dec 2021 17:56:13 +0545 Subject: [PATCH 10/12] dart and flutter changelog --- docs/sdks/dart/CHANGELOG.md | 3 +++ docs/sdks/flutter/CHANGELOG.md | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/docs/sdks/dart/CHANGELOG.md b/docs/sdks/dart/CHANGELOG.md index 25e00b238..f536cdb2f 100644 --- a/docs/sdks/dart/CHANGELOG.md +++ b/docs/sdks/dart/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2.0.0 +- BREAKING All services and methods now return structured response objects instead of `Response` object + ## 1.0.2 - Support for Appwrite 0.11 diff --git a/docs/sdks/flutter/CHANGELOG.md b/docs/sdks/flutter/CHANGELOG.md index 142b9cb10..4f5841533 100644 --- a/docs/sdks/flutter/CHANGELOG.md +++ b/docs/sdks/flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.1.0 +- Updated `flutter_we_auth` plugin now supports Flutter web for OAuth2 sessions [read more](https://github.com/appwrite/sdk-for-flutter/blob/master/README.md#web) +- Added linters and updated codebase to match the rules + ## 2.0.3 - Support for Appwrite 0.11 - Fix comments on `sum` attributes From ad0edfd5fbdd4752f5ef2cd978e3bcce741ed628 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Fri, 17 Dec 2021 17:58:24 +0545 Subject: [PATCH 11/12] updated dart and flutter sdk version --- app/config/platforms.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/config/platforms.php b/app/config/platforms.php index f97d59808..767cba213 100644 --- a/app/config/platforms.php +++ b/app/config/platforms.php @@ -63,7 +63,7 @@ return [ [ 'key' => 'flutter', 'name' => 'Flutter', - 'version' => '2.0.3', + 'version' => '2.1.0', 'url' => 'https://github.com/appwrite/sdk-for-flutter', 'package' => 'https://pub.dev/packages/appwrite', 'enabled' => true, @@ -334,7 +334,7 @@ return [ [ 'key' => 'dart', 'name' => 'Dart', - 'version' => '1.0.2', + 'version' => '2.0.0', 'url' => 'https://github.com/appwrite/sdk-for-dart', 'package' => 'https://pub.dev/packages/dart_appwrite', 'enabled' => true, From b38a9ec594424def675c6cc718a1063cd0d81474 Mon Sep 17 00:00:00 2001 From: Bradley Schofield Date: Mon, 20 Dec 2021 15:54:22 +0000 Subject: [PATCH 12/12] Fix Functions Usage Chart Typo --- app/views/console/functions/function.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/console/functions/function.phtml b/app/views/console/functions/function.phtml index 554139876..a1707ffea 100644 --- a/app/views/console/functions/function.phtml +++ b/app/views/console/functions/function.phtml @@ -259,7 +259,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
- +