1
0
Fork 0
mirror of synced 2024-06-03 03:14:50 +12:00
Commit graph

2241 commits

Author SHA1 Message Date
Matej Baco 8513bb2dbe Merge branch 'feat-list-endpoints-queries' into feat-variables-api 2022-08-25 11:14:42 +02:00
Matej Baco fd1068a600 Merge branch 'feat-list-users-queries' into feat-list-endpoints-queries 2022-08-25 10:56:06 +02:00
Jake Barnby 7159f9c187 Merge remote-tracking branch 'origin/origin/datetime-attributes' into refactor-permissions-inc-console-fix
# 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
#	src/Appwrite/Usage/Calculators/Database.php
2022-08-25 20:53:52 +12:00
Matej Baco c6e614d896 Merge branch 'refactor-permissions-inc-console-fix' into feat-list-users-queries 2022-08-25 10:38:43 +02:00
fogelito 064d538023 Merge remote-tracking branch 'origin/origin/datetime-attributes' into origin/datetime-attributes 2022-08-25 11:14:48 +03:00
fogelito c30189f903 Vincent Changes Apply 2022-08-25 11:14:27 +03:00
Shmuel Fogel deb5164eb3
Update src/Appwrite/Utopia/Response/Model/Func.php
Co-authored-by: Vincent (Wen Yu) Ge <wenyu1999@hotmail.com>
2022-08-25 11:11:17 +03:00
Shmuel Fogel 26a2569b8e
Update src/Appwrite/Utopia/Response/Model/Func.php
Co-authored-by: Vincent (Wen Yu) Ge <wenyu1999@hotmail.com>
2022-08-25 11:11:08 +03:00
Jake Barnby 10b8b4b4f6 Format 2022-08-25 18:48:05 +12:00
Jake Barnby 292037f90b Fix datetime calculation 2022-08-25 18:47:19 +12:00
Jake Barnby ec3c2628b1 Fix datetime calculation 2022-08-25 18:45:05 +12:00
Jake Barnby 9f3dd54198 Fix merge clobber 2022-08-25 18:27:55 +12:00
Jake Barnby e7298b13b0 Merge remote-tracking branch 'origin/0.16.x' into origin/datetime-attributes
# 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/workers/builds.php
#	src/Appwrite/Stats/Usage.php
#	src/Appwrite/Usage/Calculators/Database.php
2022-08-25 18:26:30 +12:00
Jake Barnby 625608804e Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix
# 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/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/workers/builds.php
#	src/Appwrite/Stats/Usage.php
#	src/Appwrite/Usage/Calculators/Database.php
2022-08-25 18:21:15 +12:00
Matej Bačo 756d0bbd5b Linter fix 2022-08-24 18:59:34 +00:00
Steven fc38771d69 Merge branch 'refactor-permissions-inc-console-fix' into feat-list-users-queries 2022-08-24 18:52:39 +00:00
Matej Bačo b1dfd94d49 Add indexes for internal queries 2022-08-24 18:41:26 +00:00
Matej Bačo 65d09705ac Simplify class name 2022-08-24 18:25:15 +00:00
Matej Bačo 55a2e52764 Allow unindexed internal queries 2022-08-24 18:23:34 +00:00
Matej Bačo cb6a186c5d PR review changes 2022-08-24 15:07:18 +00:00
Matej Bačo b765ad603d Merge remote-tracking branch 'origin/refactor-permissions-inc-console-fix' into feat-variables-api 2022-08-24 14:12:41 +00:00
Matej Bačo 4645fcd0c8 Fix tests 2022-08-24 10:31:47 +00:00
Matej Bačo bd7395cb44 Bug fixing, upgrade tests to new syntax 2022-08-24 09:22:13 +00:00
Matej Bačo 01a57d91ad Fix listDocument queries validation 2022-08-23 16:33:08 +00:00
Matej Bačo 7fb74027d4 Upgrade listDocuments queries 2022-08-23 15:18:59 +00:00
Matej Bačo 11c8fccd88 PR review changes 2022-08-23 15:01:57 +00:00
Matej Bačo 531d57feff Upgrade listMemberships queries 2022-08-23 13:16:46 +00:00
Matej Bačo 2d82eed4be Linter fix 2022-08-23 13:10:27 +00:00
Matej Bačo e068bcdbc1 Upgrade listCollections queries 2022-08-23 12:30:28 +00:00
Matej Bačo 94acd32d69 Upgrade listDatabases queries 2022-08-23 09:40:17 +00:00
Matej Bačo 17e41eee1d Upgrade listExecutions queries 2022-08-23 09:26:34 +00:00
Matej Bačo a92f96bf80 Upgrade listDeployments queries 2022-08-23 09:12:48 +00:00
Matej Bačo 1eee0baa28 Upgrade listFunctions queries 2022-08-23 09:02:06 +00:00
Matej Bačo 6c971f6ece Upgrade listTeams queries 2022-08-23 08:56:28 +00:00
Matej Bačo d1f6cb31d6 Upgrade listFiles queries 2022-08-23 08:49:39 +00:00
Matej Bačo 6fcd3757fe Upgrade listBuckets queries 2022-08-23 08:37:55 +00:00
Matej Bačo da73dc7fcb Fix users queries allowed params 2022-08-23 08:37:31 +00:00
Jake Barnby e989735e89 Remove permissions processor 2022-08-23 13:42:25 +12:00
Steven 66ff297103 Refactor Queries Validation 2022-08-22 19:16:20 +00:00
Christy Jacob e09cb3a1cb feat: update queries constructor 2022-08-22 15:11:47 +00:00
Christy Jacob 464738274d feat: update queries constructor 2022-08-22 15:06:11 +00:00
Christy Jacob cff0fd9476 feat: update queries constructor 2022-08-22 15:04:55 +00:00
Christy Jacob 0fd55cb13c feat: update queries constructor 2022-08-22 14:44:28 +00:00
Christy Jacob 3ceff5aa71 feat: update queries constructor 2022-08-22 14:37:35 +00:00
Christy Jacob dd00c58b08 feat: remove queries 2022-08-22 14:14:40 +00:00
Christy Jacob 0304a57915 feat: remove queries 2022-08-22 14:12:52 +00:00
Christy Jacob 3fe22b7ed0 feat: update file structure 2022-08-22 14:10:10 +00:00
Christy Jacob afa71bcaf3 feat: update file structure 2022-08-22 14:09:04 +00:00
Christy Jacob 228bedd6d0 feat: update file structure 2022-08-22 14:05:49 +00:00
Christy Jacob b2b714f713 feat: update naming convention and folder structure 2022-08-22 13:48:35 +00:00
Jake Barnby eb1476b28b Apply validator updates to OpenAPI3 2022-08-22 14:27:17 +12:00
Steven 2bde7aa02b Fix databases tests 2022-08-20 00:15:18 +00:00
Steven 146cb6a0d8 Fix list user logs tests 2022-08-19 23:31:02 +00:00
Steven 3890dea35b Add additional Validators for Queries 2022-08-19 23:20:22 +00:00
Steven a5bc07c9e4 Merge branch 'feat-list-users-queries' into feat-list-user-logs-queries 2022-08-19 22:00:54 +00:00
Steven c1cdad5566 Merge branch 'refactor-permissions-inc-console-fix' into feat-list-users-queries 2022-08-19 14:50:50 +00:00
Bradley Schofield 0d81918685 Merge remote-tracking branch 'origin/refactor-permissions-inc-console-fix' into feat-variables-api 2022-08-19 11:25:39 +01:00
Christy Jacob 7673fb44e5 feat: update default values 2022-08-19 10:03:54 +00:00
Christy Jacob dbd7afeda0 feat: update default values 2022-08-19 09:58:11 +00:00
Bradley Schofield 7895ac6c40 Update Func.php 2022-08-19 10:57:59 +01:00
Christy Jacob 28d9e15980 feat: update response model 2022-08-19 09:45:36 +00:00
Christy Jacob 2a750eaa73 Merge branch 'refactor-permissions-inc-console-fix' of https://github.com/appwrite/appwrite into feat-improve-keys 2022-08-19 09:32:22 +00:00
Matej Bačo 61ab41bf86 Implement status of oauth providers, and refactor response models 2022-08-19 09:21:51 +00:00
Christy Jacob 278afd77c0 Merge branch 'origin/datetime-attributes' of https://github.com/appwrite/appwrite into feat-improve-keys 2022-08-19 09:20:08 +00:00
Jake Barnby c1c3a7c7ae Remove redundant exception 2022-08-19 20:31:19 +12:00
Jake Barnby cb6fc7f618 Merge branch 'origin/datetime-attributes' into refactor-permissions-inc-console-fix
# Conflicts:
#	.gitignore
#	app/config/collections.php
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/controllers/api/users.php
#	composer.lock
#	tests/e2e/Services/Account/AccountCustomClientTest.php
2022-08-19 16:49:34 +12:00
Jake Barnby 7019be987c Merge remote-tracking branch 'origin/0.16.x' into origin/datetime-attributes
# 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/controllers/api/account.php
#	app/controllers/api/users.php
#	app/controllers/shared/api.php
#	app/workers/deletes.php
#	composer.lock
#	docker-compose.yml
#	phpunit.xml
#	src/Appwrite/Event/Delete.php
2022-08-19 16:20:19 +12:00
Jake Barnby 66539bbe3a Review updates for role helper usage 2022-08-19 16:04:33 +12:00
Steven 27f69e3c09 Consolidate List User Logs API params
Replace limit and offset params with a single queries param since the
Queries V2 change now allows for different types of queries.
2022-08-19 00:09:34 +00:00
Steven f0d66985f7 Consolidate List Users API params
Replace search, limit, offset, cursor, cursorDirection, and orderType
params with a single queries param since the Queries V2 change now
allows for different types of queries.
2022-08-18 19:30:39 +00:00
Steven 753aebccab Create Appwrite Query Validator
The Appwrite Query Validator checks if the cursor value is a valid UID.
This is different than the cursor value in utopia-php/database because
the value in the database layer is expected to be a document.
2022-08-18 19:30:39 +00:00
Damodar Lohani fdac3bfe4a missing functions stats 2022-08-18 01:45:55 +00:00
Damodar Lohani 3e43424129 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-18 00:49:31 +00:00
fogelito c21b563614 Merge branch 'refactor-permissions-inc-console-fix' of github.com:appwrite/appwrite into datetime-jake-tz
 Conflicts:
	app/controllers/general.php
	composer.json
	composer.lock
