Commit Graph

593 Commits

Author SHA1 Message Date
Damodar Lohani 75cd558670 Merge pull request #8323 from appwrite/feat-opr-v4-support
OPR v4 support
2024-07-03 15:11:54 +05:45
Khushboo Verma ead0b93900 Resolve merge conflict 2024-07-02 14:59:15 +05:30
loks0n bb3ee81065 chore: rename metadata to data 2024-06-28 22:42:55 +01:00
loks0n 303ce498be feat: allow custom path method body 2024-06-26 12:30:23 +01:00
Khushboo Verma 0edbec4f44 OPR v4 support 2024-06-25 15:03:07 +05:30
Christy Jacob fdf44c7bab Merge branch 'main' of https://github.com/appwrite/appwrite into sync-with-main 2024-06-20 15:26:17 +00:00
Matej Bačo d57c459e6f Merge branch '1.6.x' into feat-function-tokens 2024-05-17 18:16:43 +02:00
Matej Bačo 3a3d5b61a6 PR review changes 2024-05-06 09:55:59 +00:00
Matej Bačo 9a0d9cee15 Merge remote-tracking branch 'origin/main' into feat-function-tokens 2024-05-06 08:35:14 +00:00
Jake Barnby b2e956a14d Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-isolation-modes
# Conflicts:
#	.gitignore
#	app/cli.php
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/projects.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	app/init.php
#	app/realtime.php
#	app/worker.php
#	composer.json
#	composer.lock
#	src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php
#	src/Appwrite/Platform/Tasks/GetMigrationStats.php
#	src/Appwrite/Platform/Workers/Databases.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Platform/Workers/Hamster.php
#	tests/e2e/General/HTTPTest.php
#	tests/e2e/Services/Databases/DatabasesCustomServerTest.php
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
2024-04-30 19:40:47 +12:00
Khushboo Verma f4cf7ba414 Merge branch 'main' into feat-function-execution-filters 2024-03-20 23:51:27 +05:30
Jake Barnby 9ca1375af3 Fix index lengths given tenant is added 2024-03-09 22:56:20 +01:00
Torsten Dittmann f51c39cd2b Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-03-08 00:30:02 +01:00
Khushboo Verma 8f1aaf69d4 Merge branch 'main' into feat-disable-api 2024-03-07 18:22:34 +01:00
Torsten Dittmann dfef0e732c sync: main -> 1.5.x 2024-03-07 17:16:39 +01:00
Torsten Dittmann a53e630536 Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x-2 2024-03-05 10:31:51 +01:00
Khushboo Verma d3b0b00917 Allow users to disable APIs 2024-03-04 23:12:54 +01:00
Matej Bačo e6ad1c6830 Add more recovery code endpoints 2024-03-02 13:05:22 +00:00
Matej Bačo 5cefca1c22 Fix MFA flows and docs 2024-03-01 16:22:51 +00:00
Torsten Dittmann 1ca143417c Update app/config/collections.php
Co-authored-by: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com>
2024-03-01 13:29:10 +01:00
Torsten Dittmann 8569311e73 fix: collections order 2024-02-29 22:07:10 +01:00
Torsten Dittmann b7d3996960 feat: mfa collection restructure 2024-02-29 21:59:49 +01:00
Khushboo Verma b552d052da Update index length 2024-02-29 19:51:13 +05:30
Khushboo Verma 1d282da6b3 Update index length 2024-02-29 19:35:58 +05:30
Khushboo Verma f8f54271d1 Fix execution indexes 2024-02-29 18:39:38 +05:30
Khushboo Verma f1c6790240 Add indexes for execution attributes 2024-02-25 15:57:39 +05:30
Christy Jacob 7ae09ba795 Revert "Revert "usage/usage-dump queue health endpoints"" 2024-02-25 13:42:28 +05:30
Christy Jacob a8098831a3 Revert "usage/usage-dump queue health endpoints" 2024-02-22 12:21:48 +05:30
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 52d4b649e4 Add missing unique index 2024-02-21 13:09:14 +13:00
Jake Barnby 400b28de8a Replace resourceCollection with switch 2024-02-21 03:25:01 +13:00
Jake Barnby 14a243cc37 Merge pull request #7457 from appwrite/1.5.x-response-request-models
Update Response and Request filters aswell as Migrations for 1.5.x
2024-02-16 20:58:08 +13:00
Jake Barnby e462e916f0 Add email, sms and push totals to topic 2024-02-15 17:22:43 +13:00
Jake Barnby 1f470aecd2 Add subscribe permission to topics 2024-02-13 17:24:31 +13:00
shimon e7ace61273 Sync against main 2024-02-12 11:10:52 +02:00
shimon 6b6f04d2d3 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
 Conflicts:
	app/config/collections.php
	app/controllers/shared/api.php
2024-02-12 10:55:53 +02:00
Bradley Schofield 559fa924c0 Merge branch '1.5.x' into 1.5.x-response-request-models 2024-02-06 17:10:43 +00:00
Jake Barnby 987b02083c Array instead of JSON 2024-02-06 02:22:25 +13:00
Jake Barnby 0a72b37b3e Fix session response model 2024-02-06 02:17:04 +13:00
shimon af2b640948 updates 2024-02-04 10:33:04 +02:00
shimon a63977455f Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models
 Conflicts:
	.gitmodules
2024-02-04 09:27:08 +02:00
Jake Barnby 38f93a3e89 Add session ID + internal ID to targets 2024-02-03 03:06:23 +13:00
Torsten Dittmann ceb868c9d7 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-02-01 11:57:32 +01:00
shimon 350d72eb1f updates 2024-02-01 12:21:50 +02:00
Torsten Dittmann 3f688a2aa7 fix: remove some leftovers 2024-01-30 16:09:58 +01:00
Matej Bačo 36ce992e9f Add API Tokens 2024-01-29 11:15:07 +00:00
Jake Barnby 61dd4a123c Remove descriptions 2024-01-29 19:29:58 +13:00
Jake Barnby 7106131545 Merge branch '1.5.x' into feat-maintenance-delete-expired-targets 2024-01-26 00:26:29 +13:00
Torsten Dittmann 9070dce6ac Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 16:32:12 +01:00
Torsten Dittmann 9f5a0312cf Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 11:24:59 +01:00