Commit Graph

1492 Commits

Author SHA1 Message Date
Torsten Dittmann 0815dde045 fix: cached documents 2024-02-29 22:05:19 +01:00
Torsten Dittmann b7d3996960 feat: mfa collection restructure 2024-02-29 21:59:49 +01:00
loks0n fff3d14cac fix: encode secret in oauth workaround 2024-02-28 23:50:40 +00:00
Jake Barnby 6fb1e929cd Use group hook to block recreating sessions 2024-02-27 22:08:39 +13:00
Jake Barnby 2a85c7cd96 Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing 2024-02-27 21:56:05 +13:00
Christy Jacob 03d6eb7401 Merge pull request #7669 from appwrite/main
Sync main
2024-02-26 17:39:33 +05:30
Jake Barnby cd554aa17f Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks
# Conflicts:
#	app/config/specs/open-api3-1.5.x-client.json
#	app/config/specs/open-api3-1.5.x-console.json
#	app/config/specs/open-api3-1.5.x-server.json
#	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-1.5.x-client.json
#	app/config/specs/swagger2-1.5.x-console.json
#	app/config/specs/swagger2-1.5.x-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	composer.lock
2024-02-26 18:43:52 +13:00
Jake Barnby 44ec1502f0 Merge remote-tracking branch 'origin/main' into 1.5.x 2024-02-26 18:35:25 +13:00
Vincent (Wen Yu) Ge b32d40f3e2 Improve messages 2024-02-26 02:25:45 +00:00
navjotNSK cab2233816 Formatting 2024-02-25 20:24:36 +01:00
navjotNSK 3a8c5a2e65 Default value added for name 2024-02-25 20:24:36 +01:00
Jake Barnby b1200f4cbd Merge branch '1.5.x' into refactor-disallow-new-session-with-existing 2024-02-26 01:29:14 +13:00
Jake Barnby 91c52b28eb Move targets to new session if upgrading to oauth session 2024-02-26 01:13:39 +13:00
Jake Barnby 86a2821a23 Merge pull request #7649 from appwrite/chore-remove-array-sdk-method
chore: remove array sdk method
2024-02-26 01:02:01 +13:00
Torsten Dittmann 194c61a47f fix: mfa backup codes 2024-02-25 11:47:22 +01:00
Christy Jacob 7ae09ba795 Revert "Revert "usage/usage-dump queue health endpoints"" 2024-02-25 13:42:28 +05:30
Jake Barnby 404e4258f6 Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing 2024-02-25 20:56:34 +13:00
loks0n 008f086f40 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into chore-remove-array-sdk-method 2024-02-24 14:44:50 +00:00
loks0n b650884351 chore: fix hide in specs 2024-02-24 14:38:09 +00:00
Jake Barnby a178dbfc4b Allow existing session when upgrading from anonymous to oauth 2024-02-25 03:04:35 +13:00
Jake Barnby 4190a09333 Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing 2024-02-25 03:00:47 +13:00
Jake Barnby 7a24f5fb3d Fix missing userId on update challenge 2024-02-25 02:21:33 +13:00
loks0n 5ff2121ef7 fix: sdk.hideServer & sdk.hideClient 2024-02-24 13:17:58 +00:00
loks0n 5ba50c842b chore: remove array sdk method 2024-02-24 12:53:47 +00:00
Jake Barnby 46575b6df7 Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks
# Conflicts:
#	app/controllers/api/account.php
#	composer.lock
2024-02-25 00:16:40 +13:00
Torsten Dittmann 076ffe8866 fix: missing team variable and added mfa templates to config 2024-02-23 14:59:12 +01:00
Torsten Dittmann af6091e04a fix: template name typo for mfa challenge 2024-02-23 14:59:12 +01:00
Torsten Dittmann f577811c04 fix: formatting on emails 2024-02-23 14:59:12 +01:00
Torsten Dittmann 9ae2948d0e fix: mfa email template 2024-02-23 14:59:12 +01:00
Jake Barnby 7ab80b9288 Fix account method 2024-02-24 02:00:31 +13:00
Jake Barnby 7c42a59c85 Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks
# 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
#	composer.lock
2024-02-23 18:01:59 +13:00
Luke B. Silver f285173f4e Merge branch '1.5.x' into feat-ssr-dx 2024-02-22 13:22:41 +00:00
Christy Jacob a8098831a3 Revert "usage/usage-dump queue health endpoints" 2024-02-22 12:21:48 +05:30
Torsten Dittmann e7259f0a3d Merge branch '1.5.x' into feat-rc-sdks 2024-02-21 18:22:17 +01:00
Torsten Dittmann 18e4385ca5 fix: change emailPassword factor from email to password 2024-02-21 18:18:56 +01:00
Torsten Dittmann 6cd456a35e fix: mfa sdk method 2024-02-21 17:54:39 +01:00
Jake Barnby 942847cf3a Merge remote-tracking branch 'origin/main' into 1.5.x
# Conflicts:
#	app/config/collections.php
#	app/config/errors.php
#	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/account.php
#	app/controllers/api/teams.php
#	app/controllers/api/users.php
#	app/controllers/shared/api.php
#	app/init.php
#	app/worker.php
#	composer.json
#	composer.lock
#	docker-compose.yml
#	src/Appwrite/Extend/Exception.php
#	src/Appwrite/Platform/Services/Tasks.php
#	src/Appwrite/Platform/Tasks/Maintenance.php
#	src/Appwrite/Platform/Workers/Certificates.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Platform/Workers/Messaging.php
#	src/Appwrite/Platform/Workers/Usage.php
#	src/Appwrite/Platform/Workers/UsageHook.php
#	src/Appwrite/Specification/Format/OpenAPI3.php
#	src/Appwrite/Specification/Format/Swagger2.php
#	tests/e2e/Services/Account/AccountConsoleClientTest.php
2024-02-22 01:29:28 +13:00
Jake Barnby 1c1a2eab2c Format 2024-02-21 03:16:01 +13:00
Jake Barnby 64eaf91ee7 Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing 2024-02-21 03:15:23 +13:00
Jake Barnby bbce53cda5 Auto trigger messaging events 2024-02-21 01:06:35 +13:00
loks0n fa28496b32 feat: ssr dx changes 2024-02-20 11:45:11 +00:00
Jake Barnby 3c727861bb Fix target permissions 2024-02-16 17:07:16 +13:00
Torsten Dittmann 14ecbd6658 fix: 2fa endpoint params 2024-02-15 11:26:34 +00:00
Christy Jacob 48e87cdc7c Merge branch 'main' of github.com:appwrite/appwrite into mock-numbers 2024-02-14 21:24:53 +05:30
Christy Jacob 28a16173ab feat: add tests 2024-02-14 12:10:19 +05:30
Jake Barnby 37522ea66f Merge branch '1.5.x' into fix-catch-exception 2024-02-13 12:47:36 +13:00
Jake Barnby 06b15c79ff Merge pull request #7572 from appwrite/attributes-query-fix
fix Indexes
2024-02-13 12:37:59 +13:00
fogelito ace75b0786 parseQueries 2024-02-12 18:02:04 +02:00
Jake Barnby f5aebe6673 Merge pull request #7559 from Souptik2001/fix-7109-user-activity-log
Fix missing user activity logs
2024-02-12 23:04:20 +13:00
fogelito e5bada0493 typo 2024-02-12 12:03:31 +02:00