Commit Graph
13783 Commits
Author SHA1 Message Date
Jake Barnby 8a4fd3307d Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	composer.json
#	composer.lock
2022-11-01 11:38:23 +13:00
Jake Barnby 03f85c3b74 Merge remote-tracking branch 'origin/1.1.x' into feat-graphql-support
# Conflicts:
#	app/config/specs/open-api3-latest-client.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	composer.json
#	composer.lock
#	src/Appwrite/Utopia/Response/Model/Provider.php
2022-11-01 11:07:51 +13:00
Damodar Lohani a97a476296 assert buildTime is greater than 0
(cherry picked from commit 24a140c3af)
2022-11-01 11:04:42 +13:00
Damodar Lohani 11f3474cb8 buildTime attribute to deployment
(cherry picked from commit 7989518eec)
2022-11-01 11:04:27 +13:00
Christy Jacob 622c852367 Merge pull request #4584 from appwrite/test-mysql-adapter
Test mysql adapter
2022-11-01 02:11:54 +05:30
Christy Jacob 256046cba7 Merge pull request #4614 from appwrite/update-db-library
feat: update database library
2022-10-31 23:41:15 +05:30
Christy Jacob 629c1b1686 Merge branch 'test-mysql-adapter' of github.com:appwrite/appwrite into update-db-library 2022-10-31 23:38:58 +05:30
Christy Jacob a450089fe7 Update composer.json 2022-10-31 20:51:32 +05:30
fogelito bf119867e8 change name back to original 'name' 2048 2022-10-31 17:17:37 +02:00
fogelito 1e92bda18b composer changes 2022-10-31 16:50:54 +02:00
fogelito eaf59693b7 composer.json 2022-10-31 15:26:40 +02:00
Torsten Dittmann ae288ffc9b Merge pull request #4613 from appwrite/rebase-1.1.x
rebase: 1.1.x
2022-10-31 13:59:12 +01:00
Christy Jacob aff7c59097 feat: update database library 2022-10-31 12:02:51 +00:00
Torsten Dittmann 983f885b3f fix: builds worker buildTime 2022-10-31 12:47:41 +01:00
Torsten Dittmann d387f198db Merge branch 'master' of https://github.com/appwrite/appwrite into rebase-1.1.x 2022-10-31 09:45:51 +01:00
Eldad A. Fux 1b0abf4643 Merge pull request #3836 from appwrite/gewenyu99-patch-1
Update Chinese README-CN.md
2022-10-30 10:09:39 +02:00
Eldad A. Fux 68d31d4ac7 Merge pull request #4555 from appwrite/feat-4535-remove-pdo-rethrow
Remove PDO rethrow
2022-10-29 17:15:19 +03:00
Jake Barnby 6234ff20f4 Add test for rate limit enforced when using graphql 2022-10-28 20:13:48 +13:00
Jake Barnby db49e962f4 Use abuse status instead of dev/prod for graphql abuse check 2022-10-28 20:12:11 +13:00
Jake Barnby c23cca950a Merge branch 'fix-provider-model' into feat-graphql-support 2022-10-28 11:30:15 +13:00
Jake Barnby 9274ec6880 Fix type error 2022-10-28 11:26:32 +13:00
Jake Barnby 323c0c5ab7 Revert debug changes 2022-10-28 10:25:59 +13:00
Jake Barnby e46eeb3e16 Remove namespace from var name 2022-10-28 10:19:09 +13:00
Jake Barnby 2a96056b8d Remove redundant import and sort 2022-10-28 10:06:09 +13:00
Jake Barnby 89b4d0026a Move shutdown hook to graphql controller 2022-10-28 10:04:31 +13:00
Jake Barnby 2469a42d1d Merge remote-tracking branch 'origin/master' into feat-graphql-support 2022-10-27 12:25:37 +13:00
Jake Barnby e632731c4e Merge remote-tracking branch 'origin/1.1.x' into feat-graphql-support 2022-10-27 12:24:57 +13:00
fogelito a5e67db604 fulltext 2022-10-26 23:12:46 +03:00
fogelito 013f4d55c2 docker-compose.yml 2022-10-26 23:07:04 +03:00
fogelito 8e8801b11c adapter change 2022-10-26 23:05:25 +03:00
fogelito 08e44f0656 some changes 2022-10-26 22:14:39 +03:00
Torsten Dittmann eb31bfb78e Merge pull request #4418 from appwrite/feat-deployment-buildtime
Add build time to deployments
2022-10-26 18:42:53 +02:00
Torsten Dittmann 32f2333ab6 test: mysql adapter 2022-10-26 16:38:40 +02:00
Christy Jacob 73bce1d7d0 Merge pull request #4309 from appwrite/fix-update-docker-compose
fix: docker compose syntax
2022-10-26 09:48:06 +05:30
Jake Barnby 9620dcbc07 Update specs 2022-10-26 16:22:01 +13:00
Jake Barnby c8b19bd84d Update lock 2022-10-26 16:21:24 +13:00
Jake Barnby c5bda4d2ff Add REST to platforms and SDKs 2022-10-26 16:19:30 +13:00
Jake Barnby 9fbf8d6aee Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	tests/e2e/General/HTTPTest.php
2022-10-26 13:54:52 +13:00
Steven Nguyen 719aa67afa Remove PDO rethrow
The PDOException was rethrown in general.php so that it could be caught
in the catch block of http.php. However, [a change in
utopia-php/framework](https://github.com/utopia-php/framework/commit/9d37326851f65f354344cfe2e3c1a282d5231025)
caused the exception to be masked as an Exception rather than the
underlying PDOException. As such, the `$th instanceof PDOException` in
http.php is always false and `$db = null` is never executed. Since these
snippets of code aren't doing anything or adding value, they should be
removed.

In addition, the `$db = null` may have been added to ensure the
connection was added back to the pool and/or reset if needed, but it
seems like that's not a problem anymore.
2022-10-25 10:05:52 -07:00
Eldad A. Fux 4942ba9951 Merge pull request #4569 from appwrite/fix-spec-tests
Fix spec tests
2022-10-25 10:41:18 +03:00
Jake Barnby 1f49985d26 Remove var dumps 2022-10-25 19:38:31 +13:00
Jake Barnby 2f444ead34 Revert "Review revert unrelated change"
This reverts commit bf064fa5c9.
2022-10-25 18:31:51 +13:00
Jake Barnby b6e7e84d50 Comments 2022-10-25 16:35:00 +13:00
Jake Barnby e3b5919e40 Review doc fixes 2022-10-25 15:53:15 +13:00
Jake Barnby 34bd0fe93d Review remove redundant registry injection 2022-10-25 15:45:08 +13:00
Jake Barnby bf064fa5c9 Review revert unrelated change 2022-10-25 15:44:19 +13:00
Jake Barnby e2840a1c84 Remove docs to reduce PR size 2022-10-25 12:51:22 +13:00
Jake Barnby e2a63c10a1 Fix spec tests 2022-10-25 12:37:19 +13:00
Jake Barnby 889db82ad4 Fix spec tests 2022-10-25 12:34:57 +13:00
Torsten Dittmann 461c12c7fe Merge pull request #3701 from appwrite/feat-oauth-improvements
Feat: OAuth improvements
2022-10-24 17:57:40 +02:00