Commit Graph

329 Commits

Author SHA1 Message Date
loks0n 428998b6b6 chore: fix 2024-11-08 19:50:20 +01:00
loks0n d0cf0f6d1d feat: min size env 2024-11-08 19:48:32 +01:00
Bradley Schofield 3ed9dd288e Test 8GB 8192MB 2024-08-19 19:12:25 +09:00
Bradley Schofield 5285ef9939 Merge remote-tracking branch 'origin/1.6.x' into feat-runtime-controls-1.5.x 2024-08-14 19:36:15 +09:00
Binyamin Yawitz c0770621cf fix: reviews 2024-08-12 07:36:15 -04:00
Binyamin Yawitz e12e28c1f1 typo
Co-authored-by: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com>
2024-08-05 15:46:12 -04:00
Binyamin Yawitz 73ecec099d feat: adding team email and changing base to noreplay 2024-08-02 08:59:47 -04:00
Bradley Schofield 824a70f936 Move Runtime Controls PR to 1.5.x 2024-07-12 18:25:57 +09:00
Matej Bačo 5ef196ec9a PR review changes 2024-07-03 07:11:15 +00:00
Matej Bačo 6411dd9fb4 Mark domain as traefik 2024-06-27 08:24:12 +00:00
Christy Jacob 7b63f68fc3 chore: fix tests 2024-06-21 18:02:01 +00:00
Christy Jacob fdf44c7bab Merge branch 'main' of https://github.com/appwrite/appwrite into sync-with-main 2024-06-20 15:26:17 +00:00
Damodar Lohani 66ac96580b Merge branch 'main' into feat-security-emails 2024-06-04 06:51:24 +05:45
Binyamin Yawitz ccafc06d93 Merge branch '1.6.x' into feat-unified-app-logger-config 2024-05-28 10:18:39 -04:00
Binyamin Yawitz ebe386acd9 feat(logger): Unifying logger environment variable and adapting to the latest Logger version 2024-05-23 12:44:19 -04:00
Matej Bačo 9252b66493 Add scope tests 2024-05-06 11:27:28 +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
Damodar Lohani 00c45c2507 new environment for certificates and security emails 2024-03-31 03:32:55 +00: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
Jake Barnby 74a3d6531f Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-isolation-modes
# Conflicts:
#	composer.json
#	composer.lock
#	src/Appwrite/Platform/Tasks/CalcTierStats.php
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
2024-03-04 19:50:10 +01:00
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 5747b33e38 Make self-hosted and cloud specs consistent 2024-02-20 23:15:46 +13:00
shimon 459db9b43e usage updates 2024-02-14 07:34:12 +02:00
Jake Barnby 18f7168160 Merge main 2024-02-12 14:18:19 +13:00
shimon 72ee7d7f34 interval update 2024-02-08 20:51:54 +02:00
shimon 790cdc297b composer update 2024-02-08 10:26:45 +02:00
Christy Jacob bb92074093 Update .env 2024-02-06 22:26:40 +05:30
Khushboo Verma 1fefb7e133 Add a 20 second delay to maintenance worker 2024-02-05 15:01:23 +05:30
Khushboo Verma d40a51b50a Only disallow console requests 2024-02-02 20:01:54 +05:30
Khushboo Verma 0ea7b28a6b Resolve merge conflicts 2024-02-02 12:53:25 +05:30
Christy Jacob 2ff7c5ac8e chore: rename env variable 2024-01-29 20:07:17 +00:00
Christy Jacob dc6f9e6d59 chore: add new env variable 2024-01-29 20:01:14 +00:00
Khushboo Verma f4426d553c Throw 451 exception 2024-01-29 16:49:13 +05:30
Khushboo Verma 4cd5999bb3 Merge branch '1.5.x' into feat-block-countries 2024-01-29 16:25:31 +05:30
Khushboo Verma e4b3f652e7 Add webhook abuse as env variable 2024-01-26 21:25:35 +05:30
Khushboo Verma 51d1a38f0f Added test case 2024-01-24 18:24:48 +05:30
Torsten Dittmann 9f5a0312cf Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 11:24:59 +01:00
Khushboo Verma c07a3889e6 WIP: Add new group to api.php 2024-01-24 14:41:35 +05:30
Jake Barnby 320919fef2 Merge remote-tracking branch 'origin/1.4.x' into 1.5.x 2024-01-11 19:59:59 +13:00
Steven Nguyen d2d36bbfae Add changes from previous console platforms variable PR
See https://github.com/appwrite/appwrite/pull/4581
2024-01-03 20:38:42 +00:00
Steven Nguyen 06e385b346 Add changes from previous console platforms variable PR
See https://github.com/appwrite/appwrite/pull/4581
2024-01-03 19:30:42 +00:00
Torsten Dittmann a29cef2334 feat: console hostname env variable 2024-01-02 19:53:20 +00:00
Torsten Dittmann 9b2fbc5c52 feat: console hostname env variable 2023-12-29 21:52:50 +01:00
shimon ddb7a403db refactor usage worker 2023-12-24 21:17:13 +02:00
shimon d1751565cf refactor usage worker 2023-12-24 20:38:15 +02:00
Jake Barnby 4710310629 Check if self-hosted 2023-12-08 18:33:35 +01:00
prateek banga e3f60f4c78 fix tests 2023-11-23 23:14:02 +05:30