From db7e1f5ebb693b152e37e40a69be4f8daa2e4a87 Mon Sep 17 00:00:00 2001 From: waridrox Date: Wed, 6 Oct 2021 13:23:33 +0530 Subject: [PATCH 1/3] Fixed PSR issues in Migration library Signed-off-by: waridrox --- src/Appwrite/Migration/Migration.php | 28 ++++++++++++-------------- src/Appwrite/Migration/Version/V06.php | 4 +--- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/Appwrite/Migration/Migration.php b/src/Appwrite/Migration/Migration.php index 2ab1ce4fd..aed2da3ac 100644 --- a/src/Appwrite/Migration/Migration.php +++ b/src/Appwrite/Migration/Migration.php @@ -52,7 +52,7 @@ abstract class Migration /** * Migration constructor. - * + * * @param PDO $pdo */ public function __construct(PDO $db) @@ -62,11 +62,11 @@ abstract class Migration /** * Set project for migration. - * + * * @param Document $project * @param Database $projectDB - * - * @return Migration + * + * @return Migration */ public function setProject(Document $project, Database $projectDB): Migration { @@ -78,7 +78,7 @@ abstract class Migration /** * Iterates through every document. - * + * * @param callable $callback */ public function forEachDocument(callable $callback): void @@ -98,7 +98,6 @@ abstract class Migration Console::log('Migrating: ' . $offset . ' / ' . $this->projectDB->getSum()); \Co\run(function () use ($all, $callback) { - foreach ($all as $document) { go(function () use ($document, $callback) { if (empty($document->getId()) || empty($document->getCollection())) { @@ -131,24 +130,23 @@ abstract class Migration } } - public function check_diff_multi($array1, $array2){ + public function check_diff_multi($array1, $array2) + { $result = array(); - foreach($array1 as $key => $val) { - if(is_array($val) && isset($array2[$key])) { + foreach ($array1 as $key => $val) { + if (is_array($val) && isset($array2[$key])) { $tmp = $this->check_diff_multi($val, $array2[$key]); - if($tmp) { + if ($tmp) { $result[$key] = $tmp; } - } - elseif(!isset($array2[$key])) { + } elseif (!isset($array2[$key])) { $result[$key] = null; - } - elseif($val !== $array2[$key]) { + } elseif ($val !== $array2[$key]) { $result[$key] = $array2[$key]; } - if(isset($array2[$key])) { + if (isset($array2[$key])) { unset($array2[$key]); } } diff --git a/src/Appwrite/Migration/Version/V06.php b/src/Appwrite/Migration/Version/V06.php index e4fbc7771..b28ce8ac2 100644 --- a/src/Appwrite/Migration/Version/V06.php +++ b/src/Appwrite/Migration/Version/V06.php @@ -2,7 +2,6 @@ namespace Appwrite\Migration\Version; - use Utopia\App; use Utopia\CLI\Console; use Appwrite\Database\Database; @@ -35,8 +34,7 @@ class V06 extends Migration case Database::SYSTEM_COLLECTION_KEYS: if ($document->getAttribute('secret', null)) { $json = \json_decode($document->getAttribute('secret'), true); - if (is_array($json)) - { + if (is_array($json)) { Console::log('Secret already encrypted. Skipped: ' . $document->getId()); break; } From e94130dd27bbe4bd0374537612c6948d97760189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MishManners=C2=AE=E2=84=A2?= <36594527+mishmanners@users.noreply.github.com> Date: Thu, 14 Oct 2021 12:33:14 +1100 Subject: [PATCH 2/3] Email add MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updated email to include the full email path, as well as direct link that will open in the users' default mail software. This makes it easier/quicker to contact you šŸ˜„ --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 945229c51..01aa3d2ed 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -395,7 +395,7 @@ Pull requests are great, but there are many other areas where you can help Appwr ### Blogging & Speaking -Blogging, speaking about, or creating tutorials about one of Appwriteā€™s many features. Mention [@appwrite_io](https://twitter.com/appwrite_io) on Twitter and/or email team [at] appwrite [dot] io so we can give pointers and tips and help you spread the word by promoting your content on the different Appwrite communication channels. Please add your blog posts and videos of talks to our [Awesome Appwrite](https://github.com/appwrite/awesome-appwrite) repo on GitHub. +Blogging, speaking about, or creating tutorials about one of Appwriteā€™s many features. Mention [@appwrite_io](https://twitter.com/appwrite_io) on Twitter and/or [email team@appwrite.io](mailto:team@appwrite.io) so we can give pointers and tips and help you spread the word by promoting your content on the different Appwrite communication channels. Please add your blog posts and videos of talks to our [Awesome Appwrite](https://github.com/appwrite/awesome-appwrite) repo on GitHub. ### Presenting at Meetups From 41cfe3a3a3c89a1dc9a544c00b901199aee3d07a Mon Sep 17 00:00:00 2001 From: m1ga Date: Fri, 15 Oct 2021 14:30:38 +0200 Subject: [PATCH 3/3] fix: mobile storage image preview --- public/styles/forms.less | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/public/styles/forms.less b/public/styles/forms.less index c0ea06bb7..287b5b342 100644 --- a/public/styles/forms.less +++ b/public/styles/forms.less @@ -25,7 +25,7 @@ input, textarea { input[type=file], input[type=file]::-webkit-file-upload-button { - cursor: pointer; + cursor: pointer; } button, @@ -412,6 +412,7 @@ fieldset { width: ~"calc(100% - 2px)"; max-height: 180px; visibility: visible !important; + object-fit: contain; } .video-preview { @@ -591,7 +592,7 @@ input[type=checkbox], input[type=radio] { color: var(--config-color-background-fade); background: var(--config-color-focus); } - + &[type=radio] { &:checked:after { //content: 'ā—'; @@ -650,7 +651,7 @@ input[type=checkbox], input[type=radio] { color: var(--config-color-fade); padding: 5px 15px; font-size: 12px; - + form { display: inline-block; } @@ -817,7 +818,7 @@ label.switch { &:focus, &:hover { background: var(--config-color-success); - } + } } &:focus, @@ -929,7 +930,7 @@ hr { height: 1px; background: var(--config-border-color)!important; border: none; - + &.fade { opacity: .7; } @@ -1299,7 +1300,7 @@ ol { height: 26px; width: 44px; margin: 9px 0; - + button { padding: 3px; display: block; @@ -1322,7 +1323,7 @@ ol { &.force-light { .pull-end; } - + &.force-dark { .pull-start; } @@ -1354,4 +1355,4 @@ ol { &.info { background: var(--config-color-info)!important; } -} \ No newline at end of file +}