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

2414 commits

Author SHA1 Message Date
Jake Barnby 813e9135c6 Review fixes 2022-08-15 22:11:17 +12:00
shimon 0dc485d8d7 some fixes 2022-08-15 12:05:41 +03:00
Eldad A. Fux 72e524963c
Update app/controllers/api/account.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-15 11:30:58 +03:00
Christy Jacob 7723c633a0 feat: fix tests 2022-08-15 13:24:54 +05:30
Jake Barnby 33970276b2 Self review 2022-08-15 19:20:10 +12:00
Christy Jacob 509f9083c9 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-reorder-endpoints-2 2022-08-15 12:43:24 +05:30
Jake Barnby 66f518b531 Fix team membership delete 2022-08-15 18:04:00 +12:00
shimon 5e476a2e5a some fixes 2022-08-15 07:29:44 +03: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
shimon c0d8337417 some fixes 2022-08-14 23:45:05 +03:00
shimon 104e6564f7 some fixes 2022-08-14 23:06:21 +03:00
shimon cabe989555 some fixes 2022-08-14 22:42:20 +03:00
shimon 1109004727 some fixes 2022-08-14 22:27:43 +03:00
Eldad Fux 95181546b4 Adpated tests 2022-08-14 21:09:24 +03:00
shimon 857803e362 some fixes 2022-08-14 21:02:38 +03:00
Eldad Fux 98e2564330 Merge branch 'feat-password-hash-algos' of https://github.com/appwrite/appwrite into feat-missing-phone-param 2022-08-14 20:22:52 +03:00
Eldad Fux bd77354926 Fixed test 2022-08-14 20:22:01 +03:00
Eldad A. Fux 340cfb0104
Update app/controllers/api/users.php 2022-08-14 20:01:32 +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 7d83f9d644 Removed import path 2022-08-14 19:29:07 +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
Eldad Fux 2ed9199bf1 Added the ability to create a user with a phone number 2022-08-14 18:10:12 +03:00
shimon ab27e0a74d some fixes 2022-08-14 18:01:34 +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
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
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
Christy Jacob 26634cdf0b feat: linter fix 2022-08-14 15:52:19 +05:30
Christy Jacob bb4693ddfc feat: update email session endpoint 2022-08-14 15:41:21 +05:30
Damodar Lohani d9745b3477 fix execution list UI 2022-08-14 09:23:41 +00:00
Christy Jacob 979768fc9f Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-reorder-endpoints-2 2022-08-14 14:42:14 +05:30
Christy Jacob 70d2ebf55b feat: tests 2022-08-14 14:25:59 +05:30
Damodar Lohani 3ce8565513 hide execution stdout and stderr on client side response 2022-08-14 08:54:11 +00:00
Damodar Lohani 734454ee85 hiding stdout and stderr on client execution response 2022-08-14 08:44:17 +00:00
Christy Jacob ebb9af1eb2 feat: re-order functions endpoint 2022-08-14 13:56:11 +05:30
Christy Jacob 8e24dbe22f feat: update exception class 2022-08-14 13:35:11 +05:30
Christy Jacob cfab9221f2 feat: exceptions on more files 2022-08-14 12:32:41 +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
Jake Barnby a8698b6065 Lint 2022-08-14 17:24:50 +12:00
Jake Barnby b2e659bd3f Review fixes 2022-08-14 17:21:33 +12:00
Jake Barnby fe5d3a1892 Use permission helpers 2022-08-14 17:21:11 +12:00
Christy Jacob 5296e61d35 feat: address issues on accounts controller 2022-08-13 20:45:19 +05:30
shimon 630954c94e some fixes 2022-08-13 17:55:27 +03: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
shimon 51e3fc8cab some fixes 2022-08-13 12:59:34 +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
shimon 48b2fb0b36 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label 2022-08-13 10:34:25 +03:00
shimon cc9dad6bb8 Tidy up 2022-08-13 10:34:03 +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 83c1129ed5 Add TODO Warning 2022-08-12 17:01:25 +01:00
Bradley Schofield 930120fc4d
Update app/controllers/api/users.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2022-08-12 16:55:58 +01:00
Jake Barnby 8d4191b1a0 Lint 2022-08-13 02:46:50 +12:00
Jake Barnby 09b001e891 PR fixes 2022-08-13 02:41:57 +12:00
Bradley Schofield d86e4ac0b6 Run Linter 2022-08-12 15:15:58 +01:00
Bradley Schofield d9104ceced Update capitalisation on some names 2022-08-12 15:15:36 +01:00
Bradley Schofield 7af92b3b30 Fix Endpoint Order 2022-08-12 15:10:41 +01:00
shimon 1af95fcdaa Tidy up 2022-08-12 16:21:32 +03: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
Jake Barnby c104860448 Use roles validator for function execution 2022-08-13 00:23:58 +12:00
shimon 90cfac9b52 replace request param extractions 2022-08-12 14:01:12 +03:00
Jake Barnby 1d7c25b561 Single role per permissions entry 2022-08-12 22:36:59 +12:00
shimon b5f977e46d adding user to audits labels 2022-08-11 16:19:05 +03:00
Eldad A. Fux f4bbcc9fa3
Merge pull request #3619 from appwrite/fix-phone-search
Fix: User Search attribute (phone)
2022-08-11 14:20:44 +03:00
shimon 5a15d29a22 sync with 0.16.x 2022-08-10 12:22:55 +03:00
shimon d31c23d25a Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label
 Conflicts:
	app/controllers/api/databases.php
