Merge remote-tracking branch 'origin/dev' into refactor-validators
This commit is contained in:
commit
871182b066
10 changed files with 36 additions and 34 deletions
2
.env
2
.env
|
@ -16,7 +16,7 @@ _APP_DB_PORT=3306
|
||||||
_APP_DB_SCHEMA=appwrite
|
_APP_DB_SCHEMA=appwrite
|
||||||
_APP_DB_USER=user
|
_APP_DB_USER=user
|
||||||
_APP_DB_PASS=password
|
_APP_DB_PASS=password
|
||||||
_APP_STORAGE_ANTIVIRUS=disabled
|
_APP_STORAGE_ANTIVIRUS=enabled
|
||||||
_APP_STORAGE_ANTIVIRUS_HOST=clamav
|
_APP_STORAGE_ANTIVIRUS_HOST=clamav
|
||||||
_APP_STORAGE_ANTIVIRUS_PORT=3310
|
_APP_STORAGE_ANTIVIRUS_PORT=3310
|
||||||
_APP_INFLUXDB_HOST=influxdb
|
_APP_INFLUXDB_HOST=influxdb
|
||||||
|
|
|
@ -12,8 +12,8 @@
|
||||||
|
|
||||||
## Upgrades
|
## Upgrades
|
||||||
|
|
||||||
- Upgraded ClamAV to version 1.3.0
|
|
||||||
- Upgraded utopia-php/abuse to version 0.4.0
|
- Upgraded utopia-php/abuse to version 0.4.0
|
||||||
|
- Upgraded utopia-php/analytics to version 0.2.0
|
||||||
|
|
||||||
## Bugs
|
## Bugs
|
||||||
|
|
||||||
|
|
|
@ -53,7 +53,7 @@ docker run -it --rm \
|
||||||
--volume /var/run/docker.sock:/var/run/docker.sock \
|
--volume /var/run/docker.sock:/var/run/docker.sock \
|
||||||
--volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
|
--volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
|
||||||
--entrypoint="install" \
|
--entrypoint="install" \
|
||||||
appwrite/appwrite:0.7.1
|
appwrite/appwrite:0.7.2
|
||||||
```
|
```
|
||||||
|
|
||||||
### Windows
|
### Windows
|
||||||
|
@ -65,7 +65,7 @@ docker run -it --rm ^
|
||||||
--volume //var/run/docker.sock:/var/run/docker.sock ^
|
--volume //var/run/docker.sock:/var/run/docker.sock ^
|
||||||
--volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
|
--volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
|
||||||
--entrypoint="install" ^
|
--entrypoint="install" ^
|
||||||
appwrite/appwrite:0.7.1
|
appwrite/appwrite:0.7.2
|
||||||
```
|
```
|
||||||
|
|
||||||
#### PowerShell
|
#### PowerShell
|
||||||
|
@ -75,7 +75,7 @@ docker run -it --rm ,
|
||||||
--volume /var/run/docker.sock:/var/run/docker.sock ,
|
--volume /var/run/docker.sock:/var/run/docker.sock ,
|
||||||
--volume ${pwd}/appwrite:/usr/src/code/appwrite:rw ,
|
--volume ${pwd}/appwrite:/usr/src/code/appwrite:rw ,
|
||||||
--entrypoint="install" ,
|
--entrypoint="install" ,
|
||||||
appwrite/appwrite:0.7.1
|
appwrite/appwrite:0.7.2
|
||||||
```
|
```
|
||||||
|
|
||||||
Once the Docker installation completes, go to http://localhost to access the Appwrite console from your browser. Please note that on non-linux native hosts, the server might take a few minutes to start after installation completes.
|
Once the Docker installation completes, go to http://localhost to access the Appwrite console from your browser. Please note that on non-linux native hosts, the server might take a few minutes to start after installation completes.
|
||||||
|
|
|
@ -256,6 +256,8 @@ App::error(function ($error, $utopia, $request, $response, $layout, $project) {
|
||||||
$template = ($route) ? $route->getLabel('error', null) : null;
|
$template = ($route) ? $route->getLabel('error', null) : null;
|
||||||
|
|
||||||
if (php_sapi_name() === 'cli') {
|
if (php_sapi_name() === 'cli') {
|
||||||
|
Console::error('[Error] Timestamp: '.date('c', time()));
|
||||||
|
|
||||||
if($route) {
|
if($route) {
|
||||||
Console::error('[Error] Method: '.$route->getMethod());
|
Console::error('[Error] Method: '.$route->getMethod());
|
||||||
Console::error('[Error] URL: '.$route->getURL());
|
Console::error('[Error] URL: '.$route->getURL());
|
||||||
|
|
|
@ -40,7 +40,7 @@ const APP_MODE_DEFAULT = 'default';
|
||||||
const APP_MODE_ADMIN = 'admin';
|
const APP_MODE_ADMIN = 'admin';
|
||||||
const APP_PAGING_LIMIT = 12;
|
const APP_PAGING_LIMIT = 12;
|
||||||
const APP_CACHE_BUSTER = 145;
|
const APP_CACHE_BUSTER = 145;
|
||||||
const APP_VERSION_STABLE = '0.7.1';
|
const APP_VERSION_STABLE = '0.7.2';
|
||||||
const APP_STORAGE_UPLOADS = '/storage/uploads';
|
const APP_STORAGE_UPLOADS = '/storage/uploads';
|
||||||
const APP_STORAGE_FUNCTIONS = '/storage/functions';
|
const APP_STORAGE_FUNCTIONS = '/storage/functions';
|
||||||
const APP_STORAGE_CACHE = '/storage/cache';
|
const APP_STORAGE_CACHE = '/storage/cache';
|
||||||
|
|
|
@ -352,7 +352,7 @@ services:
|
||||||
- appwrite-redis:/data:rw
|
- appwrite-redis:/data:rw
|
||||||
|
|
||||||
clamav:
|
clamav:
|
||||||
image: appwrite/clamav:1.3.0
|
image: appwrite/clamav:1.2.0
|
||||||
container_name: appwrite-clamav
|
container_name: appwrite-clamav
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
|
|
||||||
"utopia-php/framework": "0.12.*",
|
"utopia-php/framework": "0.12.*",
|
||||||
"utopia-php/abuse": "0.4.*",
|
"utopia-php/abuse": "0.4.*",
|
||||||
"utopia-php/analytics": "0.1.*",
|
"utopia-php/analytics": "0.2.*",
|
||||||
"utopia-php/audit": "0.5.*",
|
"utopia-php/audit": "0.5.*",
|
||||||
"utopia-php/cache": "0.2.*",
|
"utopia-php/cache": "0.2.*",
|
||||||
"utopia-php/cli": "0.10.0",
|
"utopia-php/cli": "0.10.0",
|
||||||
|
|
48
composer.lock
generated
48
composer.lock
generated
|
@ -4,7 +4,7 @@
|
||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "40de7f78c6b3d14b63c4ec178dcfe1a2",
|
"content-hash": "69222438c59581b58de7052befa6ac00",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "adhocore/jwt",
|
"name": "adhocore/jwt",
|
||||||
|
@ -364,12 +364,12 @@
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/guzzle/guzzle.git",
|
"url": "https://github.com/guzzle/guzzle.git",
|
||||||
"reference": "98eeb955cbbe0e5d6f3f818e940c84f66aba427b"
|
"reference": "de6f1e58e735754b888649495ed4cb9ae3b19589"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/98eeb955cbbe0e5d6f3f818e940c84f66aba427b",
|
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/de6f1e58e735754b888649495ed4cb9ae3b19589",
|
||||||
"reference": "98eeb955cbbe0e5d6f3f818e940c84f66aba427b",
|
"reference": "de6f1e58e735754b888649495ed4cb9ae3b19589",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -398,7 +398,7 @@
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "7.3-dev"
|
"dev-master": "7.4-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
@ -460,7 +460,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-03-21T18:42:29+00:00"
|
"time": "2021-03-23T14:07:59+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "guzzlehttp/promises",
|
"name": "guzzlehttp/promises",
|
||||||
|
@ -1388,16 +1388,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "utopia-php/analytics",
|
"name": "utopia-php/analytics",
|
||||||
"version": "0.1.0",
|
"version": "0.2.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/utopia-php/analytics.git",
|
"url": "https://github.com/utopia-php/analytics.git",
|
||||||
"reference": "a1f2a1672a927bef8cd4d9b47e5cfbc856a3c72f"
|
"reference": "adfc2d057a7f6ab618a77c8a20ed3e35485ff416"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/utopia-php/analytics/zipball/a1f2a1672a927bef8cd4d9b47e5cfbc856a3c72f",
|
"url": "https://api.github.com/repos/utopia-php/analytics/zipball/adfc2d057a7f6ab618a77c8a20ed3e35485ff416",
|
||||||
"reference": "a1f2a1672a927bef8cd4d9b47e5cfbc856a3c72f",
|
"reference": "adfc2d057a7f6ab618a77c8a20ed3e35485ff416",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -1437,9 +1437,9 @@
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/utopia-php/analytics/issues",
|
"issues": "https://github.com/utopia-php/analytics/issues",
|
||||||
"source": "https://github.com/utopia-php/analytics/tree/0.1.0"
|
"source": "https://github.com/utopia-php/analytics/tree/0.2.0"
|
||||||
},
|
},
|
||||||
"time": "2021-02-03T17:07:09+00:00"
|
"time": "2021-03-23T21:33:07+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "utopia-php/audit",
|
"name": "utopia-php/audit",
|
||||||
|
@ -4996,12 +4996,12 @@
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/console.git",
|
"url": "https://github.com/symfony/console.git",
|
||||||
"reference": "36e4ff2188cb5af6e6e94560b4aaa8042933aa58"
|
"reference": "5da8b675121f9f4419b7052caa0cc6118a3ccd47"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/console/zipball/36e4ff2188cb5af6e6e94560b4aaa8042933aa58",
|
"url": "https://api.github.com/repos/symfony/console/zipball/5da8b675121f9f4419b7052caa0cc6118a3ccd47",
|
||||||
"reference": "36e4ff2188cb5af6e6e94560b4aaa8042933aa58",
|
"reference": "5da8b675121f9f4419b7052caa0cc6118a3ccd47",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -5087,7 +5087,7 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-03-17T16:56:09+00:00"
|
"time": "2021-03-23T14:20:07+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/deprecation-contracts",
|
"name": "symfony/deprecation-contracts",
|
||||||
|
@ -5095,12 +5095,12 @@
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/deprecation-contracts.git",
|
"url": "https://github.com/symfony/deprecation-contracts.git",
|
||||||
"reference": "49dc45a74cbac5fffc6417372a9f5ae1682ca0b4"
|
"reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/49dc45a74cbac5fffc6417372a9f5ae1682ca0b4",
|
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627",
|
||||||
"reference": "49dc45a74cbac5fffc6417372a9f5ae1682ca0b4",
|
"reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -5155,7 +5155,7 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-02-25T16:38:04+00:00"
|
"time": "2021-03-23T23:28:01+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-intl-grapheme",
|
"name": "symfony/polyfill-intl-grapheme",
|
||||||
|
@ -5575,12 +5575,12 @@
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/service-contracts.git",
|
"url": "https://github.com/symfony/service-contracts.git",
|
||||||
"reference": "3d72b4bfab3e991aa66906aa301aa479de4ca6ee"
|
"reference": "1309413986521646bb0ba91140afdc2a61ed8cfe"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/3d72b4bfab3e991aa66906aa301aa479de4ca6ee",
|
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/1309413986521646bb0ba91140afdc2a61ed8cfe",
|
||||||
"reference": "3d72b4bfab3e991aa66906aa301aa479de4ca6ee",
|
"reference": "1309413986521646bb0ba91140afdc2a61ed8cfe",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -5647,7 +5647,7 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-03-16T09:10:58+00:00"
|
"time": "2021-03-23T23:28:01+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/string",
|
"name": "symfony/string",
|
||||||
|
|
|
@ -414,7 +414,7 @@ services:
|
||||||
- appwrite-redis:/data:rw
|
- appwrite-redis:/data:rw
|
||||||
|
|
||||||
clamav:
|
clamav:
|
||||||
image: appwrite/clamav:1.3.0
|
image: appwrite/clamav:1.2.0
|
||||||
container_name: appwrite-clamav
|
container_name: appwrite-clamav
|
||||||
networks:
|
networks:
|
||||||
- appwrite
|
- appwrite
|
||||||
|
|
|
@ -327,7 +327,7 @@ services:
|
||||||
- appwrite-redis:/data:rw
|
- appwrite-redis:/data:rw
|
||||||
|
|
||||||
clamav:
|
clamav:
|
||||||
image: appwrite/clamav:1.3.0
|
image: appwrite/clamav:1.2.0
|
||||||
container_name: appwrite-clamav
|
container_name: appwrite-clamav
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
|
|
Loading…
Reference in a new issue