fogelito
31d17fb0c3
Merge branch '1.8.x' of https://github.com/appwrite/appwrite into joins2
...
# Conflicts:
# app/controllers/api/messaging.php
# app/controllers/api/teams.php
# app/controllers/api/users.php
# composer.lock
# phpunit.xml
# src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Create.php
# src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Logs/XList.php
# src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Logs/XList.php
# src/Appwrite/Platform/Modules/Databases/Http/Databases/Logs/XList.php
# src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Logs/XList.php
# src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Logs/XList.php
# src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Logs/XList.php
# src/Appwrite/Utopia/Database/Validator/Queries/Base.php
# src/Appwrite/Utopia/Response/Model/Document.php
# src/Appwrite/Utopia/Response/Model/Row.php
# tests/e2e/Services/Databases/DatabasesBase.php
# tests/e2e/Services/Databases/Legacy/DatabasesConsoleClientTest.php
# tests/e2e/Services/Databases/Legacy/DatabasesCustomServerTest.php
# tests/e2e/Services/Databases/TablesDB/DatabasesBase.php
# tests/e2e/Services/Databases/TablesDB/DatabasesCustomServerTest.php
# tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
2026-03-02 14:47:33 +02:00
Hemachandar
76965252d8
Move teams API to Modules ( #11358 )
...
* Move teams API to Modules
* lint
* Move team prefs & logs API to Modules (#11359 )
* Move team prefs & logs API to Modules
* format
* missin desc
* Move team memberships API to Modules (#11362 )
* Move team memberships API to Modules
* fix config dir
* Cloud parity
* params
* Cloud conflicts
* refactor
* prop
* refactor
* set teamId
* feedback
* feedback 2
* fix url-encoding
2026-02-26 11:18:29 +05:30
Jake Barnby
1cb7c4b3f6
Merge remote-tracking branch 'origin/1.8.x' into feat-mongodb
...
# Conflicts:
# .gitignore
# composer.lock
# tests/e2e/Services/Teams/TeamsCustomClientTest.php
2026-02-24 14:06:57 +13:00
Matej Bačo
2b6b66d8a4
Remove html encoding for urls
2026-02-23 12:45:18 +01:00
Matej Bačo
e2bc3afce6
Fix url params in redirect URLs
2026-02-20 11:15:59 +01:00
Jake Barnby
b645721e14
fix: resolve CI failures from 1.8.x merge
...
- Remove unused WhiteList import in teams.php (linter fix)
- Add missing $teamId and $newTeam params to setupProject() in ProjectsBase.php (fixes 401 errors in all Projects tests)
- Filter execution logs by requestPath in testSSRLogs to avoid picking up screenshot worker executions
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com >
2026-02-20 02:46:23 +13:00
Jake Barnby
8a6ddeef30
Merge branch '1.8.x' into feat-mongodb
2026-02-20 01:33:02 +13:00
Hemachandar
14e79f34db
Populate project-specific roles ( #11209 )
...
* Populate project-specific roles
* better comments
* simplify
* privileged user
* update permissions
* feedback
* lint
* only read + cleanup
* fix role length
* scopes
* not api-key
* cl-ignore group
* rename
* ciIgnore
* base scope
* change base scope
* fix projects
* copilot suggestion
2026-02-19 16:48:39 +05:30
Jake Barnby
c9aa80473d
fix: Correct import ordering for WhiteList in teams controller
...
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com >
2026-02-13 02:47:45 +13:00
Jake Barnby
0e6fa7f300
fix: Add missing WhiteList import in teams controller
...
The WhiteList validator was used at lines 486 and 1090 but never imported,
causing a "Class not found" error and 500 response instead of proper validation.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com >
2026-02-13 02:36:29 +13:00
Jake Barnby
5590f0bcd0
Merge remote-tracking branch 'origin/1.8.x' into feat-mongodb
...
# Conflicts:
# .env
# .github/workflows/tests.yml
# app/controllers/api/projects.php
# app/controllers/api/teams.php
# app/init/registers.php
# app/views/install/compose.phtml
# composer.json
# composer.lock
# docker-compose.yml
# src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Create.php
# src/Appwrite/Platform/Tasks/Install.php
# src/Appwrite/Platform/Tasks/Upgrade.php
# tests/e2e/Services/Databases/Legacy/DatabasesBase.php
# tests/e2e/Services/Databases/TablesDB/DatabasesBase.php
2026-02-12 23:35:21 +13:00
fogelito
1a3c4d7b6c
Merge branch '1.8.x' of https://github.com/appwrite/appwrite into joins2
...
# Conflicts:
# composer.json
# composer.lock
2026-02-11 15:22:11 +02:00
Chirag Aggarwal
2d05d608f4
Upgrade utopia-php dependencies and fix namespace changes
...
- Upgrade utopia-php/cli from 0.15 to 0.22
- Upgrade utopia-php/analytics from 0.10 to 0.15
- Upgrade utopia-php/orchestration from 0.9 to 0.19
- Use dev branches for utopia-php/framework and utopia-php/platform
- Remove utopia-php/swoole dependency (merged into framework)
- Migrate Utopia\CLI\Console to Utopia\Console across all files
- Migrate Utopia\Http to Utopia\Http\Http namespace
- Migrate Utopia\Swoole\Files to Utopia\Http\Files (now instance-based)
- Convert static CLI::setResource() calls to instance-based Dependency API
- Fix StatsResources task named parameter mismatch
2026-02-10 10:34:24 +05:30
fogelito
affe208d1a
Merge branch '1.8.x' of https://github.com/appwrite/appwrite into joins2
...
# Conflicts:
# app/controllers/api/vcs.php
# composer.lock
2026-02-08 10:56:27 +02:00
Jake Barnby
801befeacd
Merge branch '1.8.x' into get-cursor-queries
2026-02-06 05:59:48 +00:00
Hemachandar
107fadfe37
Merge branch '1.8.x' into ser-539-modules
2026-02-05 15:00:52 +05:30
Jake Barnby
0a53c677b1
Merge branch '1.8.x' into joins2
2026-02-05 07:29:47 +00:00
Jake Barnby
e70739a3c0
Merge remote-tracking branch 'origin/1.8.x' into feat-mongodb
...
# Conflicts:
# Dockerfile
# app/controllers/api/account.php
# app/controllers/api/avatars.php
# app/controllers/api/console.php
# app/controllers/api/projects.php
# app/controllers/api/storage.php
# app/controllers/api/teams.php
# app/http.php
# app/init/database/filters.php
# app/init/registers.php
# app/init/resources.php
# app/views/install/compose.phtml
# composer.json
# composer.lock
# docker-compose.yml
# src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Integer/Update.php
# 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/Platform/Modules/Databases/Http/Databases/Collections/Documents/Upsert.php
# src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Update.php
# src/Appwrite/Platform/Modules/Databases/Http/Databases/Update.php
# src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Integer/Update.php
# src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Bulk/Update.php
# src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Update.php
# src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Upsert.php
# src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Update.php
# src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Update.php
# src/Appwrite/Platform/Modules/Functions/Http/Deployments/XList.php
# src/Appwrite/Platform/Tasks/Install.php
# tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
2026-02-05 01:01:03 +13:00
Chirag Aggarwal
1eaf5d5ffa
replace app usage with http
2026-02-04 11:22:04 +05:30
fogelito
66babf9dae
Merge branch '1.8.x' of https://github.com/appwrite/appwrite into joins2
...
# Conflicts:
# composer.lock
2026-02-02 13:37:49 +02:00
Hemachandar
1110fdb719
Add appendVariables method to Mail event ( #11166 )
...
* Add `addVariable` method to Mail event
* append variables
* Update template
2026-01-30 15:20:53 +05:30
Hemachandar
2144f27059
lint + feedback
2026-01-30 14:36:38 +05:30
Hemachandar
01cc9bcd1f
Move project create & update APIs to Modules
2026-01-29 21:35:42 +05:30
fogelito
69e6c0afc0
getCursorQueries
2026-01-28 14:53:24 +02:00
Matej Bačo
e5ed7c835a
Merge branch '1.8.x' into chore-php-types
2026-01-21 14:43:22 +01:00
fogelito
64f4e081b5
Merge branch '1.8.x' of https://github.com/appwrite/appwrite into joins3
...
# Conflicts:
# src/Appwrite/Platform/Workers/Deletes.php
2026-01-18 09:06:11 +02:00
Matej Bačo
cda03f63ab
Support dual-writing for new schema features
2026-01-16 13:23:46 +01:00
Matej Bačo
1308706023
Merge branch '1.8.x' into chore-php-types
2026-01-15 15:52:51 +01:00
fogelito
a9233717b6
Merge branch '1.8.x' of https://github.com/appwrite/appwrite into joins3
...
# Conflicts:
# composer.lock
2026-01-15 16:39:00 +02:00
Damodar Lohani
991f5ff9fd
Catch exception
2026-01-15 13:19:34 +00:00
Damodar Lohani
e8d8373922
Fix: phone auth limit
2026-01-15 12:59:30 +00:00
Jake Barnby
2cfb5ecfd9
Reapply "Merge pull request #11130 from appwrite/feat-auth-instance"
...
This reverts commit 38687bc24e .
2026-01-15 04:08:00 +13:00
Jake Barnby
38687bc24e
Revert "Merge pull request #11130 from appwrite/feat-auth-instance"
...
This reverts commit c12cad80bb , reversing
changes made to 2a17429226 .
# Conflicts:
# composer.lock
2026-01-15 03:48:42 +13:00
Jake Barnby
5c915ef92f
Reapply "Merge pull request #11099 from appwrite/feat-auth-instance"
...
This reverts commit 321fc8ee70 .
2026-01-14 19:07:49 +13:00
Jake Barnby
321fc8ee70
Revert "Merge pull request #11099 from appwrite/feat-auth-instance"
...
This reverts commit a4734a5de7 , reversing
changes made to 15922fb88c .
# Conflicts:
# composer.lock
2026-01-14 02:37:17 +13:00
fogelito
638f7431b1
Merge branch 'feat-auth-instance' of https://github.com/appwrite/appwrite into joins2
...
# Conflicts:
# composer.json
# composer.lock
# src/Appwrite/Platform/Action.php
# src/Appwrite/Platform/Workers/Deletes.php
2026-01-13 09:56:37 +02:00
Matej Bačo
497e5f8d00
tests fixes
2026-01-10 16:57:23 +01:00
Matej Bačo
3d4b29e0f1
Merge branch '1.8.x' into chore-php-types
2026-01-10 16:42:38 +01:00
Matej Bačo
dad21a912e
PR review changes
2026-01-10 16:35:09 +01:00
Jake Barnby
7573ee75a2
Use authorization instance
2026-01-07 20:04:28 +13:00
Matej Bačo
eda189dbf1
AI review improvements
2025-12-29 13:24:26 +01:00
Matej Bačo
5f5d9b4fcb
Add async key cleanup
2025-12-29 09:04:47 +01:00
fogelito
a971976587
format
2025-12-21 17:01:17 +02:00
fogelito
9bee2f5a25
Types validator
2025-12-21 16:26:55 +02:00
Jake Barnby
dc85d44647
Revert "Refactor auth single instance"
2025-12-20 02:54:50 +13:00
Jake Barnby
13f4aa9a80
Merge remote-tracking branch 'origin/1.8.x' into refactor-auth-single-instance
...
# Conflicts:
# app/controllers/api/account.php
# app/controllers/api/vcs.php
# app/controllers/general.php
# app/controllers/shared/api.php
# app/init/resources.php
# composer.lock
# src/Appwrite/Platform/Modules/Console/Http/Resources/Get.php
# src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php
# src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php
# src/Appwrite/Platform/Workers/Migrations.php
2025-12-18 18:17:41 +13:00
Damodar Lohani
8baa5cb659
Merge remote-tracking branch 'origin/1.8.x' into feat-audits-upgrade
2025-12-17 08:59:05 +00:00
Damodar Lohani
801219374c
Fix queries
2025-12-15 02:50:21 +00:00
Damodar Lohani
0037305e16
Fix: failing tests
2025-12-15 02:12:35 +00:00
Damodar Lohani
f270e47b48
more fixes to audit queries
2025-12-14 07:50:21 +00:00