1
0
Fork 0
mirror of synced 2024-07-04 22:20:45 +12:00
Commit graph

3680 commits

Author SHA1 Message Date
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
Damodar Lohani dfa35e0a0b fix periods on usage endpoints 2022-10-21 05:45:25 +00:00
Damodar Lohani d35b438255 fix collection and document counts 2022-10-21 01:50:03 +00:00
Damodar Lohani a7e1e5f25f fix period 2022-10-21 01:40:33 +00: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
Damodar Lohani 868e487a59 fix bucket collection name 2022-10-18 07:52:41 +00:00
Damodar Lohani e7c82a28dd more fixes 2022-10-18 07:09:11 +00:00
Damodar Lohani 305dafe2ad update missing stats 2022-10-18 06:53:17 +00:00
Damodar Lohani 5b90c433ab fix collection id 2022-10-17 07:53:55 +00:00
Damodar Lohani 00d194d5d1 fix linters 2022-10-17 07:37:30 +00:00
Damodar Lohani f3c183b563 listen to delete events 2022-10-17 07:10:18 +00:00
Damodar Lohani f78cb09694 Merge remote-tracking branch 'origin/master' into feat-usage-refactor 2022-10-17 06:55:01 +00:00
Damodar Lohani 84f5842c81 document create listener 2022-10-17 06:52:24 +00: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 019fa11616 setup to use database listeners 2022-10-16 08:50:53 +00:00
Damodar Lohani be3743e227 fix renamed function 2022-10-14 11:24:37 +00:00
Damodar Lohani f86a5b5fcd fix renamed methods 2022-10-14 11:12:59 +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
Torsten Dittmann 4210fdcb27 feat: console rewrite 2022-10-11 16:36:39 +02:00
Torsten Dittmann 9d9f96ac1e Merge branch 'master' of https://github.com/appwrite/appwrite into 1.1.x 2022-10-11 14:26:59 +02: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
Damodar Lohani 9b2db20b3b fix backfill 2022-10-09 06:33:14 +00:00
Damodar Lohani 22b00c019d update usage period on get for databases 2022-10-09 06:30:26 +00: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
Torsten Dittmann 65b4c9f931 fix: default value for optional function vars 2022-09-30 11:52:35 +02:00
Torsten Dittmann b1197d581a
Merge pull request #3908 from appwrite/fix-function-schedule-loops
Fix schedule loop triggering
2022-09-30 11:45:11 +02:00
Torsten Dittmann d45464c6c8 fix: boolean attribute default value 2022-09-30 11:27:19 +02:00
Bradley Schofield eeb6ee0821 Update functions.php 2022-09-29 09:42:46 +01:00
Jake Barnby 471f12b8ba
Only apply max depth and complexity in production to allow introspection 2022-09-29 17:46:01 +13:00
Jake Barnby 69d42fc980
Fix create scrypt user route param defaults types 2022-09-29 16:52:57 +13:00
Eldad A. Fux b575df867e
Merge pull request #3789 from appwrite/feat-app-region
Feat app region
2022-09-25 15:04:56 +03:00
Damodar Lohani 4969ceadd4 add project internal id to the timeseries tats 2022-09-25 02:07:26 +00:00
Matej Bačo 46c91899e7
Merge branch '0.16.x' into feat-improve-sms-e2e-tests 2022-09-23 08:23:29 +02:00
Christy Jacob 54d14a5151
Merge pull request #3883 from appwrite/fix-get-membership-response
Fix: Get Membership response
2022-09-23 11:42:33 +05:30
Matej Bačo 0159079608 Fix schedule loop triggering 2022-09-23 06:12:17 +00:00
Jake Barnby a3b75a374b
Update variables and defaults 2022-09-23 15:55:10 +12:00
Christy Jacob 7abb426e3f fix: hash phone auth code 2022-09-23 03:55:17 +05:30
Christy Jacob ba0be549e3
Merge pull request #3881 from appwrite/fix-null-required-param
Fix: Null required ID params
2022-09-23 00:37:17 +05:30
Christy Jacob f39ed010c7
Merge pull request #3889 from appwrite/fix-permission-selection
Fix permission selection before role entry
2022-09-23 00:33:09 +05:30
Jake Barnby f7e5ccf296
Merge remote-tracking branch 'origin/fix-team-get-membership-model' into feat-graphql-support
# Conflicts:
#	CONTRIBUTING.md
2022-09-22 20:12:17 +12:00
Damodar Lohani 2956d5f3eb collect console stats 2022-09-22 07:34:03 +00:00
Jake Barnby 398c3eec29
Fix SDK response model for get team membership 2022-09-22 19:26:54 +12:00
Jake Barnby 144e723431
Update error handling 2022-09-21 18:36:43 +12:00
Damodar Lohani 3166be9da0 remove region from update 2022-09-21 02:01:59 +00:00
Jake Barnby 544413dddf
More 1.0 migrations 2022-09-20 20:25:05 +12:00
Jake Barnby e9f75d32a1
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	Dockerfile
#	app/config/errors.php
#	app/config/roles.php
#	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/controllers/api/graphql.php
#	app/controllers/shared/api.php
#	app/init.php
#	composer.lock
#	docker-compose.yml
#	src/Appwrite/Extend/Exception.php
#	src/Appwrite/Migration/Migration.php
2022-09-20 15:43:09 +12:00
Damodar Lohani e80e65946b Merge branch 'master' of https://github.com/appwrite/appwrite into feat-app-region 2022-09-19 12:01:56 +00:00
Matej Bačo 89afad1a32 Replace nulls with empty strings 2022-09-19 11:58:41 +00:00
Matej Bačo c42bf2d8da Fix documentation response model 2022-09-19 11:43:21 +00:00
Matej Bačo a983e792d8 Refactor required param values 2022-09-19 10:05:42 +00:00
Matej Bačo 6e8a4cc97b Update sms mock to use request catcher 2022-09-19 08:09:48 +00:00
Steven Nguyen 00a4929301 Fix date format for usage APIs 2022-09-15 23:48:09 +00:00
Christy Jacob 6c220467b8
Merge pull request #3682 from appwrite/0.16.x
0.16.x
2022-09-14 18:10:41 +05:30
Torsten Dittmann 3df89e65ca
Merge pull request #3816 from appwrite/feat-consistent-parent-id
Update document model
2022-09-14 10:25:36 +02:00
Torsten Dittmann 90af882aa6
Merge pull request #3825 from appwrite/update-team-membership
feat: rename getMemberships to listMemberships
2022-09-14 10:23:13 +02:00
Torsten Dittmann 1043cc4fc1
Merge pull request #3809 from appwrite/fix-function-scheduling
Fix functon scheduling loop logic, and double-loop prevention
2022-09-14 10:20:27 +02:00
Jake Barnby dab4c004d3
Merge remote-tracking branch 'origin/0.16.x' into update-team-membership 2022-09-14 19:38:56 +12:00
Jake Barnby 5d6fff860e
Merge remote-tracking branch 'origin/0.16.x' into fix-datetime-attr-ui 2022-09-14 18:35:21 +12:00
Steven Nguyen 908ba51144 Rename collection to collectionId on the Console 2022-09-14 00:53:37 +00:00
Steven Nguyen 3da21ff2fc Update document model
1. Rename document.$collection to document.$collectionId
2. Add document.$databaseId
2022-09-14 00:53:37 +00:00
Christy Jacob cdb54bcc72
Merge pull request #3697 from appwrite/feat-response-filters-0.16.x
Feat response and request filters 0.16.x
2022-09-14 02:52:07 +04:00
Christy Jacob 98c8896588 feat: update get* endpoints to list* endpoints in locale API 2022-09-14 03:48:02 +05:30
Christy Jacob 626e4b1b8a feat: update getSessions to listSessions in users and accounts API 2022-09-14 03:43:04 +05:30
Christy Jacob 937674a373 feat: update getLogs to listLogs in users and account API 2022-09-14 02:35:03 +05:30
Christy Jacob 183bb2e92d feat: update getMemberships to listMemberships in Users API 2022-09-14 02:28:28 +05:30
Steven Nguyen eca5aa3c2b Fix version matching for 0.15.X request & response 2022-09-13 20:42:50 +00:00
Christy Jacob 105e5fe71c feat: rename getMemberships to listMemberships 2022-09-14 01:44:56 +05:30
Matej Bačo 20bbbfc493 Merge remote-tracking branch 'origin/0.16.x' into fix-function-scheduling 2022-09-13 20:14:42 +00:00
Christy Jacob 554be364d6
Merge pull request #3755 from appwrite/feat-audits-label-desc-decoupling
audit event decoupling
2022-09-13 22:56:02 +04:00
Christy Jacob efbe21d433 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into matej-qa-3 2022-09-13 18:21:44 +00:00
shimon 1d382cc542 small fix 2022-09-13 10:42:42 +03:00
shimon b86f7689ec Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label-desc-decoupling 2022-09-13 10:29:16 +03:00
Steven Nguyen 7f0d4e6c36 Merge branch '0.16.x' into feat-response-filters-0.16.x 2022-09-12 22:21:52 +00:00
Matej Bačo ec5a0b8cde Remove queries from listVariables; add enabled to createFunction 2022-09-12 09:02:14 +00:00
Matej Bačo a315f43039 Fix functon scheduling loop logic, and double-loop prevention 2022-09-11 12:20:26 +00:00
Eldad A. Fux 0124d2c121
Merge pull request #3800 from appwrite/update-avatars-api
feat: update default avatars color
2022-09-11 14:58:21 +03:00
Matej Bačo 8b864324de Merge remote-tracking branch 'origin/0.16.x' into fix-datetime-attr-ui 2022-09-11 07:34:44 +00:00
Christy Jacob cb50220b60 feat: rename time attribute to duration 2022-09-09 16:02:04 +04:00
Christy Jacob 98724c2acd feat: update default avatars color 2022-09-09 15:09:04 +04:00
Matej Bačo b41aaefc7e Implement 'enabled' attribute for functions 2022-09-09 08:49:18 +00:00
Matej Bačo fd6a3ed30c Fix listVariables returing all variables 2022-09-09 08:05:33 +00:00
Eldad A. Fux 0a9a84e357
Merge pull request #3793 from appwrite/fix-datetime-type
Fix $createdAt and $updatedAt so they are datetime instead of string
2022-09-09 07:21:23 +03:00
Damodar Lohani aa2a6d7f11 region in spec 2022-09-09 01:22:04 +00:00
Steven Nguyen 256f83b7ea Fix and so they are datetime instead of string 2022-09-08 22:18:36 +00:00
shimon 342c4a3253 audits.resource label update 2022-09-08 16:06:16 +03:00
shimon 5652e2d94f audits.resource label update 2022-09-08 15:16:54 +03:00
shimon 834e4e03e3 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label-desc-decoupling
 Conflicts:
	app/controllers/api/storage.php