2022-08-17 21:04:23 +03:00
fogelito 5d99f7c3a6 after branch change to datetime attributes 2022-08-17 17:09:21 +03:00
Bradley Schofield 80ff661aeb Continue working on response filters 2022-08-17 14:08:09 +01:00
Damodar Lohani c0119e6a0d fix formatting 2022-08-17 11:10:17 +00:00
Damodar Lohani 6b11fa26ce rename and remove unused param 2022-08-17 10:55:01 +00:00
Damodar Lohani a1e6f7bdf4 Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-17 09:34:40 +00:00
Bradley Schofield 407c150631 Merge branch '0.16.x' into feat-response-filters-0.16.x 2022-08-17 10:34:01 +01:00
Bradley Schofield 9f3ebe9956 Continue working on permission backporting 2022-08-17 10:33:35 +01:00
shimon 9c68cff317 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-file-cache-cleanup
 Conflicts:
	composer.json
	composer.lock
2022-08-17 11:16:09 +03:00
Damodar Lohani 80dfa85c82 Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-17 00:45:07 +00:00
Christy Jacob 11ad9c8dd9 feat: update abuse library 2022-08-16 20:47:05 +00:00
Christy Jacob 4b0c707fd3 Merge branch 'origin/datetime-attributes' of https://github.com/appwrite/appwrite into feat-ui-datetime 2022-08-16 20:37:05 +00:00
Eldad A. Fux 69a4f51d58
Merge pull request #3656 from appwrite/feat-functions-console-logs
Functions Console Logs Capture
2022-08-16 23:23:53 +03:00
Eldad A. Fux ccb8a1144c
Merge pull request #2747 from appwrite/feat-password-hash-algos
Password Hashing algos
2022-08-16 22:30:23 +03:00
Eldad A. Fux e0abc972ff
Merge pull request #3681 from appwrite/feat-missing-phone-param
Changed provider name from phone to sms and added phone param to create endpoints
2022-08-16 21:01:54 +03:00
Torsten Dittmann 32b1e0db51 fix: remove unnecessary data 2022-08-16 13:58:29 +02:00
Torsten Dittmann 381374209a fix: models 2022-08-16 13:57:13 +02:00
Matej Bačo ebb4d402b7 Linter fix 2022-08-16 11:41:49 +00:00
Matej Bačo eaf9cd59e9 Fix OpenAPI3 nested anyOf/oneOf 2022-08-16 11:40:19 +00:00
Jake Barnby 5d84d6d43f Lint 2022-08-16 20:33:06 +12:00
Jake Barnby bbf7f8d8c3 Merge remote-tracking branch 'origin/origin/datetime-attributes' into refactor-permissions-inc-console-fix
# Conflicts:
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	src/Appwrite/Extend/Exception.php
2022-08-16 20:30:00 +12:00
Jake Barnby 39231f8cf9 Lint 2022-08-16 19:26:40 +12:00
Jake Barnby fb34ecfa7d Merge remote-tracking branch 'origin/0.16.x' into datetime-attributes-merge
# Conflicts:
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/functions.php
#	app/controllers/api/projects.php
#	app/controllers/api/storage.php
#	app/controllers/api/teams.php
#	app/controllers/api/users.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
2022-08-16 19:20:26 +12:00
Jake Barnby f672269a8c Handle aggregates per resource type at the controller level 2022-08-16 17:54:44 +12:00
Damodar Lohani 94d9bb8a18 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-functions-console-logs 2022-08-16 04:42:03 +00:00
fogelito f52d28e75f Auth tests 2022-08-15 22:18:37 +03:00
Bradley Schofield e1cc6bc624 Start work on response filters for 0.16 2022-08-15 16:09:09 +01:00
Jake Barnby b53f185ec6 Remove permissions processor 2022-08-16 00:56:19 +12:00
shimon 0dc485d8d7 some fixes 2022-08-15 12:05:41 +03:00
Jake Barnby 33970276b2 Self review 2022-08-15 19:20:10 +12:00
Eldad Fux 6f74c565e8 Fixed docblock 2022-08-15 09:55:37 +03:00
Jake Barnby 86f209800a Merge remote-tracking branch 'origin/origin/datetime-attributes' into refactor-permissions-inc-queries-update-datetime-fixes
# Conflicts:
#	composer.json
#	composer.lock
#	src/Appwrite/Utopia/Response/Model/AttributeDatetime.php
2022-08-15 16:43:47 +12:00
Jake Barnby 7c34387d22 Update specs + console SDK 2022-08-15 16:39:30 +12:00
Steven 6b618a5824 Merge branch 'origin/datetime-attributes' into feat-datetime-attributes-with-database-query-update 2022-08-15 01:45:56 +00:00
Damodar Lohani 6824d23dfe fix collections create metrics table name 2022-08-15 01:10:57 +00:00
Jake Barnby cb4a256d5f Merge remote-tracking branch 'origin/feat-ui-datetime' into refactor-permissions-inc-queries-update-datetime-fixes
# 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.lock
#	public/dist/scripts/app-all.js
#	public/dist/scripts/app-dep.js
#	public/dist/scripts/app.js
#	public/dist/styles/default-ltr.css
#	public/dist/styles/default-rtl.css
#	public/scripts/dependencies/appwrite.js
2022-08-15 12:05:52 +12:00
Eldad Fux f88a64df1c Fix for linter 2022-08-14 22:01:58 +03:00
Eldad Fux 9b897629ba Fixed code generator 2022-08-14 21:57:23 +03:00
Eldad Fux 22c38a484f Merge branch 'feat-password-hash-algos' of https://github.com/appwrite/appwrite into feat-missing-phone-param 2022-08-14 19:43:53 +03:00
Eldad Fux 98fc8669e1 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-password-hash-algos 2022-08-14 19:23:30 +03:00
shimon ab27e0a74d some fixes 2022-08-14 18:01:34 +03:00
Eldad Fux 53b60c9244 Fix for linter 2022-08-14 17:22:51 +03:00
Jake Barnby 613a0f8006 ID and test fixes 2022-08-15 02:22:38 +12:00
Eldad Fux b36c24c508 Decouple Auth code from SMS provider adapter 2022-08-14 17:19:58 +03:00
fogelito 74ae43b092 global const for TYPE_DATETIME_EXAMPLE change value 2022-08-14 16:56:55 +03:00
Eldad Fux 1da208ad10 Fix adapter name 2022-08-14 16:53:19 +03:00
Eldad Fux 25f176875d Changed provider name from phone to sms 2022-08-14 16:43:41 +03:00
Eldad A. Fux d641fbb635
Merge pull request #3588 from appwrite/feat-simplify-exceptions
Simplify Exception Creation
2022-08-14 15:27:52 +03:00
Jake Barnby 9c260164ef Merge remote-tracking branch 'origin/feat-datetime-attributes-with-database-query-update' into refactor-permissions-inc-queries-update-datetime-fixes
# Conflicts:
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	composer.json
#	composer.lock
2022-08-14 23:46:34 +12:00
Damodar Lohani 5120158bdb Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-14 11:39:41 +00:00
Jake Barnby 6a5de3e0b6 Merge remote-tracking branch 'origin/fix-datetime-attributes' into refactor-permissions-inc-queries-update-datetime-fixes
# Conflicts:
#	app/config/collections.php
#	app/controllers/api/databases.php
#	app/controllers/api/projects.php
#	app/controllers/api/teams.php
#	composer.json
#	composer.lock
#	tests/e2e/Services/Account/AccountBase.php
#	tests/e2e/Services/Databases/DatabasesBase.php
#	tests/e2e/Services/Functions/FunctionsCustomServerTest.php
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
#	tests/e2e/Services/Storage/StorageBase.php
#	tests/e2e/Services/Storage/StorageCustomClientTest.php
#	tests/e2e/Services/Storage/StorageCustomServerTest.php
#	tests/e2e/Services/Teams/TeamsBase.php
#	tests/e2e/Services/Webhooks/WebhooksBase.php
#	tests/e2e/Services/Webhooks/WebhooksCustomClientTest.php
#	tests/e2e/Services/Webhooks/WebhooksCustomServerTest.php
#	tests/unit/Auth/AuthTest.php
2022-08-14 23:11:05 +12:00
Jake Barnby b007acfa95 ID updates 2022-08-14 22:33:36 +12:00
fogelito 9b9f2fe428 global const for TYPE_DATETIME_EXAMPLE 2022-08-14 13:27:07 +03:00
Damodar Lohani 89b2234c17 update stdout and stderr description 2022-08-14 09:29:46 +00:00
Christy Jacob fb81627b83 feat: update exception class 2022-08-14 12:49:19 +05:30
Christy Jacob a5bc0a61ca feat: exceptions on more files 2022-08-14 12:26:12 +05:30
Steven 610ec1a6a4 Update database query syntax 2022-08-14 05:44:55 +00:00
Christy Jacob c2f7cd6d19 feat: remove logger as an entity 2022-08-14 11:06:04 +05:30
Christy Jacob c6f0b14e92 feat: address issues on init.php 2022-08-14 11:05:25 +05:30
Jake Barnby a8698b6065 Lint 2022-08-14 17:24:50 +12:00
Jake Barnby fe5d3a1892 Use permission helpers 2022-08-14 17:21:11 +12:00
Bradley Schofield 237f5264d9 Fix vars exception, change cachedoc usage, 2022-08-13 20:18:48 +01:00
shimon 02f57cd69d Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-file-cache-cleanup
 Conflicts:
	composer.lock
