Commit Graph

6937 Commits

Author SHA1 Message Date
Matej Bačo a4d4b6ffb5 Fix tests 2025-03-17 11:41:02 +01:00
Matej Bačo cbdd344490 Remove framework env var 2025-03-17 11:21:52 +01:00
Jake Barnby bc866dc717 Sync with 1.6.x 2025-03-17 21:10:30 +13:00
Jake Barnby 94f9d0140b Merge branch '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/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/init.php
#	composer.json
#	composer.lock
2025-03-17 20:44:08 +13:00
Eldad Fux f618a8b563 Fixed account test 2025-03-16 22:16:02 +01:00
Eldad Fux 9346efc24a Fixed some tests 2025-03-16 19:35:42 +01:00
Eldad Fux a5e57a9a67 Work in progress, moving to instance based auth 2025-03-16 18:54:55 +01:00
Eldad Fux 706ce4b3b6 WIP - cleaning up auth managment 2025-03-16 18:30:48 +01:00
Eldad Fux de96b2511a Merge remote-tracking branch 'origin/1.6.x' into feat-dynamic-regions 2025-03-16 16:31:09 +01:00
shimon ab790f6c02 debug 2025-03-16 15:24:29 +02:00
shimon ff618a0565 debug 2025-03-16 14:42:22 +02:00
shimon e019e426f1 debug 2025-03-16 13:47:54 +02:00
Eldad Fux 2d5904e3d0 Merge remote-tracking branch 'origin/feat-sites' into feat-apps-module 2025-03-16 10:26:55 +01:00
shimon adacec4ad1 Merge branch '1.6.x' of github.com:appwrite/appwrite into multi-region-support
# Conflicts:
#	app/init.php
#	composer.lock
2025-03-16 10:55:24 +02:00
Chirag Aggarwal 026dd56f55 Merge branch '1.7.x' into feat-development-keys 2025-03-15 19:18:44 +05:30
Chirag Aggarwal 9a4220f2dd Merge branch '1.7.x' into pla-2610 2025-03-15 18:53:59 +05:30
Chirag Aggarwal 9df221d333 Merge branch '1.6.x' into feat-development-keys 2025-03-14 19:42:31 +05:30
Matej Bačo 8eadaec676 Merge branch '1.6.x' into 1.7.x 2025-03-14 13:50:53 +01:00
Chirag Aggarwal afabd5b87a Merge branch '1.6.x' into feat-development-keys 2025-03-14 17:20:47 +05:30
Matej Bačo f6fc425c98 Add rule attributes 2025-03-14 09:37:44 +01:00
Matej Bačo 725dff7f0f Merge branch '1.7.x' into feat-sites 2025-03-13 11:41:28 +01:00
Matej Bačo 358e096301 Merge branch '1.6.x' into 1.7.x 2025-03-13 11:34:14 +01:00
Chirag Aggarwal d422f693f7 feat: add query by role to memberships 2025-03-13 09:48:39 +00:00
shimon a60d916c51 debug 2025-03-11 19:18:05 +02:00
shimon d522b1a04c debug 2025-03-11 18:56:24 +02:00
shimon d6e53d8e2e Merge branch '1.6.x' of github.com:appwrite/appwrite into updates-projects-regions 2025-03-11 11:17:18 +02:00
Matej Bačo d8418a222c Merge pull request #9433 from appwrite/chore-truncate-git-commit-message
Truncate commit message to 252 characters
2025-03-11 09:42:21 +01:00
Matej Bačo 63c7f4c8bc Fix remix detection false postive 2025-03-10 15:33:11 +01:00
Matej Bačo b11ad4b1c9 Fix a bug 2025-03-10 15:16:47 +01:00
Eldad Fux 91921859a2 Merge remote-tracking branch 'origin/1.6.x' into feat-apps-module 2025-03-10 02:14:35 +01:00
Eldad Fux a058925252 Code formatting 2025-03-10 00:23:22 +01:00
Eldad Fux 748119334d Merge remote-tracking branch 'origin/feat-sites' into feat-apps-module 2025-03-10 00:18:23 +01:00
Eldad Fux cb05b87dda Upgraded users to use utopia/auth 2025-03-10 00:08:04 +01:00
Matej Bačo aabee0ac37 Fix order of site commands 2025-03-09 16:15:08 +01:00
Matej Bačo 5f766f6a13 Merge branch 'feat-sites' into chore-rules-rehaul 2025-03-08 21:33:13 +01:00
Matej Bačo 7d27ceef43 Merge pull request #9315 from appwrite/feat-add-detection-logic
Integrate detection library with Appwrite
2025-03-08 21:30:19 +01:00
Matej Bačo 8a4954d4e8 PR review changes 2025-03-08 20:44:54 +01:00
Matej Bačo f75acfa503 Remove deploymentUpdatePolicy, add trigger 2025-03-08 19:19:05 +01:00
Matej Bačo 232f99c6c9 Finalize PR, review changes, fix tests 2025-03-08 16:50:39 +01:00
Matej Bačo 6a584c83c1 Attribute renaming 2025-03-07 20:14:11 +01:00
Matej Bačo 92b696ea21 Introduce type-relevant attributes to rules 2025-03-07 10:14:45 +01:00
Chirag Aggarwal 3f133cab74 Merge branch '1.7.x' into feat-tokens-module 2025-03-06 15:25:42 +00:00
shimon 584e4c0d75 Merge branch '1.6.x' of github.com:appwrite/appwrite into multi-region-support 2025-03-06 12:03:10 +02:00
Chirag Aggarwal 0ce4555f70 chore: added auth group to create phone token 2025-03-05 17:42:43 +00:00
Khushboo Verma de5f33f206 keep truncation only during create document 2025-03-05 22:45:48 +05:30
shimon 3bc81c82ec Merge branch '1.6.x' of github.com:appwrite/appwrite into multi-region-support
# Conflicts:
#	src/Appwrite/Platform/Workers/Usage.php
2025-03-05 17:29:57 +02:00
Chirag Aggarwal 3e9e0652b0 Merge branch '1.6.x' into feat-development-keys 2025-03-05 15:10:13 +05:30
Khushboo Verma 9b8dd02a88 Don't throw exception from list repos detection 2025-03-05 13:48:44 +05:30
Khushboo Verma bbf37e0a0e Update length to 255 2025-03-05 13:40:15 +05:30
Jake Barnby 2f43a3566d Remove bulk update permissions param 2025-03-05 16:42:09 +13:00