CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-09-29 17:01:37 +13:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feat-graphql-support

Browse source 
# Conflicts:
#	composer.lock
This commit is contained in:
Jake Barnby 2022-07-15 11:14:37 +12:00
commit 16851be3e4
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
composer.json
View file

@ -48,7 +48,7 @@
"utopia-php/analytics": "0.2.*", "utopia-php/analytics": "0.2.*",
"utopia-php/audit": "0.8.*", "utopia-php/audit": "0.8.*",
"utopia-php/cache": "0.6.*", "utopia-php/cache": "0.6.*",
"utopia-php/cli": "0.12.*", "utopia-php/cli": "0.13.*",
"utopia-php/config": "0.2.*", "utopia-php/config": "0.2.*",
"utopia-php/database": "0.18.*", "utopia-php/database": "0.18.*",
"utopia-php/locale": "0.4.*", "utopia-php/locale": "0.4.*",
@ -59,7 +59,7 @@
"utopia-php/storage": "0.9.*", "utopia-php/storage": "0.9.*",
"utopia-php/websocket": "0.1.0", "utopia-php/websocket": "0.1.0",
"utopia-php/image": "0.5.*", "utopia-php/image": "0.5.*",
"utopia-php/orchestration": "0.4.*", "utopia-php/orchestration": "0.6.*",
"resque/php-resque": "1.3.6", "resque/php-resque": "1.3.6",
"matomo/device-detector": "6.0.0", "matomo/device-detector": "6.0.0",
"dragonmantank/cron-expression": "3.3.1", "dragonmantank/cron-expression": "3.3.1",

28
composer.lock generated
View file

@ -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": "b395a62241bc19cb1b7d845e3287808b", "content-hash": "36bc44ae9252dbac0dea90c7a9f5c391",
"packages": [ "packages": [
{ {
"name": "adhocore/jwt", "name": "adhocore/jwt",
@ -1947,16 +1947,16 @@
}, },
{ {
"name": "utopia-php/cli", "name": "utopia-php/cli",
"version": "0.12.0", "version": "0.13.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/utopia-php/cli.git", "url": "https://github.com/utopia-php/cli.git",
"reference": "6d164b752efeb1ca089e3a517bc274d8b383474b" "reference": "69e68f8ed525fe162fae950a0507ed28a0f179bc"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/utopia-php/cli/zipball/6d164b752efeb1ca089e3a517bc274d8b383474b", "url": "https://api.github.com/repos/utopia-php/cli/zipball/69e68f8ed525fe162fae950a0507ed28a0f179bc",
"reference": "6d164b752efeb1ca089e3a517bc274d8b383474b", "reference": "69e68f8ed525fe162fae950a0507ed28a0f179bc",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1994,9 +1994,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/utopia-php/cli/issues", "issues": "https://github.com/utopia-php/cli/issues",
"source": "https://github.com/utopia-php/cli/tree/0.12.0" "source": "https://github.com/utopia-php/cli/tree/0.13.0"
}, },
"time": "2022-02-18T22:10:41+00:00" "time": "2022-04-26T08:41:22+00:00"
}, },
{ {
"name": "utopia-php/config", "name": "utopia-php/config",
@ -2388,21 +2388,21 @@
}, },
{ {
"name": "utopia-php/orchestration", "name": "utopia-php/orchestration",
"version": "0.4.1", "version": "0.6.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/utopia-php/orchestration.git", "url": "https://github.com/utopia-php/orchestration.git",
"reference": "67cf0ab15a096d274c093ea918aa4ace14ac7af7" "reference": "94263976413871efb6b16157a7101a81df3b6d78"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/utopia-php/orchestration/zipball/67cf0ab15a096d274c093ea918aa4ace14ac7af7", "url": "https://api.github.com/repos/utopia-php/orchestration/zipball/94263976413871efb6b16157a7101a81df3b6d78",
"reference": "67cf0ab15a096d274c093ea918aa4ace14ac7af7", "reference": "94263976413871efb6b16157a7101a81df3b6d78",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=8.0", "php": ">=8.0",
"utopia-php/cli": "0.12.*" "utopia-php/cli": "0.13.*"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^9.3", "phpunit/phpunit": "^9.3",
@ -2437,9 +2437,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/utopia-php/orchestration/issues", "issues": "https://github.com/utopia-php/orchestration/issues",
"source": "https://github.com/utopia-php/orchestration/tree/0.4.1" "source": "https://github.com/utopia-php/orchestration/tree/0.6.0"
}, },
"time": "2022-02-20T09:23:06+00:00" "time": "2022-07-13T16:47:18+00:00"
}, },
{ {
"name": "utopia-php/preloader", "name": "utopia-php/preloader",