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
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
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
Christy Jacob
aff7c59097
feat: update database library
2022-10-31 12:02:51 +00: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
Jake Barnby
db49e962f4
Use abuse status instead of dev/prod for graphql abuse check
2022-10-28 20:12:11 +13:00
Jake Barnby
89b4d0026a
Move shutdown hook to graphql controller
2022-10-28 10:04:31 +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
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
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
a2b1941a47
Merge remote-tracking branch 'origin/master' into feat-graphql-support
...
# Conflicts:
# CONTRIBUTING.md
# composer.json
# composer.lock
# docs/references/teams/list-teams.md
2022-10-19 13:17:56 +13:00
Jake Barnby
61e5014ff0
Add sdk graphql header to allowed headers list
2022-10-19 13:01:39 +13:00
Jake Barnby
cecc6dada2
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
# app/init.php
# composer.json
# composer.lock
2022-10-17 12:04:13 +13:00
Damodar Lohani
be3743e227
fix renamed function
2022-10-14 11:24:37 +00:00
Torsten Dittmann
d0aedf33ba
Merge pull request #4058 from appwrite/fix-deprecate-team-deletion-with-project
...
Deprecate team deletion with project
2022-10-14 11:19:27 +02:00
Jake Barnby
a99ade13c0
Don't flatten batch results
2022-10-14 14:33:42 +13:00
Jake Barnby
742fc98cfc
Controller cleanup
2022-10-14 14:32:16 +13:00
Jake Barnby
44e4f1e05b
Make param errors consistent
2022-10-14 13:18:08 +13:00
Jake Barnby
e4673aaa50
Fix requests using x-sdk-graphql header
2022-10-13 17:33:55 +13:00
Jake Barnby
4e60db0598
Use upstream raw payload function
2022-10-13 16:56:12 +13:00
Jake Barnby
143c53cb20
Always set 200 status code to match spec
2022-10-13 14:52:08 +13:00
Jake Barnby
a2b532ed22
Set dirty property instead of in registry from shutdown
2022-10-13 12:59:32 +13:00
Jake Barnby
5debe2c13c
Alias + name fixes
2022-10-12 20:20:44 +13:00
Jake Barnby
b6621f5e87
Restructure schema building
2022-10-12 14:04:11 +13:00
Jake Barnby
bf194c30e9
Review updates
2022-10-11 13:38:06 +13:00
Jake Barnby
fd8d4f4a1b
Add type property to hash algorithms to allow resolving union type implementation
2022-10-11 12:27:03 +13:00
Bradley Schofield
380a45f987
Add build time to deployment
2022-10-10 16:24:40 +01:00
Jake Barnby
575b882b30
Merge remote-tracking branch 'origin/master' into feat-graphql-support
...
# Conflicts:
# .github/workflows/tests.yml
# composer.lock
2022-10-10 18:41:40 +13:00
Eldad A. Fux
0733909d04
Merge pull request #4346 from appwrite/master
...
Sync 1.1.x
2022-10-10 07:27:26 +03:00
Akshay Rana
da9133ae85
fixed: wrong error message show on adding duplicate number to a user
2022-10-04 23:48:15 +05:30
Vincent (Wen Yu) Ge
4cee87273c
Merge branch 'master' into doc-unique-id
2022-10-04 10:51:38 -04:00
Vincent (Wen Yu) Ge
ae2100244f
Update unique() to be ID.unique()
2022-10-03 20:22:28 +00:00
Matej Bačo
3da4b01f4e
Deprecate team deletion with project
2022-10-03 08:06:48 +00:00
Torsten Dittmann
e5271dbda9
Merge branch '1.0.x' into fix-function-vars-null
2022-09-30 14:29:22 +02:00
Torsten Dittmann
0c1222f0f5
Merge branch 'master' of https://github.com/appwrite/appwrite into 1.0.x
2022-09-30 14:23:06 +02:00
Torsten Dittmann
fbbb150e86
Revert "Merge pull request #4041 from appwrite/revert-3789-feat-app-region"
...
This reverts commit 2117fa53f0
, reversing
changes made to c634d12ef4
.
2022-09-30 14:22:11 +02:00
Torsten Dittmann
e0b9f57d85
Revert "Feat app region"
2022-09-30 12:32:58 +02:00
Torsten Dittmann
637a97c4de
Merge branch '1.0.x' of https://github.com/appwrite/appwrite into fix-function-vars-null
2022-09-30 12:06:32 +02:00
Torsten Dittmann
6c1e2ae537
Merge branch '1.0.x' into fix-boolean-attribute-default-value
2022-09-30 11:56:31 +02:00