Commit Graph

740 Commits

Author SHA1 Message Date
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 4d8f950955 fix roles filtering 2025-10-16 02:17:52 +00:00
Damodar Lohani 1c726d0466 fix: encoded not defined 2025-09-14 04:53:49 +00:00
Damodar Lohani 41dbe1a384 Fix internal ID refactor 2025-09-10 07:03:11 +00: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
fogelito 15b56593f4 Partial update 2025-09-04 15:28:59 +03:00
fogelito ac9181a2e6 Line 2025-09-04 15:06:58 +03:00
fogelito 8cc5efa2cb Use Document 2025-09-04 15:06:38 +03:00
fogelito 3fc05c54fb Fix get prefs 2025-09-04 14:59:59 +03:00
fogelito 2e26ea3a1b $prefsDocument 2025-09-04 14:54:22 +03:00
fogelito 8327111c3a Merge branch '1.8.x' of https://github.com/appwrite/appwrite into fix-put-prefs 2025-09-04 14:50:25 +03:00
fogelito 8b271eb159 Catch error 2025-09-04 14:47:59 +03:00
Khushboo Verma 30ca2fb251 Replace %s with mustache placeholder 2025-08-27 17:13:10 +05:30
hmacr bf3efea98d framework support + content for OTP & add-member email 2025-07-22 16:43:17 +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 e6d143c806 Merge branch '1.7.x' into fix-templates 2025-06-10 14:20:28 +05:30
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 e1ee9ba89e fix: logic. 2025-05-30 18:04:57 +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
Darshan 2de9b85d6b Merge branch 'main' into 'fix-teams-deletion'. 2025-05-27 19:16:40 +05:30
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
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
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 71e3446498 Change internal ID to sequence 2025-05-23 02:55:29 +12:00
Matej Bačo c5d4173923 Merge branch '1.6.x' into 1.7.x 2025-05-15 18:27:56 +02:00
Darshan ad3adbda21 fix: owner downgrade. 2025-05-15 14:08:54 +05:30
Darshan b302b5416d Merge branch '1.7.x' into fix-templates 2025-05-13 17:52:57 +05:30
Matej Bačo af0c872999 Merge branch '1.6.x' into 1.7.x 2025-05-13 10:11:39 +02:00
Darshan f13a28cf6d Merge branch '1.7.x' into fix-templates 2025-05-04 19:08:06 +05:30
Jake Barnby 27ac5cbb2a Remove redundant withTimestamp 2025-04-30 17:40:47 +12:00
Eldad Fux fb29fe7b3c Merge remote-tracking branch 'origin/1.7.x' into feat-apps-module 2025-04-29 20:12:31 +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 f4e8d72593 Merge branch '1.6.x' into feat-group 2025-04-17 18:25:47 +04:00
ArnabChatterjee20k b2f7ed48dd Simplify constructor usage by inlining message; limit try/catch to DB operations 2025-04-17 10:16:26 +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
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
Chirag Aggarwal 74abf4897b chore: fix teamCreateMembership 2025-04-14 08:47:57 +00:00
Chirag Aggarwal c3656fd4e7 Merge branch '1.6.x' into feat-group 2025-04-12 06:50:20 +00:00
Chirag Aggarwal 5a5d1752f9 Merge branch '1.7.x' into feat-development-keys 2025-04-09 09:02:20 +00:00
Darshan 7297188c1b update: roles check. 2025-04-05 19:42:20 +05:30
Darshan 2a672f5a63 fix: don't allow the only owner in an org to change their role to anything else. 2025-04-05 19:20:24 +05:30