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

5916 commits

Author SHA1 Message Date
Jake Barnby 6fb1e929cd
Use group hook to block recreating sessions 2024-02-27 22:08:39 +13: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
Jake Barnby 16071d9056
Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks
# 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
2024-02-27 18:19:02 +13:00
Khushboo Verma af3d6b2308 Allow ssl along with tls in custom smtp 2024-02-26 20:40:41 +05:30
Christy Jacob 03d6eb7401
Merge pull request #7669 from appwrite/main
Sync main
2024-02-26 17:39:33 +05:30
Jake Barnby 7945f1398f
Fix tests 2024-02-27 00:27:35 +13:00
Jake Barnby 1da971ce75
Change status param to draft and base status on draft and scheduledAt params 2024-02-26 23:52:32 +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
Khushboo Verma 56760b14cb Restore create build endpoint 2024-02-26 15:37:47 +05:30
Jake Barnby a89c0540ad
Fix scheduledAt not updated 2024-02-26 18:46:26 +13:00
Jake Barnby cd554aa17f
Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks
# Conflicts:
#	app/config/specs/open-api3-1.5.x-client.json
#	app/config/specs/open-api3-1.5.x-console.json
#	app/config/specs/open-api3-1.5.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.5.x-client.json
#	app/config/specs/swagger2-1.5.x-console.json
#	app/config/specs/swagger2-1.5.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.lock
2024-02-26 18:43:52 +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 821e323a40
Merge pull request #7648 from UtkarshAhuja2003/fix-7587-list-api-select
[Fix]: Remove internal attributes on select query
2024-02-26 18:33:36 +13:00
Jake Barnby d7a16ae7b0
Merge branch '1.5.x' into fix-password-validation 2024-02-26 17:52:41 +13:00
Jake Barnby d3cf892001
Named params 2024-02-26 17:50:52 +13:00
Jake Barnby 36ebb89a9b
Merge pull request #7667 from appwrite/1.5.x-api-descriptions
1.5.x api descriptions
2024-02-26 17:47:39 +13:00
Jake Barnby 36845edc2f
Rescheduling fixes 2024-02-26 17:14:59 +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
Jake Barnby 19d7e533fa
Usage desc updates 2024-02-26 15:44:20 +13:00
Jake Barnby 00c3bc0f8a
Remove invalid index type 2024-02-26 15:38:58 +13:00
Vincent (Wen Yu) Ge b32d40f3e2 Improve messages 2024-02-26 02:25:45 +00:00
Vincent (Wen Yu) Ge ab36133a8f Add descriptions 2024-02-25 22:58:33 +00:00
navjotNSK cab2233816 Formatting 2024-02-25 20:24:36 +01:00
navjotNSK 3a8c5a2e65 Default value added for name 2024-02-25 20:24:36 +01:00
Khushboo Verma 353092ba00 Remove create build endpoint 2024-02-26 00:05:00 +05:30
Matej Bačo 5327c02870 Improve tests 2024-02-25 18:42:24 +01:00
Matej Bačo 862cba1a5b Check against false positive for MFA 2024-02-25 18:42:24 +01:00
Khushboo Verma ed4773c2d9 Merge branch 'main' into feat-cancel-build-deployment 2024-02-25 19:14:42 +05:30
Khushboo Verma 0e3a354f1f Create build document in API instead of worker 2024-02-25 19:13:55 +05:30
Jake Barnby b1200f4cbd
Merge branch '1.5.x' into refactor-disallow-new-session-with-existing 2024-02-26 01:29:14 +13:00
Jake Barnby 91c52b28eb
Move targets to new session if upgrading to oauth session 2024-02-26 01:13:39 +13:00
Jake Barnby 86a2821a23
Merge pull request #7649 from appwrite/chore-remove-array-sdk-method
chore: remove array sdk method
2024-02-26 01:02:01 +13:00
Torsten Dittmann 194c61a47f fix: mfa backup codes 2024-02-25 11:47:22 +01: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
Torsten Dittmann 3963b65f68 fix: mfa delete 2024-02-25 11:21:56 +01: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
fogelito 1474bd65b0 Rename $collectionDocument 2024-02-25 10:57:41 +02:00
fogelito af34f195c6 Address comments 2024-02-25 10:26:02 +02:00
Christy Jacob 7ae09ba795
Revert "Revert "usage/usage-dump queue health endpoints"" 2024-02-25 13:42:28 +05:30
Jake Barnby 404e4258f6
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing 2024-02-25 20:56:34 +13:00
Jake Barnby 209c29991b
Only return allowed runtimes in runtime list route 2024-02-25 18:49:25 +13:00
Eldad Fux b78725e650 Hide error messages from HTML templates 2024-02-24 19:12:27 +01:00
Eldad Fux e7a847a417 Fixed ID class namespace 2024-02-24 19:01:00 +01:00
loks0n 008f086f40 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into chore-remove-array-sdk-method 2024-02-24 14:44:50 +00:00
loks0n b650884351 chore: fix hide in specs 2024-02-24 14:38:09 +00:00
Jake Barnby a178dbfc4b
Allow existing session when upgrading from anonymous to oauth 2024-02-25 03:04:35 +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 7a24f5fb3d
Fix missing userId on update challenge 2024-02-25 02:21:33 +13:00
loks0n 5ff2121ef7 fix: sdk.hideServer & sdk.hideClient 2024-02-24 13:17:58 +00:00
loks0n 5ba50c842b chore: remove array sdk method 2024-02-24 12:53:47 +00:00
Jake Barnby 46575b6df7
Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks
# Conflicts:
#	app/controllers/api/account.php
#	composer.lock
2024-02-25 00:16:40 +13:00
Utkarsh Ahuja 8c4473932f fix: list api select query 2024-02-24 10:55:33 +00: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 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 11e9f43982
Allow setting APNS to sandbox mode 2024-02-24 13:34:08 +13:00
Khushboo Verma 141cdf4c82 Fix content-type of file 2024-02-23 20:10:25 +05:30
Torsten Dittmann 076ffe8866 fix: missing team variable and added mfa templates to config 2024-02-23 14:59:12 +01:00
Torsten Dittmann af6091e04a fix: template name typo for mfa challenge 2024-02-23 14:59:12 +01:00
Torsten Dittmann f577811c04 fix: formatting on emails 2024-02-23 14:59:12 +01:00
Torsten Dittmann 9ae2948d0e fix: mfa email template 2024-02-23 14:59:12 +01:00
Jake Barnby aa6778712f
Merge pull request #7640 from appwrite/fix-tests
Fix tests
2024-02-24 02:54:59 +13:00
Jake Barnby 7ab80b9288
Fix account method 2024-02-24 02:00:31 +13:00
Jake Barnby 0d62ecf90f
Merge pull request #7625 from appwrite/provider-null
Provider null
2024-02-24 01:17:58 +13:00
Torsten Dittmann a684f7b132 fix: add mfa path to console 2024-02-23 12:13:22 +01:00
Jake Barnby 8742bfaee8
Fix missing subscribe on topic update 2024-02-23 23:56:49 +13:00
Jake Barnby 7c42a59c85
Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks
# 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
2024-02-23 18:01:59 +13:00
loks0n 046c11ceb2 chore: revert X-Forwarded-For 2024-02-22 15:37:51 +00:00
loks0n 7985a9ed2c chore: remove forwarded for 2024-02-22 13:26:08 +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 c04f54da64
Revert "Revert "Fix: Router CURL"" 2024-02-22 15:10:18 +05:30
Christy Jacob d2787c8555
Revert "Fix: Router CURL" 2024-02-22 12:26:01 +05:30
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
Torsten Dittmann e7259f0a3d
Merge branch '1.5.x' into feat-rc-sdks 2024-02-21 18:22:17 +01:00
Torsten Dittmann 18e4385ca5 fix: change emailPassword factor from email to password 2024-02-21 18:18:56 +01:00
Matej Bačo b03783c588 Fix bigs until works 2024-02-21 18:14:24 +01:00
Matej Bačo 6567cff5dc Fix missing todo 2024-02-21 17:03:48 +00:00
Torsten Dittmann 6cd456a35e fix: mfa sdk method 2024-02-21 17:54:39 +01:00
Matej Bačo 0dd2889de5 Fix double router curl 2024-02-21 14:51:21 +00:00
Jake Barnby a877850707
Fix GraphQL tests 2024-02-22 02:26:17 +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
fogelito b762a9cedd Check user false 2024-02-21 11:48:16 +02:00
fogelito a851a5f244 providerInternalId nulls 2024-02-21 11:43:04 +02:00
Jake Barnby 9498d680fb
Add doc refs 2024-02-21 22:04:27 +13:00
Jake Barnby 607ba5b32f
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing 2024-02-21 18:40:01 +13:00
Jake Barnby 3aeb62377c
Fix missed update with image 2024-02-21 17:07:52 +13:00
Jake Barnby 41be4da5c9
Merge remote-tracking branch 'origin/1.5.x' into feat-push-images 2024-02-21 13:01:53 +13:00
Jake Barnby a9d1aa5bca
Merge pull request #7620 from appwrite/refactor-remove-resource-collection
Refactor remove resource collection
2024-02-21 13:00:48 +13:00
Jake Barnby ad8450af32
Merge remote-tracking branch 'origin/1.5.x' into feat-push-images 2024-02-21 03:29:00 +13:00
Jake Barnby 400b28de8a
Replace resourceCollection with switch 2024-02-21 03:25:01 +13:00
Jake Barnby 1c1a2eab2c
Format 2024-02-21 03:16:01 +13:00
Jake Barnby 64eaf91ee7
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing 2024-02-21 03:15:23 +13:00
Jake Barnby 379c79dae9
Consistent naming for device resources 2024-02-21 03:10:51 +13:00
Jake Barnby 35441dc542
Merge remote-tracking branch 'origin/1.5.x' into feat-email-attachments 2024-02-21 02:33:35 +13:00
Jake Barnby b9b54b808c
Merge pull request #7618 from appwrite/feat-remove-callback-resources
Remove callback resources from workers
2024-02-21 02:30:32 +13:00
Jake Barnby b265106af2
Fix tests 2024-02-21 02:20:09 +13: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
loks0n 1fa0f18e44 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr-dx 2024-02-20 12:43:50 +00:00
Jake Barnby bbce53cda5
Auto trigger messaging events 2024-02-21 01:06:35 +13:00
loks0n fa28496b32 feat: ssr dx changes 2024-02-20 11:45:11 +00:00
Jake Barnby 2f711c84ed
Remove callback resources from workers 2024-02-21 00:40:55 +13:00
Jake Barnby 6c4b0ecd5b
Simplify allow list 2024-02-20 23:27:40 +13:00
Jake Barnby 5747b33e38
Make self-hosted and cloud specs consistent 2024-02-20 23:15:46 +13:00
Jake Barnby 4bc6c202d9
Use compound ID for push notification image 2024-02-20 18:25:57 +13:00
Jake Barnby 42e1b0dfe3
Merge remote-tracking branch 'origin/feat-email-attachments' into feat-push-images 2024-02-20 18:06:29 +13:00
shimon 1577be9172 usage/usage-dump queue health endpoints 2024-02-19 21:36:14 +02:00
Jake Barnby 022c4678ec
Allow attaching files from storage to emails 2024-02-20 00:08:57 +13:00
Jake Barnby 7a420000fa
Fix image permissions check and URL 2024-02-19 20:48:52 +13:00
Jake Barnby 1bb75fdd63
Merge remote-tracking branch 'origin/1.5.x' into feat-push-images
# Conflicts:
#	src/Appwrite/Extend/Exception.php
2024-02-19 20:44:11 +13:00
Damodar Lohani 928ae74ffe fix project network usage 2024-02-19 06:04:29 +00:00
Khushboo Verma e4a86d9777 Remove global function 2024-02-19 09:19:54 +05:30
Eldad A. Fux ad78259c10
Merge pull request #7375 from appwrite/fix-sentry-errors
Update exception for github session not found
2024-02-18 22:37:00 +01:00
Khushboo Verma ada1f2abb7 Mark cancelled first, then kill container 2024-02-19 00:44:21 +05:30
Khushboo Verma 12f2e761ef Updated description and response model 2024-02-18 23:25:57 +05:30
Khushboo Verma 3b1233eaa9 Add deviceFunctions and deviceBuilds as well 2024-02-18 18:28:41 +05:30
Khushboo Verma f5919aad4a Merge branch 'main' into feat-cancel-build-deployment 2024-02-18 18:03:21 +05:30
Khushboo Verma ed3d598f2e Added cancel build endpoint 2024-02-18 18:01:25 +05:30
Torsten Dittmann b500c085e1 revert: unnecessary style changes 2024-02-16 18:00:49 +00:00
Torsten Dittmann de0e83f703 fix: move user and project logic from general to api hook 2024-02-16 17:58:51 +00:00
Torsten Dittmann 5193a97ddb fix: move user logic from general to api hook 2024-02-16 16:26:50 +00:00
Torsten Dittmann 4748dedd29 fix: blocked users from accessing console 2024-02-16 14:58:38 +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 3c727861bb
Fix target permissions 2024-02-16 17:07:16 +13:00
Jake Barnby c192f14d01
Merge remote-tracking branch 'origin/1.5.x' into feat-topic-totals-per-type 2024-02-16 14:08:04 +13:00
Torsten Dittmann 14ecbd6658 fix: 2fa endpoint params 2024-02-15 11:26:34 +00:00
Jake Barnby 2fffbd93f8
Lint fix 2024-02-15 22:41:45 +13:00
Jake Barnby d38197380e
Support adding image to push notification via storage file 2024-02-15 22:36:34 +13:00
Khushboo Verma 00db19257d Add health storage check 2024-02-15 11:57:24 +05:30
Jake Barnby 5f59f4c5c8
Fix syntax error 2024-02-15 17:56:06 +13:00
Jake Barnby afba7f75f0
Update appropriate total count when mutating topic 2024-02-15 17:23:30 +13:00
Jake Barnby ed2add1f1a
Merge pull request #7581 from appwrite/chore-remove-redundant-hook
Remove redundant hook
2024-02-15 16:48:03 +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
Jake Barnby 0246fb254a
Merge pull request #7578 from appwrite/fix-smtp-provider-update
Fix smtp provider update
2024-02-14 12:48:38 +13:00
fogelito b9000e6d2f Changes message like Utopia 2024-02-13 12:29:36 +02:00
fogelito 99fed365db Update comment 2024-02-13 12:05:47 +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
Bradley Schofield b60c591f8f Merge branch '1.5.x' into 1.5.x-response-request-models 2024-02-13 09:45:59 +00:00
shimon dac0e2a543 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
 Conflicts:
	src/Appwrite/Platform/Workers/UsageHook.php
