From c177c6452adc168c9e4acaafbf1b96ba707f6610 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Thu, 29 Oct 2020 18:39:03 +0200 Subject: [PATCH 1/2] Trigger CI --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a04ad66658..c1242c2fce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,4 +39,4 @@ script: - docker-compose logs appwrite - docker exec appwrite doctor - docker exec appwrite vars -- docker exec appwrite test \ No newline at end of file +- docker exec appwrite test From fc8cbb5088ee16181b391b1c151e1ba21957f172 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Thu, 29 Oct 2020 22:11:16 +0200 Subject: [PATCH 2/2] Templates sync --- app/init.php | 1 - app/tasks/doctor.php | 3 +-- app/views/console/comps/header.phtml | 18 ------------------ app/views/console/database/collection.phtml | 4 ++-- app/views/console/database/index.phtml | 2 +- app/views/console/database/rules/array.phtml | 2 +- app/views/console/index.phtml | 2 +- app/views/console/tasks/index.phtml | 2 +- app/views/console/webhooks/index.phtml | 2 +- 9 files changed, 8 insertions(+), 28 deletions(-) diff --git a/app/init.php b/app/init.php index 03d1c94cab..281bc743c6 100644 --- a/app/init.php +++ b/app/init.php @@ -447,7 +447,6 @@ App::setResource('consoleDB', function($register) { $consoleDB = new Database(); $consoleDB->setAdapter(new RedisAdapter(new MySQLAdapter($register), $register)); $consoleDB->setNamespace('app_console'); // Should be replaced with param if we want to have parent projects - $consoleDB->setMocks(Config::getParam('collections', [])); return $consoleDB; diff --git a/app/tasks/doctor.php b/app/tasks/doctor.php index 0ab19f290e..27479bb305 100644 --- a/app/tasks/doctor.php +++ b/app/tasks/doctor.php @@ -213,7 +213,6 @@ $cli Console::error('🔴 ' . $message); } } - try { Console::log(''); @@ -232,4 +231,4 @@ $cli } catch (\Throwable $th) { Console::error('Failed to check for a newer version'."\n"); } - }); \ No newline at end of file + }); diff --git a/app/views/console/comps/header.phtml b/app/views/console/comps/header.phtml index ead2423b25..5aeb0c0bd9 100644 --- a/app/views/console/comps/header.phtml +++ b/app/views/console/comps/header.phtml @@ -183,24 +183,6 @@ data-name="projects" data-scope="console"> -
- -
- -
-
Appwrite Light Logo diff --git a/app/views/console/database/collection.phtml b/app/views/console/database/collection.phtml index fc9f99351c..faab1fb441 100644 --- a/app/views/console/database/collection.phtml +++ b/app/views/console/database/collection.phtml @@ -501,7 +501,7 @@ $maxCells = 10;