Commit graph

8191 commits

Author SHA1 Message Date
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
Darshan
8ac0486e73 fix: route didn't include the params needed. 2025-07-23 15:10:27 +05:30
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
Chirag Aggarwal
e10f1eb10f handle case when there are multiple sdk methods 2025-07-22 17:27:09 +05:30
hmacr
bf3efea98d framework support + content for OTP & add-member email 2025-07-22 16:43:17 +05:30
Chirag Aggarwal
8018e7dd80 chore: review comments 2025-07-22 15:54:24 +05:30
Chirag Aggarwal
929c7a3d36 Merge branch '1.8.x' into deprecate-old-methods 2025-07-22 15:42:32 +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
Darshan
79bdf705d6 Merge branch '1.8.x' into 'bump-migrations'. 2025-07-18 10:57:29 +05:30
Darshan
40a6190844 update: log message with fallbacks. 2025-07-18 10:55: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
Darshan
ee317b0b8d Merge branch '1.8.x' into 'lazy-load-relationships'. 2025-07-17 18:15:16 +05:30
Steven Nguyen
477682e062
fix: prevent injected $user from being shadowed 2025-07-14 16:05:58 -07:00
Matej Bačo
8c57d28f8f
Merge pull request #10127 from appwrite/chore-speed-up-tests
Chore: speed up tests
2025-07-11 16:21:40 +02: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
Matej Bačo
e42275e0b7 Minify tests 2025-07-09 11:26:05 +02:00
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
4747700eae chore: add logging 2025-07-03 21:17:43 +05:30
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
Chirag Aggarwal
0076340f7f
Merge branch 'update-documentation' into deprecate-old-methods 2025-07-02 13:33:29 +05:30
Chirag Aggarwal
85250ba7bb chore: update format 2025-07-02 11:53:26 +05:30
Darshan
e66201bad5 Merge branch '1.7.x' into '1.8.x'. 2025-07-01 14:41:20 +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
Christy Jacob
448a8df1a2
Merge branch '1.7.x' into chore-patch-cache-miss 2025-06-30 21:12:46 +04:00
Christy Jacob
fd7628efe8 refactor: streamline cache handling in App::shutdown() and ensure file modification time updates 2025-06-30 21:03:30 +04:00
Christy Jacob
d6326758a8 patch: increase cache ttl to ensure hits 2025-06-30 20:58:00 +04:00
Chirag Aggarwal
db56361ad9 fix: add back empty checks 2025-06-30 19:48:05 +05:30
Chirag Aggarwal
39db3a3066 fix: order 2025-06-30 19:07:49 +05:30
Chirag Aggarwal
9242ef85eb fix: order 2025-06-30 19:03:12 +05:30
Chirag Aggarwal
332c82e61e fix: lint 2025-06-30 19:00:54 +05:30
Chirag Aggarwal
bfee98ca87 Merge branch '1.7.x' into feat-exp-scheme 2025-06-30 18:38:25 +05:30
Matej Bačo
ba7903af55 Merge branch '1.7.x' into fix-rules-platform-check 2025-06-27 12:46:06 +02:00
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
Christy Jacob
ee2796f870 fix: correct parameter order in action function for robots.txt route 2025-06-26 20:49:52 +04:00
Chirag Aggarwal
f8e74d073a chore: fix scheme check, remove logging 2025-06-26 19:48:57 +05:30
Chirag Aggarwal
043cead66b chore: fix logging 2025-06-26 19:32:15 +05:30
Chirag Aggarwal
e13089b1ce chore: more logging 2025-06-26 19:09:14 +05:30
Chirag Aggarwal
9861f60666 chore: add logging 2025-06-26 18:55:51 +05:30
Chirag Aggarwal
06ce606ac7 Merge branch '1.7.x' into feat-exp-scheme 2025-06-26 18:38:10 +05:30
Darshan
72956d1995 fix: misaligned param order. 2025-06-26 13:07:11 +05:30
Darshan
038b5d7418 fix: lint. 2025-06-26 12:40:56 +05:30
Darshan
d2753bd491 add: missing injections. 2025-06-26 12:34:38 +05:30
Jake Barnby
d52d8f7697
Fix API dump 2025-06-25 15:47:57 -04:00
Jake Barnby
e37cea5146
Add more trigger logging 2025-06-25 14:50:29 -04:00
Jake Barnby
d7d7fa3096
Add trigger logging 2025-06-25 14:47:23 -04:00
Chirag Aggarwal
dbc58655b2 Merge branch '1.7.x' into feat-exp-scheme 2025-06-25 07:53:28 +05:30
Chirag Aggarwal
c7c198fa2e chore: add more deprecations, add warning headers 2025-06-24 14:54:15 +05:30
Chirag Aggarwal
ac395452bc chore: deprecate old database methods 2025-06-24 14:03:19 +05:30
shimon
dd8894ad1e Merge remote-tracking branch 'origin/PLA-3018' into PLA-3018 2025-06-23 20:21:25 +03:00
shimon
28f420f10c Merge branch '1.7.x' of github.com:appwrite/appwrite into PLA-3018 2025-06-23 20:20:43 +03:00
Christy Jacob
54748b7d32
Update app/controllers/general.php
Co-authored-by: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com>
2025-06-23 20:50:59 +04:00
Matej Bačo
b69ff36ddb Manual QA fixes 2025-06-23 11:57:06 +02:00
Matej Bačo
c1bd493fbe Move refferer to resource; re-use in OPTIONS; re-use in platform check 2025-06-23 11:28:18 +02:00
Darshan
7e026b11b4
Merge branch '1.8.x' into lazy-load-relationships 2025-06-23 10:45:55 +05:30
Darshan
d338007d68 update: re-add filters since the PR is in draft and will be merged in the end. 2025-06-23 10:44:25 +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
shimon
d8c88fb420 composer 2025-06-19 19:44:33 +03:00
shimon
68fc0f898f set log projectId on the router method 2025-06-19 17:15:43 +03:00
shimon
0f8c5fe292 Merge branch '1.7.x', commit 'c0c30fe767f8c197b8793bf562f57146e5ba15a8' of github.com:appwrite/appwrite into PLA-3018 2025-06-19 12:46:34 +03:00
Darshan
c08db975d6
Merge branch '1.8.x' into database-aliases 2025-06-19 14:52:13 +05:30
Darshan
e5caa85629 update: init with module structure. 2025-06-19 11:02:31 +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
Darshan
5e9cabf115
Merge branch '1.8.x' into lazy-load-relationships 2025-06-18 18:36:47 +05:30
ArnabChatterjee20k
56494ca427 updated invalidation session during the change password in the account endpoint 2025-06-18 13:30:24 +05:30
Darshan
6214c2d104 update: disable 1.8.x request/response filters for lazy-loading-relationships. 2025-06-18 12:07:00 +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
deb8b3a789 revert: stuff that is not supposed to be in this branch. 2025-06-17 11:11:47 +05:30
Darshan
16a3275c81 Merge branch '1.8.x' into 'lazy-load-relationships'. 2025-06-17 10:36:16 +05:30
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
Darshan
1b768cdb90
Merge branch '1.7.x' into fix-templates 2025-06-16 22:16:16 +05:30
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
ad60ff9972 Update url in general.php 2025-06-16 19:16:20 +05:30
Khushboo Verma
8c8abfdece Add var_dumps to debug 2025-06-16 18:47:50 +05:30
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
loks0n
9196ae7908 feat: tar support 2025-06-16 10:44:15 +01:00
shimon
c0c30fe767 remove duplicate use 2025-06-15 12:40:22 +03:00
shimon
d7e2552999 Merge branch '1.7.x' of github.com:appwrite/appwrite into PLA-3018 2025-06-15 12:38:50 +03:00
shimon
7d54a6191d remove duplicate use 2025-06-15 12:13:15 +03:00
shimon
4d41c90367 remove duplicate use 2025-06-15 12:00:39 +03:00
shimon
96c035401b Override project resource to update hooks, since x-appwrite-project is not available when executing custom domain function 2025-06-15 11:30:57 +03:00
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
Darshan
f09042dfb1 update: swap request/response filters from 1.7.x to 1.8.x. 2025-06-13 16:47:40 +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
8e2eff7894 rollback: auth exception as per 1.8.x source. 2025-06-11 16:53:14 +05:30
Darshan
3e1adc6004 remove: $isTablesAPI var. 2025-06-11 16:51:27 +05:30
Darshan
86a9598a51 update: remove not-found and index dependency exceptions from global handler. 2025-06-11 16:51:09 +05:30
Darshan
dc439d1a16 update: remove authorization from global handler. 2025-06-11 16:46:21 +05:30
Darshan
6b53337a23 update: remove duplicate exceptions from global handler. 2025-06-11 16:44:32 +05:30
Darshan
3a88c74109 update: remove structure exceptions from global handler. 2025-06-11 16:18:06 +05:30
Darshan
e6268fe5a6 update: remove query exceptions from global handler. 2025-06-11 15:58:22 +05:30
Darshan
e07a1817ab update: remove conflict, restrict and relationship exceptions from global handler. 2025-06-11 13:42:55 +05:30
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
Matej Bačo
c92a14d318 Simplify router redirect 2025-06-02 12:47:13 +02: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