Merge branch 'master' of https://github.com/appwrite/appwrite into chore-release-1-1-2

CHANGES.md

@@ -1,9 +1,11 @@
-
 # Version 1.1.2
 ## Changes
 - Released `appwrite/console` [2.0.2](https://github.com/appwrite/console/releases/tag/2.0.2)
 - Make `region` parameter optional with default for project create [#4763](https://github.com/appwrite/appwrite/pull/4763)
+## Bugs
 - Fix session expiration, and expired session deletion [#4739](https://github.com/appwrite/appwrite/pull/4739)
+- Fix processing status on sync executions [#4737](https://github.com/appwrite/appwrite/pull/4737)
+- Fix Locale API returning Unknown continent [#4761](https://github.com/appwrite/appwrite/pull/4761)
 
 # Version 1.1.1
 ## Bugs

app/controllers/api/account.php

@@ -426,8 +426,6 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
             throw new Exception(Exception::PROJECT_INVALID_FAILURE_URL);
         }
 
-        $state['failure'] = null;
-
         $accessToken = $oauth2->getAccessToken($code);
         $refreshToken = $oauth2->getRefreshToken($code);
         $accessTokenExpiry = $oauth2->getAccessTokenExpiry($code);

app/controllers/api/functions.php

@@ -1080,7 +1080,7 @@ App::post('/v1/functions/:functionId/executions')
             'functionId' => $function->getId(),
             'deploymentId' => $deployment->getId(),
             'trigger' => 'http', // http / schedule / event
-            'status' => 'waiting', // waiting / processing / completed / failed
+            'status' => $async ? 'waiting' : 'processing', // waiting / processing / completed / failed
             'statusCode' => 0,
             'response' => '',
             'stderr' => '',

app/controllers/api/locale.php

@@ -40,7 +40,6 @@ App::get('/v1/locale')
             $output['countryCode'] = $record['country']['iso_code'];
             $output['country'] = $locale->getText('countries.' . strtolower($record['country']['iso_code']), $locale->getText('locale.country.unknown'));
             $output['continent'] = $locale->getText('continents.' . strtolower($record['continent']['code']), $locale->getText('locale.country.unknown'));
-            $output['continent'] = (isset($continents[$record['continent']['code']])) ? $continents[$record['continent']['code']] : $locale->getText('locale.country.unknown');
             $output['continentCode'] = $record['continent']['code'];
             $output['eu'] = (\in_array($record['country']['iso_code'], $eu)) ? true : false;
 

tests/e2e/Services/Functions/FunctionsCustomServerTest.php

@@ -550,7 +550,6 @@ class FunctionsCustomServerTest extends Scope
         $this->assertIsArray($function['body']['deployments']);
         $this->assertCount(2, $function['body']['deployments']);
         $this->assertEquals($function['body']['deployments'][0]['$id'], $data['deploymentId']);
-        $this->assertGreaterThanOrEqual(2, $function['body']['deployments'][0]['buildTime']);
 
         return $data;
     }