2024-02-13 10:48:47 +02:00
Jake Barnby 014464506e
Remove redundant hook 2024-02-13 17:45:03 +13:00
Jake Barnby 1f470aecd2
Add subscribe permission to topics 2024-02-13 17:24:31 +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 37522ea66f
Merge branch '1.5.x' into fix-catch-exception 2024-02-13 12:47:36 +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 0bd3fe6473
Merge pull request #7571 from appwrite/fix-updating-message-status
Fix updating message status
2024-02-13 12:38:39 +13:00
Jake Barnby 06b15c79ff
Merge pull request #7572 from appwrite/attributes-query-fix
fix Indexes
2024-02-13 12:37:59 +13:00
Christy Jacob c076dfe6f1
Merge pull request #7576 from appwrite/refactor-usage-sn
Refactor usage sn
2024-02-12 23:05:56 +05:30
fogelito 4018224cc6 parseQueries 2024-02-12 18:06:37 +02:00
fogelito ace75b0786 parseQueries 2024-02-12 18:02:04 +02: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 2f9cadf4c0 remove var_dump 2024-02-12 15:30:34 +02:00
fogelito 6aae8cbf64 Add cursor test 2024-02-12 15:27:19 +02:00
Jake Barnby f5aebe6673
Merge pull request #7559 from Souptik2001/fix-7109-user-activity-log
Fix missing user activity logs
2024-02-12 23:04:20 +13:00
fogelito e5bada0493 typo 2024-02-12 12:03:31 +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
Jake Barnby e26230cc34
Disallow creating a session if one already exists 2024-02-12 22:59:49 +13: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
shimon e7ace61273 Sync against main 2024-02-12 11:10:52 +02:00
shimon 6b6f04d2d3 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
 Conflicts:
	app/config/collections.php
	app/controllers/shared/api.php
