6769 commits

Author	SHA1	Message	Date
Matej Bačo	b762e7fb73	Merge pull request #10181 from hmacr/1we9-use-preview-for-screenshots ... fix: Use direct source for file-preview when empty	2025-07-24 13:39:24 +02:00
hmacr	f75b53f3bc	Merge branch '1.7.x' into 1we17-preview-for-emails	2025-07-23 22:05:23 +05:30
hmacr	c5f8bdfd36	Preview texts for emails	2025-07-23 22:04:25 +05:30
Matej Bačo	b194558226	Switch from gzip to none compression	2025-07-23 15:49:07 +02:00
hmacr	f85a7410df	Merge branch '1.7.x' into 1we9-use-preview-for-screenshots	2025-07-23 12:13:04 +05:30
hmacr	c83dd7aa13	Add defaultBranch in getRepository response	2025-07-23 11:45:27 +05:30
hmacr	50eca9ebbc	update commit author name param	2025-07-23 09:53:09 +05:30
hmacr	2a7ce13224	Merge branch '1.7.x' into 1we19-fix-double-deployment	2025-07-23 09:38:37 +05:30
Steven Nguyen	898365a922	Merge pull request #10170 from appwrite/fix-templates ... Fix default email templates	2025-07-22 18:25:57 -07:00
hmacr	9c0e6f4203	Skip deployment when commit is created by us	2025-07-22 20:39:36 +05:30
hmacr	bf3efea98d	framework support + content for OTP & add-member email	2025-07-22 16:43:17 +05:30
Jake Barnby	cd39bd6512	Merge pull request #10179 from appwrite/dat-579 ... Added the cases of null permissions in the upsert route and update th…	2025-07-22 20:22:56 +12:00
ArnabChatterjee20k	7bb760b4a1	added test for relation related upsert , fixed formatting	2025-07-22 13:10:05 +05:30
Jake Barnby	afd6730a81	FIx name mismatch	2025-07-22 14:43:32 +12:00
hmacr	9da57a457b	fix: Use direct source for file-preview when empty	2025-07-21 22:31:06 +05:30
ArnabChatterjee20k	8b88a09374	added the cases of null permissions in the upsert route and update the e2e test	2025-07-21 19:32:27 +05:30
Jake Barnby	51c95347a0	Merge remote-tracking branch 'origin/main' into 1.8.x ... # 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 # app/controllers/api/databases.php	2025-07-21 20:42:16 +12:00
Jake Barnby	d32da05f92	Merge remote-tracking branch 'origin/main' into 1.7.x ... # Conflicts: # app/config/specs/open-api3-1.7.x-console.json # app/config/specs/open-api3-1.7.x-server.json # app/config/specs/open-api3-latest-console.json # app/config/specs/open-api3-latest-server.json # app/config/specs/swagger2-1.7.x-console.json # app/config/specs/swagger2-1.7.x-server.json # app/config/specs/swagger2-latest-console.json # app/config/specs/swagger2-latest-server.json # app/init/constants.php # composer.lock # docs/references/databases/upsert-documents.md # tests/e2e/Services/Account/AccountCustomClientTest.php	2025-07-21 19:22:15 +12:00
Darshan	e7315e23c7	fix: address comment.	2025-07-20 17:28:44 +05:30
Darshan	373ceecebb	fix: add a default client name for session alerts	2025-07-20 16:40:29 +05:30
Darshan	0926250f17	fix: session alerts template.	2025-07-20 16:39:08 +05:30
Darshan	5243af937f	fix: the default templates.	2025-07-20 14:40:30 +05:30
Jake Barnby	9ceeb76ad0	Merge branch '1.7.x' into 1.8.x ... # Conflicts: # app/controllers/api/databases.php # composer.lock # src/Appwrite/GraphQL/Types/Mapper.php	2025-07-18 17:24:12 +12:00
Steven Nguyen	477682e062	fix: prevent injected $user from being shadowed	2025-07-14 16:05:58 -07:00
Steven Nguyen	100aea337f	fix: update OAuth2 redirect URLs ... 1. handle non-standard ports if the request came in on a non-standard port 2. use the _APP_CONSOLE_DOMAIN env var to handle cases where the Console domain may not be the endpoint domain such as on Appwrite Cloud 3. use the _APP_OPTIONS_FORCE_HTTPS env var to determine the protocol to be consistent with the rest of the codebase	2025-07-10 15:51:13 -07:00
Steven Nguyen	435a319fb6	Merge pull request #10130 from appwrite/fix-oauth2-redirect-validation ... fix: success validation in oauth2 redirect	2025-07-10 09:06:43 -07:00
Steven Nguyen	11332ed1f9	chore: fix deprecation warning from passing null into json_decode	2025-07-09 22:10:17 -07:00
Steven Nguyen	53086fe975	fix: success validation in oauth2 redirect ... We switched to using the Redirect class for validating redirect URLs to cover additional cases like react native expo scheme, but we missed this validation.	2025-07-09 15:11:30 -07:00
ArnabChatterjee20k	ca61b528b9	reverted the api signature and started handling it internally	2025-07-09 23:49:56 +05:30
ArnabChatterjee20k	c36720e3b0	updated param of permissiosns in upsert and updated tests for upsert without permissions	2025-07-09 16:37:41 +05:30
Darshan	14e52058c7	fix: file tokens not working on file-security.	2025-07-08 13:46:53 +05:30
Ebenezer Don	a2261b8ad0	Clarify userId param in endpoints that create accounts	2025-07-07 13:22:52 +01:00
Jake Barnby	b2fa28754d	Merge remote-tracking branch 'origin/1.7.x' into 1.8.x ... # Conflicts: # .github/workflows/benchmark.yml # composer.lock # src/Appwrite/Event/Database.php	2025-07-04 10:00:45 -04:00
Chirag Aggarwal	df9ef1ace9	Merge branch '1.7.x' into feat-exp-scheme	2025-07-04 15:22:44 +05:30
Khushboo Verma	131cdefac5	Merge branch '1.7.x' into chore-update-env-var-used-for-domain	2025-07-04 10:40:38 +05:30
Jake Barnby	2a73dddbdb	Fix health	2025-07-03 14:09:08 -04:00
Chirag Aggarwal	ef2dfb6cca	Merge branch '1.7.x' into feat-exp-scheme	2025-07-03 16:37:17 +05:30
Khushboo Verma	642d046d65	Merge branch '1.7.x' into chore-update-env-var-used-for-domain	2025-07-03 00:38:33 +05:30
Khushboo Verma	253195698e	Merge branch '1.7.x' into chore-update-env-var-used-for-domain	2025-07-03 00:02:51 +05:30
Jake Barnby	2ce3118ba9	Remove path update	2025-07-02 13:36:46 -04:00
Darshan	ed2d12f896	update: full path on appwrite.	2025-07-02 19:55:42 +05:30
Darshan	fc1a9a4e16	fix: path and revert deps.	2025-07-02 19:13:13 +05:30
Darshan	aa9a82d8ce	fix: document attribute type.	2025-07-02 14:32:16 +05:30
Jake Barnby	609e1adcf0	Catch	2025-06-30 22:27:18 -04:00
Khushboo Verma	58c1e2d6e2	Merge branch '1.7.x' into chore-update-env-var-used-for-domain	2025-07-01 02:29:08 +05:30
Chirag Aggarwal	8027251224	Merge branch '1.7.x' into feat-exp-scheme	2025-06-27 09:21:27 +05:30
Matej Bačo	a356e86ced	Add previe wendpoint logging	2025-06-26 20:17:26 +02:00
Chirag Aggarwal	043cead66b	chore: fix logging	2025-06-26 19:32:15 +05:30
Chirag Aggarwal	dbc58655b2	Merge branch '1.7.x' into feat-exp-scheme	2025-06-25 07:53:28 +05:30
Steven Nguyen	ffc7f4c7ae	Merge pull request #9590 from appwrite/fix-templates ... Fix template to use button	2025-06-21 09:33:06 -07:00
Christy Jacob	b5c5f76acc	Merge branch '1.7.x' of github.com:appwrite/appwrite into feat-apps-module	2025-06-20 17:39:28 +04:00
Darshan	c08db975d6	Merge branch '1.8.x' into database-aliases	2025-06-19 14:52:13 +05:30
Jake Barnby	53a00deb0a	Merge pull request #10010 from ArnabChatterjee20k/dat-522 ... Added auth option to allow invalidating existing sessions	2025-06-18 17:41:41 -04:00
ArnabChatterjee20k	225b6e8413	updated tests and project invaldate session	2025-06-19 02:26:58 +05:30
ArnabChatterjee20k	56494ca427	updated invalidation session during the change password in the account endpoint	2025-06-18 13:30:24 +05:30
Khushboo Verma	520006864d	Merge branch '1.7.x' into chore-update-env-var-used-for-domain	2025-06-18 11:07:25 +05:30
Khushboo Verma	5a3e44a36d	Replace == with ===	2025-06-18 11:06:35 +05:30
Jake Barnby	d84151192e	Merge remote-tracking branch 'origin/1.7.x' into 1.8.x	2025-06-17 15:58:07 -04:00
Darshan	34e4299e10	Merge branch '1.8.x' into database-aliases	2025-06-17 10:13:38 +05:30
ArnabChatterjee20k	28fbd64864	updated session invalidation tests , models and descriptions	2025-06-17 00:40:32 +05:30
ArnabChatterjee20k	9bf4361761	updated indentation	2025-06-16 23:48:08 +05:30
ArnabChatterjee20k	7a0ba95231	updated onPasswordChange to invalidate session	2025-06-16 23:05:52 +05:30
Jake Barnby	3729c6b1c2	Cast sequence	2025-06-16 13:24:48 -04:00
Jake Barnby	e704e96290	Revert "Feat: Lazy-load relationships"	2025-06-16 11:48:27 -04:00
Jake Barnby	a21ccfd694	Merge pull request #9669 from appwrite/lazy-load-relationships ... Feat: Lazy-load relationships	2025-06-16 11:48:18 -04:00
Jake Barnby	89f0c28e26	Merge remote-tracking branch 'origin/1.7.x' into 1.8.x ... # Conflicts: # .coderabbit.yaml	2025-06-16 11:37:50 -04:00
Khushboo Verma	5e345c0388	Revert some changes	2025-06-16 17:29:01 +05:30
Khushboo Verma	362618c5af	Merge branch 'fix-github-check-urls' into chore-update-env-var-used-for-domain	2025-06-16 17:19:55 +05:30
Khushboo Verma	15f81d29f3	Merge branch '1.7.x' into fix-github-check-urls	2025-06-16 17:19:10 +05:30
Darshan	3be1aa3801	Merge branch '1.7.x' into fix-templates	2025-06-15 11:21:33 +05:30
ArnabChatterjee20k	74614e8d58	updated description of on password change	2025-06-14 18:09:20 +05:30
ArnabChatterjee20k	fde2f278e8	added invalidating sessions for the project users	2025-06-14 18:07:42 +05:30
Steven Nguyen	160c937dc2	fix: prevent 'Attribute "factors" must be an array' error ... Because array_unique() preserves keys, the $factors can go from: [ 0 => 'password', 1 => 'totp', 2 => 'totp', 3 => 'email' ] to: [ 0 => 'password', 1 => 'totp', 3 => 'email' ] and because this is not an array list, the validation fails. Using array_values() after array_unique() will reset the keys to be sequential, resulting in: [ 0 => 'password', 1 => 'totp', 2 => 'email' ]	2025-06-13 09:17:05 -07:00
Darshan	44a5a3eca1	Merge branch '1.8.x' into lazy-load-relationships	2025-06-13 20:01:01 +05:30
Khushboo Verma	221f15313c	Update var name and generate specs	2025-06-13 15:55:02 +05:30
Khushboo Verma	4099f8968a	Merge branch '1.7.x' into feat-ref-param-to-vcs-list-contents	2025-06-13 15:51:35 +05:30
Khushboo Verma	cee6420fa2	Use env vars instead of request	2025-06-13 15:50:53 +05:30
Khushboo Verma	8bac836483	Merge branch 'fix-github-check-urls' into chore-update-env-var-used-for-domain	2025-06-13 15:18:31 +05:30
Jake Barnby	cf830affc9	Check not development for plan error	2025-06-12 12:20:21 -04:00
Darshan	018aad5339	fix: one more test...	2025-06-12 20:03:41 +05:30
Khushboo Verma	710b8bda56	Use _APP_CONSOLE_DOMAIN, if not found, then use _APP_DOMAIN	2025-06-12 17:27:21 +05:30
Khushboo Verma	176c085068	Fix all vcs urls missing region	2025-06-12 11:43:11 +05:30
Darshan	30eb206dc8	Merge branch '1.8.x' into database-aliases	2025-06-12 11:41:11 +05:30
Darshan	d5bbb95f3b	Merge branch '1.8.x' into lazy-load-relationships	2025-06-12 09:05:56 +05:30
Jake Barnby	7dd45b0644	Merge remote-tracking branch 'origin/1.7.x' into 1.8.x ... # Conflicts: # src/Appwrite/Platform/Workers/StatsUsageDump.php	2025-06-11 17:22:20 -04:00
Darshan	1ac22c0ae0	Merge branch '1.8.x' into 'database-aliases'.	2025-06-11 12:36:33 +05:30
Darshan	d6829dfb34	Merge branch '1.8.x' into 'lazy-load-relationships'.	2025-06-11 10:08:51 +05:30
Chirag Aggarwal	851894947f	chore: restore unique filename for health check #9842	2025-06-11 03:55:11 +00:00
Jake Barnby	082309697c	Fix DB delete cache purge	2025-06-10 15:55:54 -04:00
Jake Barnby	963d177b17	Update admin spec	2025-06-10 15:50:18 -04:00
Jake Barnby	178dec01fd	Add admin key	2025-06-10 15:44:40 -04:00
Jake Barnby	a77eea6b55	Fix numeric type values	2025-06-10 15:05:26 -04:00
Jake Barnby	8c6f0a4e7b	Fix merge	2025-06-10 13:42:41 -04:00
Jake Barnby	e1a291ff21	Consistent messages	2025-06-10 11:50:57 -04:00
Khushboo Verma	72090248e5	Add ref param to vcs list contents	2025-06-10 20:37:37 +05:30
Darshan	e6d143c806	Merge branch '1.7.x' into fix-templates	2025-06-10 14:20:28 +05:30
Darshan	5b6bc81b29	Merge branch '1.8.x' into 'lazy-load-relationships'.	2025-06-10 10:40:48 +05:30
Jake Barnby	6ea61106f4	Update model	2025-06-10 00:37:33 -04:00
Jake Barnby	cf13a45188	Docs	2025-06-10 00:36:55 -04:00
Jake Barnby	91b1670e52	Fix event	2025-06-10 00:35:03 -04:00
Jake Barnby	e6881c10d4	Fix desc	2025-06-10 00:32:38 -04:00
Jake Barnby	5585a75624	Fix auth skips	2025-06-10 00:22:46 -04:00
Jake Barnby	fd7d4db4c4	Fix path param	2025-06-10 00:22:38 -04:00
Jake Barnby	9fc2c5db69	Add increment + decrement routes	2025-06-09 23:56:30 -04:00
Jake Barnby	bd4bb48da2	Fix merge	2025-06-09 20:50:02 -04:00
Jake Barnby	c852cb3ed0	Merge remote-tracking branch 'origin/1.7.x' into 1.8.x ... # Conflicts: # composer.lock # src/Appwrite/Platform/Workers/Audits.php	2025-06-09 20:08:41 -04:00
Darshan	2202b11a26	fix: cases for backwards compatibility to add database and collection ids when using a wildcard.	2025-06-09 19:45:48 +05:30
Darshan	2e0fb694d4	fix: internal ids usage.	2025-06-09 17:08:37 +05:30
Darshan	e699c998bb	update: remove extra line.	2025-06-09 14:49:06 +05:30
Darshan	0ee4f3c4ce	bump: dependencies; fix: tests and logic.	2025-06-09 14:23:04 +05:30
Darshan	e5dc4ac056	Merge branch '1.8.x' into 'lazy-load-relationships'.	2025-06-09 13:55:17 +05:30
Chirag Aggarwal	848d38b75d	chore: update version to 1.7.4 and add experimental feature warnings to document endpoints	2025-06-03 06:59:30 +00:00
Khushboo Verma	0ac6decc99	Fix github comments and deployment creation on branch deletion	2025-06-02 14:04:03 +05:30
Steven Nguyen	623369e426	Merge pull request #9600 from jmastr/fix-4982-expire-sessions-format-for-multiple-api ... fix: expire format account recovery, verification, phone and mfa	2025-05-31 09:23:55 -07:00
Darshan	e1ee9ba89e	fix: logic.	2025-05-30 18:04:57 +05:30
Darshan	4fc84bec7d	reset: stuff on target branch.	2025-05-30 14:33:37 +05:30
Darshan	f7f746a543	Merge branch '1.7.x' into 'fix-teams-deletion'.	2025-05-30 14:25:22 +05:30
Darshan	65ae22d7cd	update: messages because the check is only for console project > organizations.	2025-05-30 14:08:25 +05:30
Darshan	2ef2c59d18	update: exceptions and messages.	2025-05-30 14:03:51 +05:30
Jake Barnby	ebb05cba92	Merge remote-tracking branch 'origin/1.7.x' into 1.8.x ... # Conflicts: # src/Appwrite/Platform/Modules/Compute/Base.php # src/Appwrite/Platform/Modules/Functions/Http/Functions/Deployment/Update.php # src/Appwrite/Platform/Modules/Functions/Workers/Builds.php # src/Appwrite/Platform/Modules/Sites/Http/Sites/Deployment/Update.php	2025-05-28 21:20:35 +12:00
Jake Barnby	61f0e5b3f3	Merge pull request #9920 from appwrite/feat-sync-1.6 ... Feat sync 1.6	2025-05-28 09:12:45 +00:00
Jake Barnby	9cd521390f	Merge remote-tracking branch 'origin/1.6.x' into feat-sync-1.6 ... # Conflicts: # composer.lock # src/Appwrite/Platform/Workers/Builds.php	2025-05-28 21:00:38 +12:00
Khushboo Verma	814abddf93	Truncate commit hash to 16 chars	2025-05-28 14:10:12 +05:30
Khushboo Verma	aa07ba0027	Update app/controllers/api/vcs.php ... Co-authored-by: Matej Bačo <matejbacocom@gmail.com>	2025-05-28 14:01:55 +05:30
Khushboo Verma	66ac440f9d	Add missing separator	2025-05-28 12:55:50 +05:30
Khushboo Verma	320bf69208	Shorten commit url	2025-05-28 12:50:47 +05:30
Darshan	7e6f4befa5	reset: stuff from main.	2025-05-27 19:21:28 +05:30
Darshan	2de9b85d6b	Merge branch 'main' into 'fix-teams-deletion'.	2025-05-27 19:16:40 +05:30
Jake Barnby	b7702340ba	Fix allowed attributes list for user target list queries	2025-05-28 01:13:29 +12:00
Jake Barnby	3158c15111	Merge remote-tracking branch 'origin/1.7.x' into 1.8.x ... # Conflicts: # app/controllers/api/functions.php # app/controllers/api/project.php # app/controllers/api/proxy.php # app/controllers/api/storage.php # app/controllers/api/vcs.php # app/controllers/general.php # app/controllers/shared/api.php # app/init/database/filters.php # composer.json # composer.lock # src/Appwrite/Migration/Migration.php # src/Appwrite/Migration/Version/V15.php # src/Appwrite/Migration/Version/V16.php # src/Appwrite/Migration/Version/V17.php # src/Appwrite/Migration/Version/V18.php # src/Appwrite/Migration/Version/V19.php # src/Appwrite/Migration/Version/V20.php # src/Appwrite/Migration/Version/V21.php # src/Appwrite/Platform/Tasks/Migrate.php # src/Appwrite/Platform/Workers/Builds.php # src/Appwrite/Platform/Workers/Deletes.php # src/Appwrite/Platform/Workers/Functions.php # src/Appwrite/Platform/Workers/StatsResources.php # src/Appwrite/Platform/Workers/StatsUsage.php	2025-05-27 13:36:23 +12:00
Jake Barnby	d9a02fc0fa	Merge branch '1.7.x' into chore-cli-release	2025-05-26 13:53:45 +00:00
Matej Bačo	44e16ce98d	Fix commit URLs max length	2025-05-26 12:56:23 +02:00
Jake Barnby	2a5ecb2547	Release cli	2025-05-26 22:25:12 +12:00
Jake Barnby	ab97b7cc54	Merge pull request #9877 from appwrite/revert-9871-feat-sync ... Revert "Feat sync encrypt updates"	2025-05-26 21:37:41 +12:00
Jake Barnby	b7d0c127a3	Revert "Merge pull request #9878 from ArnabChatterjee20k/dat-532" ... This reverts commit a366feba80, reversing changes made to 484988fcd7.	2025-05-26 21:37:21 +12:00
Darshan	64baf1071d	fix: wrong variable passed to cache purge.	2025-05-26 11:38:22 +05:30
Darshan	856a9a714b	fix: memberships patch and delete logic.	2025-05-26 11:29:46 +05:30
Jake Barnby	86f7489640	Internal ID -> sequence	2025-05-26 17:42:11 +12:00
Jake Barnby	c51cf2f3e4	Merge pull request #9878 from ArnabChatterjee20k/dat-532 ... updated errro for the string encryption	2025-05-26 17:37:57 +12:00
Jake Barnby	a616aa0e93	Revert "Merge pull request #9877 from appwrite/revert-9871-feat-sync" ... This reverts commit 1a0e82b4e4, reversing changes made to 8bc5117259.	2025-05-26 17:36:55 +12:00
Darshan	24e0b3e8cb	fix: missing project check.	2025-05-25 12:19:52 +05:30
Christy Jacob	28d2ed1baa	Revert "Feat sequence"	2025-05-23 21:39:56 +04:00
Jake Barnby	a366feba80	Merge pull request #9878 from ArnabChatterjee20k/dat-532 ... updated errro for the string encryption	2025-05-23 15:27:35 +00:00
ArnabChatterjee20k	49f8369fdd	updated the message	2025-05-23 20:45:36 +05:30
ArnabChatterjee20k	6af9d1206d	added a constant	2025-05-23 20:41:08 +05:30
ArnabChatterjee20k	14fe7a3293	updated errro for the string encryption	2025-05-23 20:35:59 +05:30
Jake Barnby	70feb72de0	Revert "Feat sync encrypt updates"	2025-05-24 03:04:46 +12:00
Jake Barnby	d27dba05d2	Merge pull request #9841 from ArnabChatterjee20k/dat-532 ... added checking for encrypt and plan allowing encryption of string att…	2025-05-23 23:54:18 +12:00
Jake Barnby	1a2a725cb0	Merge pull request #9868 from ArnabChatterjee20k/dat-532 ... added encrypt property in the attribute string response model	2025-05-23 23:53:23 +12:00
Darshan	a413a613f5	Merge branch 'main' into feat-sequence	2025-05-23 15:35:39 +05:30
Jake Barnby	5eab81cf03	Merge pull request #9868 from ArnabChatterjee20k/dat-532 ... added encrypt property in the attribute string response model	2025-05-23 09:03:42 +00:00
ArnabChatterjee20k	b8cb6f281d	linting	2025-05-23 14:19:00 +05:30
ArnabChatterjee20k	7c760e4b07	linting	2025-05-23 14:16:35 +05:30
ArnabChatterjee20k	e586afceb7	updates	2025-05-23 14:11:57 +05:30
ArnabChatterjee20k	6ea3593921	updated collection filter	2025-05-23 13:40:56 +05:30
ArnabChatterjee20k	73764941b6	updated tests and collection method	2025-05-23 13:23:33 +05:30
Jake Barnby	587b84d04a	Merge remote-tracking branch 'origin/1.7.x' into feat-sequence	2025-05-23 19:40:57 +12:00
ArnabChatterjee20k	1d0577b07d	added encrypt to the get and list atttributes	2025-05-23 12:51:59 +05:30
ArnabChatterjee20k	0cccb75273	added encrypt property in the attribute string response model	2025-05-23 12:05:42 +05:30
Jake Barnby	04a9b0be34	Fix replace	2025-05-23 03:29:44 +12:00
Jake Barnby	71e3446498	Change internal ID to sequence	2025-05-23 02:55:29 +12:00
Christy Jacob	9df0045024	Merge pull request #9861 from appwrite/fix-cname-validation ... Fix: CNAME validation	2025-05-22 14:15:27 +04:00
Matej Bačo	67a5192705	Fix CNAME validation	2025-05-22 10:13:12 +02:00
Fabian Gruber	128dc1d946	fix: send deploymentResourceType in rules verification	2025-05-22 10:05:45 +02:00
Jake Barnby	86b64fdee8	Merge pull request #9845 from appwrite/feat-sync-1.6.x ... Sync 1.6.x	2025-05-21 09:59:56 +00:00
Fabian Gruber	ba3f907028	fix(storage): do not allow full range ... This prevents requests with `Range: 0-<file length>` and limits it to APP_STORAGE_READ_BUFFER	2025-05-21 10:57:58 +02:00
Jake Barnby	3ec0f08db1	Merge remote-tracking branch 'origin/1.6.x' into feat-sync-1.6.x ... # Conflicts: # composer.lock # src/Appwrite/Messaging/Adapter/Realtime.php # src/Appwrite/Platform/Workers/Deletes.php	2025-05-21 20:15:08 +12:00
ArnabChatterjee20k	c4df1c8c4b	updated exception type	2025-05-21 13:34:08 +05:30
ArnabChatterjee20k	82fd8553bf	updated the condition	2025-05-21 13:29:24 +05:30
ArnabChatterjee20k	9fa6deae61	reverted the tests and updated the plan checking condition	2025-05-21 13:14:22 +05:30
Jake Barnby	20f2cbffda	Merge pull request #9811 from ArnabChatterjee20k/upsert-single-document-route ... Upsert single document route	2025-05-21 19:29:31 +12:00
Chirag Aggarwal	fe5419401a	chore: use unique filename for health check	2025-05-21 07:28:25 +00:00
ArnabChatterjee20k	f534b9e460	added checking for encrypt and plan allowing encryption of string attribute	2025-05-21 11:00:01 +05:30
Jake Barnby	9f14f1152a	Update app/controllers/api/databases.php	2025-05-21 02:22:51 +12:00
Jake Barnby	bc34f95646	Update lock	2025-05-21 01:13:08 +12:00
Jake Barnby	fe763093df	Catch query exception on get document for selects	2025-05-21 00:58:32 +12:00
ArnabChatterjee20k	c5a08b69b0	changed custom id to uid	2025-05-20 18:14:51 +05:30
Jake Barnby	bc5343b559	Apply suggestions from code review	2025-05-20 23:27:31 +12:00
Christy Jacob	5e10670d22	Merge pull request #9831 from appwrite/fix-download-endpoint ... fix: download endpoint	2025-05-20 14:21:55 +04:00
loks0n	455554a6a2	fix: download endpoint	2025-05-20 11:14:16 +01:00
Jake Barnby	534096cac6	Merge branch '1.6.x' into feat-pool-adapter	2025-05-20 07:07:58 +00:00
ArnabChatterjee20k	9f50f0c04a	Merge branch 'main' into upsert-single-document-route	2025-05-20 12:14:42 +05:30
ArnabChatterjee20k	53e790d886	changed uid to custom id to allow unique values as well	2025-05-20 10:54:09 +05:30
ArnabChatterjee20k	256aa684a2	updated tests	2025-05-19 15:59:38 +05:30
Darshan	fc279cb30c	remove: search from deployments.	2025-05-19 15:12:50 +05:30
ArnabChatterjee20k	1de778443f	resolved comments for the api	2025-05-19 14:30:29 +05:30
ArnabChatterjee20k	08478b8d39	removed document existence check for the document id ... updated labels added tests for upserts	2025-05-19 13:56:11 +05:30
ArnabChatterjee20k	330c298c58	add upsert route for a single document	2025-05-19 12:10:42 +05:30
Matej Bačo	8170661012	Fix domain validaiton	2025-05-18 20:51:52 +02:00
Jake Barnby	d577fd1294	Sync 1.6.x	2025-05-17 20:23:46 +12:00
Jake Barnby	5a0e94ae18	Format	2025-05-17 03:44:26 +12:00
Jake Barnby	ea0a7ce485	Fix specs	2025-05-17 03:40:51 +12:00
Jake Barnby	38a2ec0a2f	Merge pull request #9767 from appwrite/fix-db-exceptions ... Only rethrow auth and timeout in general handler	2025-05-16 01:10:24 +00:00
Matej Bačo	c5d4173923	Merge branch '1.6.x' into 1.7.x	2025-05-15 18:27:56 +02:00
Matej Bačo	ac6450c726	Merge branch '1.6.x' into 1.7.x	2025-05-15 18:03:15 +02:00
Steven Nguyen	8de9b7ffb2	Merge pull request #9765 from appwrite/fix-owner-downgrade ... Fix owner role downgrade	2025-05-15 08:30:18 -07:00
Fabian Gruber	d28831632e	Swap default image quality to -1, keeping source image quality. (#9766)	2025-05-15 14:45:24 +02:00
Jake Barnby	6e40070b98	Lint	2025-05-16 00:35:21 +12:00
Jake Barnby	738e256692	Remove redundant catches	2025-05-16 00:25:23 +12:00
Jake Barnby	4f2142a470	Lint	2025-05-16 00:22:52 +12:00
Eldad A. Fux	23d73e1f3e	Merge pull request #9750 from appwrite/update-tokens ... Update tokens without JWT	2025-05-15 14:19:41 +02:00
Jake Barnby	11e4e9432e	Fix tests	2025-05-16 00:14:09 +12:00
Jake Barnby	b1829bacfe	Only rethrow auth and timeout in general handler	2025-05-15 23:33:00 +12:00
Darshan	ad3adbda21	fix: owner downgrade.	2025-05-15 14:08:54 +05:30
Chirag Aggarwal	fe767e9655	chore: accent color	2025-05-15 07:44:14 +00:00
Steven Nguyen	fdbc01aa3d	Merge pull request #9733 from appwrite/pla-1849 ... chore: improve route not found error message	2025-05-14 07:06:22 -07:00
Shimon Newman	e08133976b	fix metrics name in databases usage api (#9760)	2025-05-14 14:57:41 +02:00
Chirag Aggarwal	52fdeccd11	Merge branch '1.6.x' into pla-1849	2025-05-14 18:02:05 +05:30
Jake Barnby	16b2449787	Revert "Merge pull request #9703 from appwrite/revert-9659-feat-pool-adapter" ... This reverts commit bf9deb09f5, reversing changes made to d312fe22ff. # Conflicts: # app/cli.php # app/init/registers.php # composer.lock # src/Appwrite/Messaging/Adapter/Realtime.php # src/Appwrite/Platform/Tasks/ScheduleBase.php # src/Appwrite/Platform/Tasks/ScheduleExecutions.php # src/Appwrite/Platform/Tasks/ScheduleFunctions.php # src/Appwrite/Platform/Tasks/ScheduleMessages.php	2025-05-14 18:14:07 +12:00
Darshan	af4d1a8264	update: comment.	2025-05-14 10:47:32 +05:30
Chirag Aggarwal	a2686b4a8d	Merge branch '1.7.x' into feat-logo-url	2025-05-14 03:21:45 +00:00
ArnabChatterjee20k	4208c52c7f	reverted overriding index size for index attribute	2025-05-13 18:21:58 +05:30
Darshan	b302b5416d	Merge branch '1.7.x' into fix-templates	2025-05-13 17:52:57 +05:30
ArnabChatterjee20k	f8fdecaa2d	made the code a bit simpler	2025-05-13 17:40:04 +05:30
ArnabChatterjee20k	41d7114e97	updated composer and index api	2025-05-13 17:37:15 +05:30
Darshan	942b81053d	address comments.	2025-05-13 16:23:29 +05:30
Darshan	f01bfc842b	Merge branch '1.7.x' into update-tokens	2025-05-13 16:16:46 +05:30
Darshan	52a128cfaa	fix: tests; add: params for sdks.	2025-05-13 16:14:29 +05:30
arnab	cd806e80d7	updated tests and validations	2025-05-13 15:39:13 +05:30
Matej Bačo	af0c872999	Merge branch '1.6.x' into 1.7.x	2025-05-13 10:11:39 +02:00
arnab	a970512e3c	added length param, response model, e2e test	2025-05-13 10:35:04 +05:30
Chirag Aggarwal	980afc2eaf	chore: update social links	2025-05-12 13:20:59 +00:00
Chirag Aggarwal	a802a78b0b	feat: plan based email logoUrl	2025-05-12 13:10:58 +00:00
Darshan	bc556c559f	Merge branch '1.7.x' into 'lazy-load-relationships'.	2025-05-11 14:56:40 +05:30
Chirag Aggarwal	b0e95171f8	chore: update react native and generate sdk	2025-05-10 14:29:11 +00:00
Darshan	e1c5b3f59e	Merge branch '1.7.x' into database-aliases	2025-05-10 09:38:17 +05:30
Chirag Aggarwal	21273c8336	fix: undefined classname	2025-05-09 10:57:45 +00:00
Chirag Aggarwal	f91ec238b9	chore: introduce class attribute to oauth2 config	2025-05-09 10:09:16 +00:00
Darshan	36e6617090	update: the usage modals.	2025-05-08 19:47:35 +05:30
Jake Barnby	6f39c9d147	Update database	2025-05-09 00:11:54 +12:00
Jake Barnby	9c50d60350	Handle upsert usage	2025-05-08 21:08:23 +12:00
Jake Barnby	540102ff97	Explicitly catch exceptions	2025-05-08 18:10:26 +12:00
Jake Barnby	c3f0bec1ff	Validate nested internals	2025-05-08 18:09:37 +12:00
Jake Barnby	1e19e7d0b4	Remove permissions + relationships logic from bulk update/delete	2025-05-08 02:59:04 +12:00
Jake Barnby	be7ea1f798	Add bulk upsert route	2025-05-08 02:49:02 +12:00
Darshan	b534d3843e	Merge branch '1.7.x' into database-aliases	2025-05-07 17:03:17 +05:30
Jake Barnby	b44682b6ff	Doc updates	2025-05-07 21:23:16 +12:00
Jake Barnby	fdc98389b1	Return total as modified count	2025-05-07 16:22:15 +12:00
Jake Barnby	05821c2993	Fix conditional	2025-05-07 15:46:17 +12:00
Jake Barnby	5f19398a9b	Accumulate up to limit	2025-05-07 15:45:58 +12:00
Jake Barnby	41ecccda1e	Revert "Fix tests for model changes" ... This reverts commit f5d243e229. # Conflicts: # app/controllers/api/databases.php	2025-05-07 15:45:46 +12:00
Jake Barnby	572c49cc90	Revert "Don't accumulate docs on update/delete" ... This reverts commit 8c1b9044b3. # Conflicts: # app/controllers/api/databases.php	2025-05-07 15:44:58 +12:00
Jake Barnby	f7d7b8d3dd	Merge remote-tracking branch 'origin/1.6.x' into feat-bulk-operations	2025-05-07 15:14:13 +12:00
Jake Barnby	f5d243e229	Fix tests for model changes	2025-05-07 15:14:05 +12:00
Jake Barnby	8c1b9044b3	Don't accumulate docs on update/delete	2025-05-07 03:10:13 +12:00
Jake Barnby	af09f17e02	Max 1 operation	2025-05-06 22:05:59 +12:00
Chirag Aggarwal	f905c10acc	chore: add harden create email token endpoint	2025-05-06 07:18:23 +00:00
Jake Barnby	af51e31197	Remove debug headers	2025-05-06 13:45:18 +12:00
Jake Barnby	66a40eb175	AI review fixes	2025-05-06 02:21:45 +12:00
Jake Barnby	4b1dba692c	Min 1 operation	2025-05-06 01:02:07 +12:00
Jake Barnby	f52f864085	Get limit directly from plan	2025-05-05 15:04:32 +12:00
Darshan	f13a28cf6d	Merge branch '1.7.x' into fix-templates	2025-05-04 19:08:06 +05:30
Darshan	57a9218649	remove: database controller 👋	2025-05-04 18:10:09 +05:30
Darshan	286c695b47	add: move and register row modules.	2025-05-04 17:52:29 +05:30
Darshan	3271ef5769	update: move Index ops to module.	2025-05-04 17:16:37 +05:30
Darshan	8efc1543e9	update: move Table ops to module.	2025-05-04 17:05:14 +05:30
Darshan	1945a64083	update: move DB ops to module.	2025-05-04 14:08:10 +05:30
Darshan	9c1ec6fe02	update: move the init hook.	2025-05-04 13:37:25 +05:30
Darshan	b3b9961860	init: move to module structure for database; start with columns.	2025-05-04 13:22:26 +05:30
Darshan	0a12b561c8	update: remove unneeded change.	2025-05-02 19:51:38 +05:30
Darshan	22174bec0e	attempt: conditional doc fetch.	2025-05-02 12:38:48 +05:30
Darshan	50448126a9	Merge branch '1.7.x' into 'lazy-load-relationships'.	2025-05-01 20:00:32 +05:30
Darshan	e7e38c57f7	revert: changes to original.	2025-05-01 19:51:11 +05:30
Jake Barnby	c759f9ec11	Revert "Feat pool adapter"	2025-04-30 23:24:54 +12:00
Jake Barnby	7b88792b6a	Accumulate documents	2025-04-30 17:40:54 +12:00
Jake Barnby	27ac5cbb2a	Remove redundant withTimestamp	2025-04-30 17:40:47 +12:00
Darshan	61d583c32e	update: add resourceToken usage to getFileDownload as well.	2025-04-30 09:45:43 +05:30
Jake Barnby	f2270b9ef8	Add read/write counts for bulk operations	2025-04-30 14:22:48 +12:00
Jake Barnby	38f5d88b03	Remove unused param	2025-04-30 12:44:15 +12:00
Jake Barnby	f82726c2b4	Remove redundant batch size passing	2025-04-30 12:08:38 +12:00
Jake Barnby	0ab1ebd8c4	Validate create batch size inline	2025-04-30 12:07:56 +12:00
Jake Barnby	2238f6d822	Merge remote-tracking branch 'origin/1.6.x' into feat-bulk-operations ... # Conflicts: # app/config/specs/open-api3-1.6.x-client.json # app/config/specs/open-api3-1.6.x-console.json # app/config/specs/open-api3-1.6.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.6.x-client.json # app/config/specs/swagger2-1.6.x-console.json # app/config/specs/swagger2-1.6.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 # src/Appwrite/Specification/Format/Swagger2.php	2025-04-30 10:45:18 +12:00
Eldad Fux	0483c7efb5	Merge fixes	2025-04-29 20:44:05 +02:00
Eldad Fux	fb29fe7b3c	Merge remote-tracking branch 'origin/1.7.x' into feat-apps-module	2025-04-29 20:12:31 +02:00
Darshan	74dca5b60c	Merge branch '1.7.x' into fix-missing-filter	2025-04-29 18:31:48 +05:30
Darshan	4a8f400f7e	add: token usage on view endpoint as well.	2025-04-29 16:23:48 +05:30
Jake Barnby	e643e7a406	Lint	2025-04-29 21:33:51 +12:00
Jake Barnby	acec1ab699	Use pool adapters in health api	2025-04-29 21:28:25 +12:00
Jake Barnby	eabf3993a0	Use pool adapter on project create	2025-04-29 18:13:30 +12:00
Darshan	6ffe620c57	attempt: fixes, changes.	2025-04-28 15:36:30 +05:30
Jake Barnby	4d2a08e7fd	Merge branch '1.6.x' into feat-pool-adapter	2025-04-28 10:02:55 +00:00
Jake Barnby	6caa347b26	Merge remote-tracking branch 'origin/1.6.x' into feat-pool-adapter ... # Conflicts: # composer.lock # src/Appwrite/Messaging/Adapter/Realtime.php	2025-04-28 21:56:45 +12:00
Darshan	949f58522d	change: events system.	2025-04-27 10:33:44 +05:30
Darshan	814be66b98	update: use new terminologies on path params and local variables.	2025-04-26 16:05:07 +05:30
Fabian Gruber	270250a563	review feedback	2025-04-25 16:25:26 +02:00
Fabian Gruber	9601860247	feat(users): synchronously delete identities and targets in controller	2025-04-25 15:55:10 +02:00
Matej Bačo	23c4fa27be	Fix tests, linter	2025-04-25 12:57:45 +02:00
Christy Jacob	2afbfea0d0	Merge pull request #9638 from appwrite/fix-zero-specifications ... fix(functions): treat 0 as unlimited for CPUs and memory	2025-04-25 14:49:04 +04:00
Matej Bačo	0787034bab	Fixes post-1.6.x-merge	2025-04-25 12:26:10 +02:00
Matej Bačo	d8103cb57e	Merge branch '1.7.x' into 1.6.x	2025-04-25 12:18:04 +02:00
Christy Jacob	de9b0e6eee	Revert "Add configurable function and build size"	2025-04-23 21:18:04 +05:30
Christy Jacob	6b4ecbcd23	fix: ensure all 4xx errors in OAuth redirect lead to the failure URL	2025-04-23 18:39:55 +04:00
Christy Jacob	4228bc9b63	Merge pull request #9574 from appwrite/chore-sensitive-check ... chore: abstract token secret hiding to response model	2025-04-22 17:18:11 +04:00
Matej Bačo	d5cb9d0f1f	Merge branch '1.7.x' into feat-tokens-module	2025-04-22 12:25:51 +02:00
Matej Bačo	fd0d891d45	Merge pull request #8378 from appwrite/feat-development-keys ... Development Keys	2025-04-22 12:22:12 +02:00
Matej Bačo	8906d94e8f	Merge pull request #9648 from appwrite/feat-add-configurable-function-size ... Add configurable function and build size	2025-04-22 10:51:29 +02:00
Chirag Aggarwal	1065f27a44	Merge branch '1.7.x' into feat-tokens-module	2025-04-21 19:28:27 +05:30
Darshan	927489bc5b	update: handle decryption as well.	2025-04-21 12:04:36 +05:30
Darshan	873b384f70	update: allow compressed files.	2025-04-21 10:01:13 +05:30
Chirag Aggarwal	6d0d15f469	Merge branch '1.7.x' into feat-tokens-module	2025-04-18 16:01:06 +00:00
Chirag Aggarwal	d130e7d3bd	chore: add stricter checks according to review	2025-04-18 15:32:25 +00:00
Christy Jacob	f4e8d72593	Merge branch '1.6.x' into feat-group	2025-04-17 18:25:47 +04:00
Matej Bačo	9993cca484	Merge branch '1.7.x' into feat-development-keys	2025-04-17 15:51:31 +02:00
Jake Barnby	cc20484131	Merge remote-tracking branch 'origin/1.6.x' into feat-pool-adapter ... # Conflicts: # composer.lock	2025-04-18 00:00:55 +12:00
Matej Bačo	cd9a2b761c	Merge branch '1.7.x' into feat-sites	2025-04-17 12:13:06 +02:00
Chirag Aggarwal	b2dffe4057	Merge branch '1.7.x' into feat-tokens-module	2025-04-17 06:19:18 +00:00
Darshan	767e202b34	update: name.	2025-04-17 10:54:23 +05:30
Jake Barnby	cd72d70432	Merge remote-tracking branch 'origin/1.6.x' into feat-bulk-operations	2025-04-17 17:09:51 +12:00
Jake Barnby	70364d7a07	Format	2025-04-17 17:09:08 +12:00
Jake Barnby	03cae4c5ee	Pool use project create	2025-04-17 16:49:12 +12:00
ArnabChatterjee20k	b2f7ed48dd	Simplify constructor usage by inlining message; limit try/catch to DB operations	2025-04-17 10:16:26 +05:30
Darshan	cc7d038c3e	address comments: change deviceForCsvImports to deviceForImports.	2025-04-17 08:54:50 +05:30
Jake Barnby	28addd6702	Merge remote-tracking branch 'origin/1.6.x' into feat-pool-adapter ... # Conflicts: # app/controllers/api/health.php	2025-04-17 13:34:30 +12:00
arnab	ecd77cb2e3	added order exception in projects and vcs	2025-04-16 17:53:39 +05:30
arnab	8d3070416a	added order exception in rest of the controllers	2025-04-16 17:29:36 +05:30
arnab	6e422ebe3c	added teams and users order exception	2025-04-16 17:16:39 +05:30
arnab	3c602e84e6	added order exception in teams	2025-04-16 17:09:53 +05:30
arnab	1cacb87c65	added order query exception handling in the storage	2025-04-16 17:09:13 +05:30
arnab	8e4bd363d2	added catching of order exception in database controllers	2025-04-16 17:03:14 +05:30
Darshan	73b2a14ea3	update: changes as per migrations lib.	2025-04-16 11:55:04 +05:30
Chirag Aggarwal	c1f62ce0bd	Merge branch '1.6.x' into feat-group	2025-04-16 04:49:07 +00:00
Jake Barnby	49ea2f6fd9	Merge remote-tracking branch 'origin/1.6.x' into feat-pool-adapter ... # Conflicts: # app/controllers/api/projects.php # composer.json # composer.lock # src/Appwrite/Platform/Workers/Deletes.php	2025-04-15 22:21:01 +12:00
Matej Bačo	2669e66ae2	Merge pull request #9597 from appwrite/fix-usage-sites ... Fix: usage stats changes	2025-04-15 11:26:02 +02:00
Chirag Aggarwal	3ed87a8ab9	chore: update endpoint descriptions to follow CRUD naming	2025-04-14 18:40:48 +00:00
Khushboo Verma	5d9bdd4cc7	Update app/controllers/api/functions.php ... Co-authored-by: Matej Bačo <matejbacocom@gmail.com>	2025-04-14 19:53:39 +05:30
Khushboo Verma	81c3d96629	Consistent naming	2025-04-14 14:00:44 +00:00
Khushboo Verma	f02707627f	Refactor	2025-04-14 12:16:50 +00:00
loks0n	944624f13a	chore: fmt	2025-04-14 12:59:39 +01:00
loks0n	0a4c430ae7	feat: exp scheme	2025-04-14 12:56:42 +01:00
Khushboo Verma	3f0857b36d	Add plan to create deployment	2025-04-14 10:28:29 +00:00
Darshan	91199e746b	update: use plain csv, use options.	2025-04-14 15:03:30 +05:30
Chirag Aggarwal	74abf4897b	chore: fix teamCreateMembership	2025-04-14 08:47:57 +00:00
Damodar Lohani	5f6e65c1aa	Merge branch 'feat-usage-dump-multi-tenant-batch' into fix-merge-stats-usage-and-dump	2025-04-13 09:47:45 +05:45
Damodar Lohani	932f34df92	Merge branch '1.6.x' into feat-usage-dump-multi-tenant-batch	2025-04-13 09:47:30 +05:45
Damodar Lohani	fb7223bd1b	Merge branch 'feat-usage-dump-multi-tenant-batch' into fix-merge-stats-usage-and-dump	2025-04-13 09:30:51 +05:45
Chirag Aggarwal	b1685a5ca1	chore: update users auth group to sessions	2025-04-12 13:38:00 +00:00
Darshan	a64b8e57af	address comments.	2025-04-12 17:10:06 +05:30
Chirag Aggarwal	c3656fd4e7	Merge branch '1.6.x' into feat-group	2025-04-12 06:50:20 +00:00
Chirag Aggarwal	b3c9e6181f	chore: update groups	2025-04-12 06:50:02 +00:00
Chirag Aggarwal	04733e25c8	chore: make group nullable and remove it from endpoints where its not required	2025-04-12 06:41:57 +00:00
Steven Nguyen	b431eb4a51	fix(functions): treat 0 as unlimited for CPUs and memory ... Prior versions of Appwrite treated 0 as unlimited for _APP_FUNCTIONS_CPUS and _APP_FUNCTIONS_MEMORY. As such, this PR updates the specification validator and the list specifications endpoint to also treat the default 0 value as unlimited, allowing any specification.	2025-04-11 12:13:06 -07:00
Shimon Newman	c4a506445d	Revert "Revert "Multi region support""	2025-04-11 17:52:19 +03:00
Christy Jacob	ffe153630d	Revert "Multi region support"	2025-04-10 22:19:23 +05:30
shimon	fb802c7fe4	addressing comments	2025-04-10 18:35:45 +03:00
shimon	ff89da513f	addressing comments	2025-04-10 17:20:05 +03:00
Darshan	624538fcaf	revert: local dockerfile change.	2025-04-09 16:35:27 +05:30
Chirag Aggarwal	5a5d1752f9	Merge branch '1.7.x' into feat-development-keys	2025-04-09 09:02:20 +00:00
Jake Barnby	cfab30b43f	Merge remote-tracking branch 'origin/1.6.x' into feat-bulk-operations ... # Conflicts: # app/init/resources.php	2025-04-09 16:31:52 +12:00
Matej Baco	2689cceb71	Implement A/AAAA custom domain support	2025-04-08 14:48:50 +00:00
Darshan	130024e0ef	Merge branch '1.7.x' into csv-import	2025-04-08 14:25:01 +05:30