1
0
Fork 0
mirror of synced 2024-07-06 23:21:05 +12:00
Commit graph

7787 commits

Author SHA1 Message Date
Jake Barnby a47bfe71bf
Merge remote-tracking branch 'origin/1.2.x' into feat-graphql-support
# Conflicts:
#	CHANGES.md
#	composer.json
#	composer.lock
#	tests/e2e/Services/Functions/FunctionsCustomServerTest.php
2022-11-04 21:32:57 +13:00
Christy Jacob 8e99c44c59 Merge branch 'master' of github.com:appwrite/appwrite into sync-1.2.x 2022-11-02 20:39:20 +05:30
Eldad A. Fux 32be6d6816
Merge pull request #4282 from appwrite/doc-unique-id
Update Unique ID references in docs from magic string to ID.unique()
2022-11-02 15:39:46 +02:00
Christy Jacob 360a51ec20 Merge branch '1.1.x' of github.com:appwrite/appwrite into sync-1.2.x 2022-11-02 10:16:27 +05:30
Christy Jacob e9239717d7 Merge branch 'master' of github.com:appwrite/appwrite into sync-1.2.x 2022-11-02 10:16:16 +05:30
Christy Jacob c074731615
Merge pull request #4590 from rskbansal/master
fixed grammatical and spelling errors
2022-11-02 07:38:45 +05:30
Jake Barnby 0827d59f21
Merge remote-tracking branch 'origin/1.1.x' into fix-missing-deployment-attributes
# Conflicts:
#	tests/e2e/Services/Functions/FunctionsCustomServerTest.php
2022-11-02 13:33:10 +13:00
Vincent (Wen Yu) Ge a8a23fb8eb Merge branch 'master' into doc-unique-id 2022-11-01 17:53:48 +00:00
Christy Jacob b2d884e329 Merge branch 'master' of github.com:appwrite/appwrite into 1.1.x 2022-11-01 22:21:19 +05:30
Christy Jacob 5ea19cd539
Merge pull request #3848 from appwrite/refactor-remove-beta
Remove beta tag from Android, Kotlin, Apple and Swift
2022-11-01 12:35:56 +05:30
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 11f3474cb8
buildTime attribute to deployment
(cherry picked from commit 7989518eec)
2022-11-01 11:04:27 +13:00
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
fogelito bf119867e8 change name back to original 'name' 2048 2022-10-31 17:17:37 +02: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
Jake Barnby 049e3a2646
Add missing status, buildStdout, buildStderr to getDeployment 2022-10-31 18:11:55 +13:00
Vincent (Wen Yu) Ge afa508cbed undo changes in swagger files 2022-10-28 20:45:13 +00: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 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
Rhythm Bansal 572e5d5f93
Update hi.json 2022-10-27 14:49:58 +05:30
Rhythm Bansal 569c5644fa
Update hi.json 2022-10-27 14:43:59 +05:30
Rhythm Bansal b5a61d949b
fixed grammatical and spelling errors 2022-10-27 14:42:08 +05:30
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 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
Jake Barnby 9620dcbc07
Update specs 2022-10-26 16:22:01 +13:00
Jake Barnby c5bda4d2ff
Add REST to platforms and SDKs 2022-10-26 16:19:30 +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](9d37326851)
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
Jake Barnby 2f444ead34
Revert "Review revert unrelated change"
This reverts commit bf064fa5c9.
2022-10-25 18:31:51 +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
Torsten Dittmann 461c12c7fe
Merge pull request #3701 from appwrite/feat-oauth-improvements
Feat: OAuth improvements
2022-10-24 17:57:40 +02:00
Vincent (Wen Yu) Ge 9a1f54baf1
Merge branch 'master' into doc-unique-id 2022-10-21 17:43:52 -04:00
Jake Barnby 2d6974da82
Fix empty examples 2022-10-21 15:28:06 +13:00
Jake Barnby 40be56b35f
Set isSDK false for graphql 2022-10-20 18:52:51 +13:00
Jake Barnby 99b8769151
Fix family 2022-10-20 18:40:34 +13:00
Jake Barnby 455b9ca5df
Add initial 1.2.x specs 2022-10-20 16:22:30 +13:00
Jake Barnby 2eed73395a
Add GraphQL platform 2022-10-20 16:21:16 +13:00
Jake Barnby 6a4f3d6a6b
Merge remote-tracking branch 'origin/master' 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
2022-10-20 12:41:24 +13:00
Eldad A. Fux 61d6b435b3
Merge pull request #4530 from appwrite/feat-bump-api-specs
Update API specs
2022-10-19 09:28:13 +03:00
Bradley Schofield 60e924b62b Run Linter 2022-10-19 02:50:48 +01:00
Bradley Schofield fe4028f588 Add tests and add buildTime to worker 2022-10-19 02:43:40 +01:00