1
0
Fork 0
mirror of synced 2024-07-05 14:40:42 +12:00
Commit graph

3171 commits

Author SHA1 Message Date
Steven Nguyen fed197a313
Merge branch '1.4.x' into chore-sync-1.4.x-into-main 2024-02-29 21:53:39 +00:00
Bradley Schofield 8fd610fdf6 Merge branch '1.5.x' into feat-fix-1.5.x-migrations 2024-02-27 13:19:41 +00:00
Bradley Schofield 4050e93b1d Run Linter 2024-02-27 13:19:35 +00:00
Jake Barnby 2a85c7cd96
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing 2024-02-27 21:56:05 +13:00
Khushboo Verma 260928942b Update tests 2024-02-26 17:58:57 +05:30
Christy Jacob 03d6eb7401
Merge pull request #7669 from appwrite/main
Sync main
2024-02-26 17:39:33 +05:30
Bradley Schofield f4b8ae8b88 Change factors code and update Response model tests 2024-02-26 11:50:25 +00:00
Jake Barnby 518a9fef73
Fix tests 2024-02-27 00:44:46 +13:00
Jake Barnby 7945f1398f
Fix tests 2024-02-27 00:27:35 +13:00
Jake Barnby 1867dce002
Merge remote-tracking branch 'origin/fix-rescheduling' into feat-remove-status-param 2024-02-26 23:38:09 +13:00
Jake Barnby 564c1df701
Fix rescheduling with existing schedule 2024-02-26 23:37:12 +13:00
Jake Barnby 44ec1502f0
Merge remote-tracking branch 'origin/main' into 1.5.x 2024-02-26 18:35:25 +13:00
Jake Barnby d7a16ae7b0
Merge branch '1.5.x' into fix-password-validation 2024-02-26 17:52:41 +13:00
Jake Barnby a4ff6e4eba
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing
# Conflicts:
#	tests/e2e/Services/Account/AccountCustomClientTest.php
2024-02-26 15:50:48 +13:00
Matej Bačo 6da4a82825 Fix tests 2024-02-25 18:42:24 +01:00
Matej Bačo 5327c02870 Improve tests 2024-02-25 18:42:24 +01:00
loks0n 4ba92e2591 Revert "feat: custom eventually assertion"
This reverts commit b3fc8eb510.
2024-02-25 16:43:58 +00:00
loks0n c4657eadaf fix: phone verification flaky test 2024-02-25 16:41:37 +00:00
loks0n b3fc8eb510 feat: custom eventually assertion 2024-02-25 16:37:31 +00:00
Utkarsh Ahuja faeb9aa8d4 tests: internal id in query select 2024-02-25 14:22:12 +00:00
Jake Barnby 675dec48b3
Fix tests 2024-02-26 01:05:14 +13:00
Jake Barnby 2ccfd89681
Fix count tests 2024-02-26 00:14:27 +13:00
Jake Barnby 7027c3296a
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing 2024-02-25 23:31:04 +13:00
Matej Bačo a08d5a5ef6 Fix tests 2024-02-25 10:25:51 +00:00
Matej Bačo cb7da26d53 Fix empty pass with personal data check 2024-02-25 09:19:30 +00:00
fogelito 03ce64d41a Merge branch '1.5.x' of github.com:appwrite/appwrite into twoWayKey-2
 Conflicts:
	composer.lock