2022-09-08 15:13:22 +03:00
Damodar Lohani ed81ff1263 regions using config instead 2022-09-08 07:19:14 +00:00
Damodar Lohani f46327d206 description 2022-09-08 06:25:54 +00:00
Damodar Lohani cf1c9452c1 region in UI 2022-09-08 06:24:58 +00:00
Damodar Lohani 8450a0c213 region in UI 2022-09-08 05:24:46 +00:00
Jake Barnby 15939bb155
Merge remote-tracking branch 'origin/0.16.x' into fix-storage-audit-resources 2022-09-08 17:24:00 +12:00
Damodar Lohani 119344031a region on endpoint 2022-09-08 05:04:16 +00:00
Eldad A. Fux 30e18d43a2
Merge pull request #3781 from appwrite/fix-async-default-value
Update createExecution param default value
2022-09-07 21:39:46 +03:00
Eldad Fux c442a5bce2 Fix linter test 2022-09-07 14:23:57 +03:00
Eldad Fux c22c28bc67 Fixed indentation 2022-09-07 14:14:53 +03:00
Eldad Fux 01fb4045bd Sync with 0.16 2022-09-07 14:11:10 +03:00
Eldad Fux 1f17fb34e4 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into fix-response-syntax 2022-09-07 14:07:40 +03:00
Eldad Fux 0895a25615 Fixed response syntax with new FW version 2022-09-07 14:02:36 +03:00
Matej Bačo e9c29a4812 Update createExecution param default value 2022-09-07 08:24:49 +00:00
Jake Barnby 9665ec09e7
Make storage audit resources consistent with other resources 2022-09-07 20:22:25 +12:00
Jake Barnby 4590c464ef
Use write const 2022-09-06 21:17:25 +12:00
Matej Bačo 39434c3fec Fix datetime attribute default 2022-09-06 09:07:39 +00:00
Jake Barnby 27af4e3b7c
Merge remote-tracking branch 'origin/0.16.x' into fix-write-permission-not-allowed
# Conflicts:
#	composer.lock
2022-09-06 12:28:57 +12:00
Bradley Schofield 8bc570b0a5 Merge branch '0.16.x' into feat-response-filters-0.16.x 2022-09-05 13:42:46 +01:00
Christy Jacob 7105e6c3e8
Merge pull request #3762 from appwrite/feat-new-profile-img-theme
Feat new profile image theme
2022-09-05 16:26:10 +04:00
Bradley Schofield 9e0e2f8e77 Add Tests
+ Added Tests
+ Remove unneeded rand variable
2022-09-05 11:21:04 +01:00
Bradley Schofield 37530d30df Remove color param and fix bug 2022-09-05 10:36:01 +01:00
Bradley Schofield ea51786192 Modify profile images to suit new theme 2022-09-05 10:24:56 +01:00
Matej Bačo c7780c5fe6 Update allowed headers with new SDK headers 2022-09-05 08:08:24 +00:00
shimon 1362902082 audit event name reformation 2022-09-05 11:00:08 +03:00
Jake Barnby e55faff0a1
Fix tests 2022-09-05 19:51:33 +12:00
Jake Barnby 5c08e066aa
Fix allowed permissions for documents/files 2022-09-05 13:41:01 +12:00
Christy Jacob ccabbc4fdf feat: update datetime descriptions 2022-09-05 01:41:26 +04:00
Christy Jacob 6df57b7975 feat: update descriptions 2022-09-05 01:33:52 +04:00
shimon eabc90ec49 decouple audits log from events 2022-09-04 17:53:37 +03:00
shimon db715f3e7d decouple audits log from events 2022-09-04 13:31:38 +03:00
shimon f63c740917 decouple audits log from events 2022-09-04 11:45:53 +03:00
shimon 2c9b749f72 account labels 2022-09-04 11:23:24 +03:00