2022-08-13 18:45:29 +03:00
Jake Barnby 70758927cd Test fixes 2022-08-14 02:55:15 +12:00
Christy Jacob 8b23dcd69e fix: update constructor, remove account entity, add missing ID error 2022-08-13 20:14:04 +05:30
Jake Barnby ed712fb196 Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix
# Conflicts:
#	app/controllers/general.php
#	composer.lock
2022-08-14 02:31:06 +12:00
Jake Barnby bdc8202422 Bad request for create permission on document/file 2022-08-14 02:24:28 +12:00
Jake Barnby 68cc919aaa Test fixes 2022-08-14 02:10:28 +12:00
Eldad A. Fux 5b4a3805bf
Merge pull request #3522 from wess/feat-etsy-auth
Adds Etsy to OAuth providers
2022-08-13 13:05:43 +03:00
Eldad A. Fux ba239de8be
Merge branch '0.16.x' into fix-unit-tests 2022-08-13 12:28:33 +03:00
shimon e8a2e30bb5 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-file-cache-cleanup 2022-08-13 10:35:54 +03:00
Jake Barnby 737ebe408c Don't add create permission to documents/files if missing 2022-08-13 18:34:04 +12:00
Eldad Fux 3c7a7f0fa4 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into origin/datetime-attributes 2022-08-13 06:21:50 +03:00
Steven 1abe9d4c01 Merge branch '0.16.x' into fix-datetime-attributes 2022-08-12 22:54:33 +00:00
Christy Jacob 9693c6e941 Merge branch 'master' of github.com:appwrite/appwrite into 0.16.x 2022-08-12 21:44:36 +05:30
Bradley Schofield 160433ec9c
Update src/Appwrite/Utopia/Response/Model/AlgoArgon2.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2022-08-12 16:55:47 +01:00
Bradley Schofield 693e18e5d9
Update src/Appwrite/Utopia/Response/Model/AlgoArgon2.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2022-08-12 16:55:33 +01:00
Bradley Schofield b8d07cf43f
Update src/Appwrite/Utopia/Response/Model/AlgoArgon2.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2022-08-12 16:54:31 +01:00
Bradley Schofield cb87c248d5 Rebuild Specs, SDKs and start working on subqueries 2022-08-12 16:51:24 +01:00
Jake Barnby 09b001e891 PR fixes 2022-08-13 02:41:57 +12:00
Jake Barnby d2b9102f84 Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix
# Conflicts:
#	tests/e2e/Services/Databases/DatabasesBase.php
#	tests/e2e/Services/Databases/DatabasesCustomServerTest.php
2022-08-13 00:54:27 +12:00
Bradley Schofield 8a2f8ed6ee Merge branch '0.16.x' into feat-variables-api 2022-08-12 13:35:01 +01:00
Bradley Schofield 47129afcfa Remove constants from response models 2022-08-12 03:00:29 +01:00
Damodar Lohani 1753dbe8b0 fix formatting 2022-08-11 06:18:37 +00:00
Damodar Lohani b5f5aff626 fix response and project usage issues 2022-08-11 06:05:38 +00:00
Damodar Lohani 63371ce76e functions usage stats using route labels 2022-08-11 05:25:39 +00:00
Damodar Lohani 651dc651f5 update usage response model for storage 2022-08-11 02:18:34 +00:00
Damodar Lohani cb369dd326 update account routes usage labels 2022-08-10 08:45:10 +00:00
Damodar Lohani 91f1e89201 update type 2022-08-10 07:59:16 +00:00
Damodar Lohani 5424b85685 update execution response model 2022-08-10 07:20:16 +00:00
Damodar Lohani 8aa7486e71 database usage stats working via labels 2022-08-10 02:33:46 +00:00
Damodar Lohani b96904ec75 renaming usage stats on influx to contain scope placeholder 2022-08-10 01:46:36 +00:00
Christy Jacob 0b813ed159
Merge pull request #3649 from appwrite/fix-deployment-example
Deployment object model example updated
2022-08-10 02:01:59 +05:30
Wess Cope c6fc2a98ae
Update src/Appwrite/Auth/OAuth2/Etsy.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-09 10:14:40 -04:00
Wess Cope a079284729
Update src/Appwrite/Auth/OAuth2/Etsy.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-09 10:14:30 -04:00
Wess Cope f0d4f43dba
Update src/Appwrite/Auth/OAuth2/Etsy.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-09 10:14:19 -04:00
Torsten Dittmann 5db5f7217f Merge branch 'origin/datetime-attributes' of https://github.com/appwrite/appwrite into feat-ui-datetime 2022-08-09 14:49:08 +02:00
Bradley Schofield 6882ffaa00 Merge branch '0.16.x' into feat-variables-api 2022-08-09 13:37:24 +01:00
Wess Cope fe2fe1e08a
Update src/Appwrite/Auth/OAuth2/Etsy.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-09 08:15:46 -04:00
Wess Cope 97117f2fde
Update src/Appwrite/Auth/OAuth2/Etsy.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-09 08:15:38 -04:00
Wess Cope 27e54fae4c
Update src/Appwrite/Auth/OAuth2/Etsy.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-09 08:15:28 -04:00
Wess Cope f1887449ab
Update src/Appwrite/Auth/OAuth2/Etsy.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-09 08:15:19 -04:00
Bradley Schofield bf3c15708d Update Variable Attribute Desc 2022-08-09 13:13:46 +01:00
shimon 092e682591 Merge branch 'master' of github.com:appwrite/appwrite into feat-file-cache-cleanup
 Conflicts:
	app/controllers/shared/api.php