2022-08-10 12:18:05 +03:00
Damodar Lohani 391d1127ca update container to accept new response format 2022-08-10 07:19:07 +00:00
shimon d2519c9a5b addressing comments 2022-08-09 17:38:54 +03: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
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
fogelito db5d737235 Merge branch '0.16.x' of github.com:appwrite/appwrite into origin/datetime-api
 Conflicts:
	tests/e2e/Services/Databases/DatabasesBase.php
2022-08-09 14:37:21 +03:00
Christy Jacob 6a6c7d4b90
Merge pull request #3547 from appwrite/fix-update-status-codes
Use 202 when resources are created asyncronously
2022-08-09 14:42:40 +05:30
Jake Barnby 3611f9df94 Parameter order fix 2022-08-09 18:58:08 +12:00
Jake Barnby 216486a4c6 Fix DB tests 2022-08-09 18:03:41 +12:00
Jake Barnby fb0168ea50 Fix erroneous whitespace 2022-08-09 14:48:39 +12:00
shimon 6e0b7cc650 leftovers 2022-08-08 18:44:11 +03:00
shimon 2d7a2bb57f leftovers 2022-08-08 18:23:45 +03:00
shimon 62ef532801 leftovers 2022-08-08 17:32:54 +03:00
Bradley Schofield 43660d9c8f Merge branch 'master' into feat-simplify-exceptions 2022-08-08 15:03:01 +01:00
shimon 89f164bdd7 resource namespace 2022-08-08 15:19:41 +03:00
Jake Barnby 69a79f660f Storage permission check fixes 2022-08-08 22:58:36 +12:00
Jake Barnby 20f621d05c Databases permission check fixes 2022-08-08 22:58:28 +12:00
shimon a6a9ad8cc0 databases controller 2022-08-08 11:14:27 +03:00
shimon e9ef94e8af account controller 2022-08-07 18:49:30 +03:00
shimon c8196c41d4 api::payload 2022-08-07 18:09:37 +03:00
shimon ec39ff267c api::parseLabel 2022-08-07 17:30:47 +03:00
shimon f4c1a5ea35 response::send 2022-08-07 14:01:00 +03:00
Jake Barnby 5e4a422495 Use helpers to process permissions 2022-08-05 18:01:25 +12:00
Jake Barnby e8af744c97 More write ref updates 2022-08-05 18:00:56 +12:00
Jake Barnby bed6eb70af Replace write refs 2022-08-05 17:23:32 +12:00
Jake Barnby 62b1eba836 Replace write refs 2022-08-05 17:23:18 +12:00