2024-02-12 10:55:53 +02:00
Jake Barnby 8ed2b1f3a5
Fix tests 2024-02-12 18:35:05 +13:00
Jake Barnby 3ba6652be8
Only set schedule active is status is scheduled 2024-02-12 16:55:34 +13:00
Jake Barnby f237e863de
Throw on updating sent, processing, failed message 2024-02-12 16:55:00 +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 eb7e2fd23b fix injection 2024-02-11 09:46:39 +00:00
Damodar Lohani 36eabfa2dd fix check twice 2024-02-11 09:45:36 +00:00
Damodar Lohani 2634c928c7 fix format 2024-02-11 09:34:13 +00: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
Damodar Lohani 681688e252
fix rename 2024-02-11 14:52:54 +05:45
Damodar Lohani c8720805c7
Update app/controllers/api/account.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-02-11 14:41:19 +05:45
Christy Jacob 5abcb86fd7 fix: use atomic operations for updating team count 2024-02-09 23:18:18 +05:30
shimon 179a045399 Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into usage-queue-poc
 Conflicts:
	composer.lock
2024-02-09 16:29:26 +02:00
Souptik Datta e6a97bb36a
Merge branch 'master' into fix-7109-user-activity-log 2024-02-09 00:40:36 +05:30
Souptik Datta 8d7be399d3
fix: Fix project user activity log's missing fields and total count
Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>
2024-02-09 00:15:48 +05:30
Souptik Datta f42a78ef9c
fix: Fix account activity logs total count
Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>
2024-02-09 00:14:37 +05:30
Christy Jacob ba4f708137
Apply suggestions from code review
Co-authored-by: Torsten Dittmann <torsten.dittmann@googlemail.com>
2024-02-08 23:26:43 +05:30
fogelito bcc6564e5b typo 2024-02-08 18:18:39 +02:00
fogelito 7176d7feab Remove comment 2024-02-08 18:12:43 +02:00
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
shimon 790cdc297b composer update 2024-02-08 10:26:45 +02:00
shimon 632f78140f Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into usage-queue-poc
 Conflicts:
	composer.json
	composer.lock