2022-08-09 15:02:29 +03:00
Bradley Schofield af0c111d2e Rollback Func Correctly 2022-08-09 13:00:16 +01:00
Bradley Schofield fb091f1b48 Revert "Rollback Func.php"
This reverts commit fe88ea4f9a.
2022-08-09 12:59:35 +01:00
Bradley Schofield fe88ea4f9a Rollback Func.php 2022-08-09 12:58:59 +01:00
fogelito 01106d801a Merge branch 'origin/datetime-attributes' of github.com:appwrite/appwrite into origin/datetime-api
 Conflicts:
	composer.lock
	src/Appwrite/Stats/Usage.php
2022-08-09 14:44:11 +03:00
fogelito 82a240998b Merge branch '0.16.x' of github.com:appwrite/appwrite into origin/datetime-attributes
 Conflicts:
	composer.lock
	src/Appwrite/Stats/Usage.php
2022-08-09 14:20:26 +03:00
Torsten Dittmann 08ba652464 fix: tests 2022-08-09 12:45:15 +02:00
Damodar Lohani 59477a9fa9 functions stats 2022-08-09 08:19:45 +00:00
Damodar Lohani b50863ff9f update aggregator 2022-08-09 07:12:04 +00:00
Jake Barnby 1ddd34059b Append type to open bracket to ensure permissions containing a permission type name are not removed 2022-08-09 13:23:03 +12:00
Damodar Lohani 7affd0579e usage refactor setups 2022-08-09 01:22:18 +00:00
Christy Jacob 82e39ccf52 feat: review comments 2022-08-09 01:12:13 +05:30
Bishwajeet Parhi 4ac204d230
Merge branch 'appwrite:master' into feat-disqus-Oauth-provider 2022-08-08 21:21:47 +05:30
Wen Yu Ge 75595dd07f Deployment payload example updated 2022-08-08 10:45:45 -04:00
Bradley Schofield 43660d9c8f Merge branch 'master' into feat-simplify-exceptions 2022-08-08 15:03:01 +01:00
Bishwajeet Parhi f4c5b4c11d lints fixed 2022-08-08 12:44:11 +00:00
Jake Barnby 4b78169152 Fix setting default permissions 2022-08-08 22:59:16 +12:00
Torsten Dittmann 641740db77 fix: response model with nullable defaults 2022-08-08 12:35:28 +02:00
Jake Barnby 686c42ae07 Add permission allowed for user type check function 2022-08-08 22:26:07 +12:00
Jake Barnby ac11617655 Handle null permissions when processing aggregates 2022-08-08 22:19:47 +12:00
Damodar Lohani 84a9dcf6cb formatting 2022-08-08 06:59:52 +00:00
Damodar Lohani 01823d18c6 Merge branch 'feat-usage-updates' of https://github.com/appwrite/appwrite into feat-refactor-usage-stats 2022-08-08 02:20:58 +00:00
Damodar Lohani 98330cdfa1 fixes 2022-08-08 02:20:54 +00:00
Damodar Lohani 1b1ba985a9 Merge branch 'master' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-08 02:18:49 +00:00
Damodar Lohani 178414cef4 Merge branch 'feat-usage-updates' of https://github.com/appwrite/appwrite into feat-refactor-usage-stats 2022-08-08 01:59:37 +00:00
Damodar Lohani 6ea4098679 new metrics aggregation 2022-08-08 01:33:34 +00:00
shimon f4c1a5ea35 response::send 2022-08-07 14:01:00 +03:00
Eldad A. Fux e93c3483c8
Merge pull request #3640 from appwrite/fix-deployment-object
Add possible status codes to deployment object.
2022-08-06 07:20:55 +03:00
Bishwajeet Parhi 6c653d8f2a remove whitespace 2022-08-05 16:21:47 +00:00
Bishwajeet Parhi 999962d161 add comments denoting return type and parameters if any 2022-08-05 16:09:38 +00:00
Bishwajeet Parhi 9cd10686bb
Update src/Appwrite/Auth/OAuth2/Disqus.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-05 21:25:41 +05:30
Bishwajeet Parhi 6fdf578919
Update src/Appwrite/Auth/OAuth2/Disqus.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-05 21:25:34 +05:30
Bishwajeet Parhi dab0a8ec27
Update src/Appwrite/Auth/OAuth2/Disqus.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-05 21:25:21 +05:30
Bishwajeet Parhi 3f15035c1a
Merge branch 'appwrite:master' into feat-disqus-Oauth-provider 2022-08-05 21:24:19 +05:30
Matej Bačo 6c21723ecb
Merge branch 'appwrite:master' into shiftra 2022-08-05 13:32:06 +02:00
Christy Jacob c96f1e76e2 feat: add new attributes for API Keys 2022-08-05 15:50:48 +05:30
Christy Jacob 78d02f50af
Merge pull request #3180 from Aragur/feat-XXX-authentik-oauth
feat: Add authentik as a OAuth provider
2022-08-05 13:06:05 +05:30
Jake Barnby 08609af053 Add permissions process function to add default 2022-08-05 17:24:11 +12:00
Jake Barnby 62b1eba836 Replace write refs 2022-08-05 17:23:18 +12:00
Vincent (Wen Yu) Ge c6223fd6b0 add possible status codes 2022-08-04 17:51:57 +00:00
Damodar Lohani 34794d2554 Merge branch 'master' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-04 06:03:39 +00:00
Damodar Lohani a0e056abc1 fix indentation 2022-08-04 06:03:04 +00:00
Bradley Schofield f62ad19ecd Fix old function tests 2022-08-03 13:32:50 +00:00
Jake Barnby 7b9fb32fae Update role references 2022-08-03 21:52:34 +12:00
Jake Barnby 1ab86c9331 Role reference updates 2022-08-03 16:17:49 +12:00
Jake Barnby ce38e74ba2 Update remaining services to new permissions 2022-08-02 21:21:53 +12:00
Jake Barnby 4520114780 Refactor storage to use new permissions 2022-08-02 21:19:15 +12:00
Jake Barnby 9a182d615a Refactor databases to use new permissions 2022-08-02 21:18:49 +12:00
Torsten Dittmann bf9533007b tests: fix unit tests 2022-08-01 12:22:04 +02:00
Matej Bačo 8c825d477f Merge commit '8d99860c55cff4ab1291a51ee5b6c7900641e1eb' into shiftra 2022-08-01 04:37:30 +00:00
shimon 45ad0f6bdf Reference comments 2022-07-30 22:10:30 +03:00
shimon 5511a93e9c Expires header returned to the endpoints 2022-07-28 18:24:18 +03:00
Torsten Dittmann a4588cc848 Merge branch 'master' of https://github.com/appwrite/appwrite into origin/datetime-api 2022-07-28 14:49:28 +02:00
Torsten Dittmann e3fee55e3d Merge branch 'origin/datetime-api' of https://github.com/appwrite/appwrite into origin/datetime-api 2022-07-28 14:45:15 +02:00
Torsten Dittmann 7b95c46cf5 Merge branch 'master' of https://github.com/appwrite/appwrite into origin/datetime-api 2022-07-28 14:40:45 +02:00
Torsten Dittmann bd550f8a1e feat: ui for datetime attribute 2022-07-28 14:38:54 +02:00
fogelito fcc4ed396a Change $conditions to TYPE_DATETIME 2022-07-28 15:03:14 +03:00
fogelito ba40ac4e90 Change models Class name 2022-07-28 13:26:22 +03:00
Bradley Schofield e3a3ca4c0d Translate more errors
+ Fixed an issue where some errors that should use 401 uses 400 error codes