2024-02-25 11:01:08 +02:00
Christy Jacob 7ae09ba795
Revert "Revert "usage/usage-dump queue health endpoints"" 2024-02-25 13:42:28 +05:30
Jake Barnby d1f797ff23
Fix test 2024-02-25 19:24:06 +13:00
Jake Barnby 4190a09333
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing 2024-02-25 03:00:47 +13:00
Jake Barnby c948d3a485
Debug dump errors 2024-02-24 15:04:40 +13:00
Jake Barnby bae1ba714c
Enum format fixes 2024-02-24 14:16:05 +13:00
Jake Barnby 0a37a0dd20
Merge pull request #7645 from appwrite/feat-dev-apns
Allow setting APNS to sandbox mode
2024-02-24 14:07:20 +13:00
Jake Barnby 0ccdce8feb
Add test 2024-02-24 13:46:45 +13:00
Jake Barnby 4ce6eabf40
Merge pull request #7638 from appwrite/fix-update-topics-permissions
Fix update topics permissions
2024-02-24 13:35:23 +13:00
Jake Barnby 7ab80b9288
Fix account method 2024-02-24 02:00:31 +13:00
Jake Barnby 957f08a3ef
Fix max int test 2024-02-24 01:55:00 +13:00
Jake Barnby 40b0b637cf
Remove opcache test 2024-02-24 01:06:53 +13:00
Jake Barnby d311f88307
Add test 2024-02-24 00:01:46 +13:00
loks0n 046c11ceb2 chore: revert X-Forwarded-For 2024-02-22 15:37:51 +00:00
loks0n c225d4977b fix: general 2024-02-22 13:40:41 +00:00
Luke B. Silver f285173f4e
Merge branch '1.5.x' into feat-ssr-dx 2024-02-22 13:22:41 +00:00
Christy Jacob a8098831a3
Revert "usage/usage-dump queue health endpoints" 2024-02-22 12:21:48 +05:30
Christy Jacob 3f5e40ad46
Merge pull request #7591 from appwrite/feat-storage-health-check
Add storage health check
2024-02-22 12:16:10 +05:30
Jake Barnby a877850707
Fix GraphQL tests 2024-02-22 02:26:17 +13:00
Jake Barnby 623c82c727
Merge remote-tracking branch 'origin/1.4.x' into 1.5.x
# Conflicts:
#	app/config/specs/open-api3-1.4.x-client.json
#	app/config/specs/open-api3-1.4.x-console.json
#	app/config/specs/open-api3-1.4.x-server.json
#	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-1.4.x-client.json
#	app/config/specs/swagger2-1.4.x-console.json
#	app/config/specs/swagger2-1.4.x-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	composer.json
#	composer.lock
#	src/Appwrite/Auth/Validator/Phone.php
2024-02-22 01:32:26 +13:00
Jake Barnby 942847cf3a
Merge remote-tracking branch 'origin/main' into 1.5.x
# Conflicts:
#	app/config/collections.php
#	app/config/errors.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/account.php
#	app/controllers/api/teams.php
#	app/controllers/api/users.php
#	app/controllers/shared/api.php
#	app/init.php
#	app/worker.php
#	composer.json
#	composer.lock
#	docker-compose.yml
#	src/Appwrite/Extend/Exception.php
#	src/Appwrite/Platform/Services/Tasks.php
#	src/Appwrite/Platform/Tasks/Maintenance.php
#	src/Appwrite/Platform/Workers/Certificates.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Platform/Workers/Messaging.php
#	src/Appwrite/Platform/Workers/Usage.php
#	src/Appwrite/Platform/Workers/UsageHook.php
#	src/Appwrite/Specification/Format/OpenAPI3.php
#	src/Appwrite/Specification/Format/Swagger2.php
#	tests/e2e/Services/Account/AccountConsoleClientTest.php
2024-02-22 01:29:28 +13:00
Jake Barnby 353069bc1f
Fix GraphQL test relying on creating session when one exists 2024-02-21 18:50:28 +13:00
Jake Barnby ca1d66fc7e
Fix test 2024-02-21 13:31:48 +13:00
Jake Barnby 81d475d98b
Add test 2024-02-21 13:16:25 +13:00
loks0n c627fbf2a5 fix: type err 2024-02-20 15:32:00 +00:00
loks0n 24bf5d2584 fix: usage tests 2024-02-20 15:27:01 +00:00
loks0n c192712a58 chore: fmt 2024-02-20 14:58:50 +00:00
loks0n 7b88b6dbb1 test: refactor usagetest 2024-02-20 14:47:49 +00:00
loks0n e051717232 fix: usage tests 2024-02-20 13:24:52 +00:00
Jake Barnby 439e7b1ccf
Merge remote-tracking branch 'origin/feat-remove-callback-resources' into feat-email-attachments
# Conflicts:
#	app/worker.php
#	src/Appwrite/Platform/Workers/Messaging.php
2024-02-21 02:00:46 +13:00
Jake Barnby 7ad9b1cd5f
Try fix phone test 2024-02-21 01:54:17 +13:00
loks0n b76771a8b4 fix: tests 2024-02-20 12:41:49 +00:00
loks0n ae3e961e3f test: fix already logged in 2024-02-20 11:52:29 +00:00
loks0n fa28496b32 feat: ssr dx changes 2024-02-20 11:45:11 +00:00
Jake Barnby f28412ccd9
Add compound UID unit test 2024-02-20 20:10:20 +13:00
shimon 1577be9172 usage/usage-dump queue health endpoints 2024-02-19 21:36:14 +02:00
Eldad A. Fux 44a9aed48e
Merge pull request #7165 from appwrite/feat-more-phone-validation
Feat more phone validation
2024-02-18 22:39:45 +01:00
Torsten Dittmann de0e83f703 fix: move user and project logic from general to api hook 2024-02-16 17:58:51 +00:00
Jake Barnby 14a243cc37
Merge pull request #7457 from appwrite/1.5.x-response-request-models
Update Response and Request filters aswell as Migrations for 1.5.x
2024-02-16 20:58:08 +13:00
Jake Barnby 4d7becc459
Apply suggestions from code review 2024-02-16 20:23:31 +13:00
Khushboo Verma 00db19257d Add health storage check 2024-02-15 11:57:24 +05:30
Jake Barnby 142e92b4b8
Update tests 2024-02-15 17:30:09 +13:00
Jake Barnby ae7a5c6c9c
Merge pull request #7580 from appwrite/feat-subscribe-permission
Feat subscribe permission
2024-02-15 16:47:44 +13:00
fogelito 84acf990ec Merge branch '1.5.x' of github.com:appwrite/appwrite into twoWayKey-2 2024-02-14 16:53:58 +02:00
fogelito 796e44a1ed Merge branch '1.5.x' of github.com:appwrite/appwrite into twoWayKey-2 2024-02-13 11:46:33 +02:00
Jake Barnby b2f119868d
Add test 2024-02-13 17:41:07 +13:00
Jake Barnby 44a45f7fcc
Merge remote-tracking branch 'origin/1.5.x' into 1.5.x-response-request-models 2024-02-13 15:21:57 +13:00
Jake Barnby 13ea6787cb
Merge remote-tracking branch 'origin/1.5.x' into fix-smtp-provider-update
# Conflicts:
#	tests/e2e/Services/Messaging/MessagingBase.php
2024-02-13 15:21:15 +13:00
Jake Barnby 7b791aa371
Fix telesign test 2024-02-13 15:20:10 +13:00
Jake Barnby 01e88e65d6
Fix swapping options/credentials on create/update smtp provider 2024-02-13 15:16:37 +13:00
Jake Barnby 66e51c0f18
Merge remote-tracking branch 'origin/1.5.x' into 1.5.x-response-request-models
# Conflicts:
#	src/Appwrite/Platform/Workers/Usage.php
#	src/Appwrite/Platform/Workers/UsageHook.php
2024-02-13 15:07:16 +13:00
Jake Barnby 94e580c259
Fix graphql test 2024-02-13 15:05:15 +13:00
Jake Barnby ff1f7e4819
Merge pull request #7569 from appwrite/fix-telesign-params
Fix telesign params
2024-02-13 12:38:49 +13:00
Jake Barnby 06b15c79ff
Merge pull request #7572 from appwrite/attributes-query-fix
fix Indexes
2024-02-13 12:37:59 +13:00
fogelito 6c064430fb Merge branch '1.5.x' of github.com:appwrite/appwrite into json_syntax_error 2024-02-12 17:41:42 +02:00
fogelito 6aae8cbf64 Add cursor test 2024-02-12 15:27:19 +02:00
fogelito 74f7143a18 remove debug 2024-02-12 12:04:46 +02:00
fogelito 2ef59134a0 Merge branch '1.5.x' of github.com:appwrite/appwrite into attributes-query-fix 2024-02-12 12:00:26 +02:00
fogelito adbe11fd50 fix Indexes 2024-02-12 11:55:45 +02:00
Jake Barnby e2f71cbf3a
Merge pull request #7557 from appwrite/create-array-index
Hardcode size and orders for Json Key Indexes
2024-02-12 22:27:15 +13:00
Jake Barnby b9b0df9492
Update sleep for flaky test 2024-02-12 18:54:36 +13:00
Jake Barnby ac8bddb10d
Update sleep for flaky test 2024-02-12 18:41:32 +13:00
Jake Barnby 8ed2b1f3a5
Fix tests 2024-02-12 18:35:05 +13:00
Jake Barnby 2059de5dea
Fix test 2024-02-12 15:40:11 +13:00
Jake Barnby 05884e154e
Update telesign credentials 2024-02-12 15:10:18 +13:00
Jake Barnby 18f7168160
Merge main 2024-02-12 14:18:19 +13:00
Damodar Lohani e462d73f65 prevent user with active team, from deletion 2024-02-11 09:31:09 +00:00
Christy Jacob e2baefe8c6
Merge pull request #7500 from appwrite/fix-account-delete
PEA-233-prevent console user deletion before deleting their team
2024-02-11 14:52:24 +05:30
fogelito 103fec1664 parseQueries 2024-02-08 18:10:25 +02:00
fogelito 2c57f9a44a Merge branch '1.5.x' of github.com:appwrite/appwrite into create-array-index 2024-02-08 15:04:43 +02:00
fogelito 98a6b96af9 Hardcode size and orders 2024-02-08 15:01:20 +02:00
Bradley Schofield 38c0f8ddab Add Query Converter 2024-02-08 11:39:01 +00:00
Jake Barnby 5e5a2fb414
Fix graphql tests 2024-02-08 00:08:05 +13:00
Bradley Schofield 559fa924c0 Merge branch '1.5.x' into 1.5.x-response-request-models 2024-02-06 17:10:43 +00:00
Khushboo Verma fb127270ce Add test for empty domain 2024-02-06 16:04:58 +05:30