2024-02-08 09:29:12 +02:00
Christy Jacob 243ddd4b33
Merge pull request #7519 from appwrite/update-param-name
Update param name
2024-02-08 12:55:19 +05:30
Steven Nguyen 4ace8ed027
Replace catching \Exception with \Throwable
\Exception doesn't work as a catch-all because not everything extends
\Exception. For example, there was a problem where the messaging worker
didn't catch an exception here:

} catch (\Exception $e) {
    $deliveryErrors[] = 'Failed sending to targets ' . $batchIndex + 1 . '-' . \count($batch) . ' with error: ' . $e->getMessage();
} finally {

As such, $deliveryErrors stayed as an empty array. In this case, the
$adapter->send() threw a TypeError which extends Error which implements
Throwable. Updating the catch to catch \Throwable ensures the error is
caught and $deliveryErrors gets updated.
2024-02-08 01:17:54 +00:00
Jake Barnby 66a38898eb
Fix message status values and enums 2024-02-07 23:50:05 +13:00
Jake Barnby 7014b2c2cd
Fix user API mfa route auth 2024-02-07 18:08:51 +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
Khushboo Verma 11ceeff5ca Add health certificate validity endpoint 2024-02-06 15:15:03 +05:30
Jake Barnby 0a72b37b3e
Fix session response model 2024-02-06 02:17:04 +13:00
Matej Bačo 25f8702429 Fix formatting 2024-02-05 10:40:53 +00:00
Matej Bačo 7beb9080fa Merge remote-tracking branch 'origin/1.5.x' into fix-empty-user-updates 2024-02-05 10:38:48 +00:00
Khushboo Verma e8523e38f7 Merge branch '1.5.x' into feat-block-countries 2024-02-05 13:26:52 +05:30
Jake Barnby 15f433794f
Add missing enum cases 2024-02-05 20:25:34 +13:00