+ Updated error messages and tests for multiple exceptions
2022-07-27 14:47:35 +01:00
Bradley Schofield 3c808ca895 Fix problem with Exception class 2022-07-26 15:56:59 +01:00
Bradley Schofield 96c6c0ff00 Migrate all exceptions to new signature 2022-07-26 15:24:32 +01:00
shimon d09bf306ce response changes 2022-07-26 15:50:33 +03:00
Torsten Dittmann 0bf39bd152
Merge pull request #3603 from appwrite/0.15.x
master <- 0.15.x
2022-07-26 11:22:23 +02:00
Bradley Schofield 4da9273b28 Move default message and code handling into exception 2022-07-25 23:54:08 +01:00
Matej Bačo 4bc645074a Fix linter 2022-07-25 12:43:17 +00:00
Matej Bačo ef3496d55b Bug fixing afte merge 2022-07-25 12:37:29 +00:00
Matej Bačo dbccf39a9f Merge branch 'master' into feat-password-hash-algos 2022-07-25 12:37:07 +00:00
Torsten Dittmann d96ce25b1c Merge branch '0.15.x' of https://github.com/appwrite/appwrite into feat-prepare-0-15-3 2022-07-25 12:27:10 +02:00
Torsten Dittmann 0df77a5a65 Merge branch '0.15.x' of https://github.com/appwrite/appwrite 2022-07-25 12:23:43 +02:00
Torsten Dittmann 5b73561aba sync: with master 2022-07-25 12:17:08 +02:00
fogelito b58c04c28b Add attribute datetime 2022-07-25 11:53:41 +03:00
shimon 16ed2c1572 tidy up 2022-07-24 18:22:31 +03:00
shimon f214ead6f6 tidy up 2022-07-24 12:49:51 +03:00
shimon 64050337cf tidy up 2022-07-24 10:05:24 +03:00