Commit Graph

4011 Commits

Author SHA1 Message Date
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
Christy Jacob 5b7b39a300 Revert "Fix Endpoint Order" 2022-08-16 12:29:03 +05:30
fogelito f52d28e75f Auth tests 2022-08-15 22:18:37 +03:00
fogelito 9c82a842b6 tests for database + account 2022-08-15 19:08:17 +03:00
shimon 67d12d3120 some fixes 2022-08-15 15:16:32 +03:00
Jake Barnby 564f5dbf64 Find replace fix 2022-08-15 23:40:41 +12:00
Jake Barnby 77a28a2de7 Don't use ID helper with existing ID's 2022-08-15 23:24:31 +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
Christy Jacob 794f07c3b0 feat: accounts test 2022-08-15 12:13:09 +05:30
Damodar Lohani 5472898759 fix naming 2022-08-15 00:50:51 +00:00
shimon cabe989555 some fixes 2022-08-14 22:42:20 +03:00
Eldad Fux 9b897629ba Fixed code generator 2022-08-14 21:57:23 +03:00
shimon 6fd01a6721 some fixes 2022-08-14 21:39:44 +03:00
Eldad Fux fbd5835bd9 Fixed test 2022-08-14 21:33:52 +03:00
Eldad Fux 95181546b4 Adpated tests 2022-08-14 21:09:24 +03:00
Eldad Fux bd77354926 Fixed test 2022-08-14 20:22:01 +03:00
Eldad Fux be36b31c4e Added missing test for new codeGenerator 2022-08-14 19:53:55 +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
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
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