Commit Graph

273 Commits

Author SHA1 Message Date
Darshan 42c75c43de Merge branch '1.8.x' into feat-csv-export 2025-10-23 12:20:06 +05:30
Khushboo Verma 9c55da5b99 Resolve merge conflicts 2025-10-22 20:44:47 +05:30
Jake Barnby 215d55a997 Merge remote-tracking branch 'origin/1.8.x' into feat-csv-export
# Conflicts:
#	composer.json
#	composer.lock
2025-10-22 00:34:01 +13:00
Jake Barnby ddde13a78f Revert "Merge pull request #10468 from appwrite/feat-apps-module-dl"
This reverts commit 9dd1939d1f, reversing
changes made to 8dfdfcb522.

# Conflicts:
#	app/config/collections/common.php
#	app/controllers/api/users.php
#	app/init/resources.php
#	composer.lock
2025-10-21 14:59:30 +13:00
Damodar Lohani 248d3aea7a Fix: reset argon 2 options to previous default 2025-10-19 05:44:44 +00:00
Damodar Lohani 7ff664e62b Fix: undefined $user 2025-10-16 07:38:13 +00:00
Damodar Lohani 9849b9d678 Fix empty check 2025-10-16 02:41:53 +00:00
Damodar Lohani 22136867ed add additional check 2025-10-16 02:29:30 +00:00
Damodar Lohani 2df621f9c5 Fix: update comment, typings 2025-10-16 02:23:41 +00:00
Damodar Lohani 9a599e2015 update recommended param for argon2 2025-10-16 02:20:28 +00:00
Damodar Lohani 1b17c32405 update block 2025-10-12 03:51:37 +00:00
Damodar Lohani d56dff954f Merge remote-tracking branch 'origin/1.8.x' into feat-apps-module-dl 2025-10-12 00:34:07 +00:00
Jake Barnby 10b1f1f145 Merge remote-tracking branch 'origin/1.8.x' into feat-txn 2025-10-09 13:45:29 +13:00
Hemachandar 7f62b19240 Merge branch '1.8.x' into ser-375-update-email-verification-with-branded-design 2025-10-07 16:11:54 +05:30
Hemachandar caf18372ce feedback 2025-10-06 21:52:18 +05:30
Jake Barnby 01ef058adb Merge remote-tracking branch 'origin/1.8.x' into feat-txn
# Conflicts:
#	tests/e2e/Services/Realtime/RealtimeCustomClientTest.php
2025-10-04 17:03:52 +13:00
Matej Bačo b811fc6252 Merge pull request #10503 from appwrite/ser-10-oauth-auto-allow-site-domains
Auto-allow sites domain for OAuth
2025-10-03 10:15:05 +02:00
Jake Barnby 97f76899bf Merge remote-tracking branch 'origin/1.8.x' into feat-txn
# Conflicts:
#	app/config/platforms.php
2025-09-25 18:00:07 +12:00
Jake Barnby 97c5705447 Merge remote-tracking branch 'origin/1.8.x' into feat-csv-export 2025-09-23 19:17:49 +12:00
Chirag Aggarwal 232b22b71e use constants 2025-09-23 07:35:17 +05:30
Khushboo Verma 5d5c1d8f43 Fix Author URL in template deployments 2025-09-22 20:29:25 +05:30
Chirag Aggarwal c52081dbed fix: to use correct pattern 2025-09-22 19:58:18 +05:30
Chirag Aggarwal f09d5258ec use constants 2025-09-22 14:20:58 +05:30
Hemachandar 2f1046db2b fix tests 2025-09-22 12:10:55 +05:30
Hemachandar 2f768aa30d Merge branch '1.8.x' into ser-10-oauth-auto-allow-site-domains 2025-09-22 11:21:32 +05:30
Jake Barnby 9fde875904 Merge remote-tracking branch 'origin/1.8.x' into feat-txn
# Conflicts:
#	composer.lock
#	src/Appwrite/Platform/Workers/StatsResources.php
#	src/Appwrite/Platform/Workers/StatsUsage.php
2025-09-22 16:12:45 +12:00
Jake Barnby a0afce666f Merge remote-tracking branch 'origin/1.8.x' into feat-csv-export
# Conflicts:
#	composer.lock
2025-09-22 16:05:58 +12:00
Hemachandar 5fd2dfafb7 remove var_dump 2025-09-18 14:10:56 +05:30
fogelito 4da7f04a5c Add order by 2025-09-18 10:58:27 +03:00
fogelito a7e9e58312 Add order by 2025-09-18 10:57:47 +03:00
Hemachandar dedc7a35c9 remove debug output 2025-09-18 12:38:18 +05:30
Hemachandar 21f25b4ce4 Auto-allow sites domain for OAuth 2025-09-16 14:16:02 +05:30
Damodar Lohani 4579e41ace update check 2025-09-15 10:33:21 +00:00
Jake Barnby 981a1278e2 Merge remote-tracking branch 'origin/1.8.x' into feat-csv-export
# Conflicts:
#	composer.lock
2025-09-15 16:30:22 +12:00
Damodar Lohani 2be8895dfd Merge remote-tracking branch 'origin/1.8.x' into feat-apps-module-dl 2025-09-10 03:56:34 +00:00
Jake Barnby 7c3ba74710 Rename 2025-09-08 19:21:59 +12:00
Jake Barnby 812a09f556 Add read-your-write support 2025-09-06 04:26:49 +12:00
Jake Barnby 5702def9d2 Merge remote-tracking branch 'origin/1.8.x' into feat-txn
# Conflicts:
#	composer.lock
#	src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Upsert.php
#	tests/e2e/Services/Databases/Legacy/DatabasesBase.php
2025-09-04 04:00:57 +12:00
Jake Barnby 0c139721e4 Merge pull request #10356 from appwrite/spatial-type-attributes
Spatial type attributes
2025-09-04 01:40:58 +12:00
Jake Barnby 903e9b52c2 Fix size limit exception 2025-09-03 23:54:21 +12:00
loks0n 1b586bbc51 chore: revert scheduler & hook changes 2025-09-03 12:47:33 +01:00
loks0n 5423b63c8a refactor: prevent direct publisher calls 2025-09-03 12:10:34 +01:00
ArnabChatterjee20k 22b797165a Merge remote-tracking branch 'upstream/1.8.x' into spatial-type-attributes 2025-09-02 23:07:32 +05:30
Jake Barnby c9cf38d630 Add expired log deletion 2025-09-03 01:31:53 +12:00
ArnabChatterjee20k cfe9b34cd5 updated pr followups 2025-09-02 17:33:30 +05:30
Jake Barnby f836fbeba5 Merge remote-tracking branch 'origin/1.8.x' into feat-txn
# Conflicts:
#	src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Update.php
#	src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Update.php
#	src/Appwrite/Utopia/Response.php
2025-09-02 23:31:47 +12:00
loks0n 48c54bf5e8 chore: make webhooks publisher overridable 2025-09-01 18:06:12 +01:00
ArnabChatterjee20k ba0d334f80 Merge remote-tracking branch 'upstream/1.8.x' into spatial-type-attributes 2025-08-27 17:00:28 +05:30
Khushboo Verma a81d980334 Resolve merge conflicts 2025-08-27 12:54:22 +05:30
ArnabChatterjee20k 51b01ab803 Merge remote-tracking branch 'upstream/1.8.x' into spatial-type-attributes 2025-08-26 21:46:43 +05:30