Commit Graph

5239 Commits

Author SHA1 Message Date
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
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 e75dace600 fix storage usage test to match response 2022-08-14 11:19:24 +00:00
Damodar Lohani cf86481d31 fix test to use updated response model 2022-08-14 11:16:54 +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
Steven 610ec1a6a4 Update database query syntax 2022-08-14 05:44:55 +00:00
Jake Barnby fe5d3a1892 Use permission helpers 2022-08-14 17:21:11 +12:00
Jake Barnby 2ca2f4e135 Update audits 2022-08-14 03:17:18 +12:00
Jake Barnby 70758927cd Test fixes 2022-08-14 02:55:15 +12:00
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 68cc919aaa Test fixes 2022-08-14 02:10:28 +12:00
Eldad A. Fux a91584853c Merge pull request #3558 from appwrite/fix-teams-roles-no-owner
Fix teams roles no owner
2022-08-13 12:37:11 +03:00
Eldad A. Fux ba239de8be Merge branch '0.16.x' into fix-unit-tests 2022-08-13 12:28:33 +03:00
Damodar Lohani 74a159ab99 fix key 2022-08-13 03:44:57 +00: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
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
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 5c6cb2a422 Test fixes 2022-08-13 00:49:57 +12:00
Jake Barnby c104860448 Use roles validator for function execution 2022-08-13 00:23:58 +12:00
Jake Barnby 1d7c25b561 Single role per permissions entry 2022-08-12 22:36:59 +12:00
Damodar Lohani b5f5aff626 fix response and project usage issues 2022-08-11 06:05:38 +00:00
Damodar Lohani 73f675aebe Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-11 01:15:29 +00:00
Bradley Schofield c566f1e7c9 Fix Tests 2: Electric Boogaloo 2022-08-10 10:32:48 +01: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
Jake Barnby 25e893f712 Revert sdk-generator to master 2022-08-10 18:02:23 +12:00
Bradley Schofield 42e0895dad Fix Tests 2022-08-09 16:29:24 +01:00
Bradley Schofield 6882ffaa00 Merge branch '0.16.x' into feat-variables-api 2022-08-09 13:37:24 +01: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
Jake Barnby a61fd030ff Fix storage tests 2022-08-09 19:11:30 +12:00
Damodar Lohani cf369a9f12 rename test 2022-08-09 07:04:59 +00:00
Jake Barnby 3611f9df94 Parameter order fix 2022-08-09 18:58:08 +12:00
Damodar Lohani bce998cb53 update imports and fix database usage 2022-08-09 06:28:38 +00:00
Jake Barnby 216486a4c6 Fix DB tests 2022-08-09 18:03:41 +12:00
Jake Barnby fa61dada55 Fix erroneous whitespace 2022-08-09 14:48:56 +12:00
Jake Barnby cb7bafbdc0 Storage test fixes 2022-08-08 23:00:15 +12:00
Jake Barnby 8317b167ce Databases test fixes 2022-08-08 23:00:03 +12:00
Damodar Lohani ff794dc215 commenting out functions stat test as it seems to be inconsistent 2022-08-08 02:20:18 +00:00
Jake Barnby e8af744c97 More write ref updates 2022-08-05 18:00:56 +12:00
Jake Barnby 62b1eba836 Replace write refs 2022-08-05 17:23:18 +12: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
Jake Barnby d9f0ece812 Remove new properties from DB level 2022-08-04 12:08:16 +12:00
Bradley Schofield 2650706be1 Run Linter 2022-08-03 13:35:11 +00:00
Bradley Schofield f62ad19ecd Fix old function tests 2022-08-03 13:32:50 +00:00
Jake Barnby 1f0b55bfed Update execute permission refs 2022-08-03 22:11:39 +12:00
Jake Barnby 7b9fb32fae Update role references 2022-08-03 21:52:34 +12:00