Commit Graph

22746 Commits

Author SHA1 Message Date
Bradley Schofield 4df94de1d9 Fix mfaAltered not working 2024-10-03 11:34:59 +09:00
Bradley Schofield 5eb83b5de3 Address Comments 2024-10-03 11:18:50 +09:00
Bradley Schofield 3468b25a52 Remove dialogue for API facing calls 2024-09-27 17:02:36 +09:00
Bradley Schofield f3e6b18b9f Remove console from this branch 2024-09-27 15:07:01 +09:00
Bradley Schofield 01fc574d36 Merge branch '1.6.x' into feat-1.5.x-mfa-emails
# Conflicts:
#	composer.lock
2024-09-27 15:03:33 +09:00
Bradley Schofield 3cfbe07744 Split Console and Normal Translations 2024-09-27 15:02:47 +09:00
Steven Nguyen 52700f12c2 Merge pull request #8404 from appwrite/1.5.x-db-storage-metrics
db storage metrics
2024-09-25 21:09:26 -07:00
Bradley Schofield 2274767720 Merge branch '1.5.x-db-storage-metrics' of https://github.com/appwrite/appwrite into 1.5.x-db-storage-metrics 2024-09-26 10:41:14 +09:00
Steven Nguyen 8eb69eb22e Merge pull request #8722 from appwrite/fix-https-mails-worker
Add domain and force HTTPS env vars to mail worker
2024-09-25 16:56:21 -07:00
Steven Nguyen 31e03bfaae fix: add domain and force HTTPS env vars to mail worker
The worker uses the env vars so we need to include it in the compose file to ensure the variable passes into the container.
2024-09-25 23:25:56 +00:00
Matej Bačo 1788896a57 Merge pull request #8719 from appwrite/16x-sync-main
Merge pull request #8686 from appwrite/1.6.x
2024-09-25 12:13:44 +02:00
Torsten Dittmann fdd39a29c3 Merge pull request #8707 from appwrite/feat-make-create-execution-async-loose
feat: make create execution async loose
2024-09-25 12:12:02 +02:00
Luke B. Silver bff846480a Update app/controllers/api/functions.php
Co-authored-by: Matej Bačo <matejbacocom@gmail.com>
2024-09-25 10:01:12 +01:00
loks0n 711dc7bd08 feat: add logic 2024-09-25 09:59:51 +01:00
loks0n df76c7c268 Merge branch 'main' of https://github.com/appwrite/appwrite into feat-make-create-execution-async-loose 2024-09-25 09:42:12 +01:00
Luke B. Silver b52c9648f1 Merge branch '1.6.x' into feat-make-create-execution-async-loose 2024-09-25 09:35:55 +01:00
Bradley Schofield 6d8a969334 Update specs 2024-09-24 18:44:42 +09:00
Bradley Schofield 46bef5a61d Merge branch '1.6.x' into 1.5.x-db-storage-metrics cl-1.6.0-db-storage-metrics.1 2024-09-24 18:12:11 +09:00
Bradley Schofield 0101fbda8c Update dependencies 2024-09-24 17:58:25 +09:00
Bradley Schofield fb1c0c85b0 Handle missing database 2024-09-24 16:10:52 +09:00
Bradley Schofield 001d13d7e9 Improve Stability, handle cases of deleted collections or databases 2024-09-24 16:08:46 +09:00
Bradley Schofield 585ee4b88e Get tests passing 2024-09-24 15:18:35 +09:00
Bradley Schofield 3a68c77406 Try and get tests working 2024-09-24 14:28:11 +09:00
Bradley Schofield 9b454b07b9 Address Comments 2024-09-24 01:48:15 +09:00
Bradley Schofield e8bd577d4e Update metric count 2024-09-24 01:43:33 +09:00
Bradley Schofield 5c59083f4d Run Linter 2024-09-24 00:57:22 +09:00
Bradley Schofield 9db6f4cbee Address Comments 2024-09-24 00:54:27 +09:00
Bradley Schofield 00acc2f73b Address Comments 2024-09-24 00:07:54 +09:00
Bradley Schofield f9d0f8fc38 Run Linter 2024-09-23 18:16:18 +09:00
Bradley Schofield a309f31a33 Add tests, move hooks to API Layer 2024-09-23 18:08:48 +09:00
loks0n 8ae99cb373 feat: make create execution async loose 2024-09-20 20:00:59 +01:00
Christy Jacob 21a406830a Merge pull request #8705 from appwrite/fix-schedule-base
fix: typo in scheduler base
2024-09-20 20:42:41 +04:00
Binyamin Yawitz 5ffca0f6fa fix: typo in scheduler base 2024-09-20 12:37:45 -04:00
Christy Jacob 9f7bf5a9f7 Merge pull request #8704 from appwrite/revert-7975-feat-eldad4-coroutines
Revert "Feat eldad4 coroutines"
2024-09-20 20:30:39 +04:00
Binyamin Yawitz 5512340cdd Revert "Feat eldad4 coroutines" 2024-09-20 12:30:05 -04:00
Christy Jacob f94f7763c8 Merge pull request #8703 from appwrite/revert-8691-fix-schedule-base
Revert "Fix typo in scheduler base"
2024-09-20 20:29:46 +04:00
Binyamin Yawitz d2aaa99076 Revert "Fix typo in scheduler base" 2024-09-20 12:26:17 -04:00
Christy Jacob ab19f1323e Merge pull request #8702 from appwrite/revert-8694-fix-auth-injection
Revert "Fix auth injection"
2024-09-20 20:25:40 +04:00
Binyamin Yawitz 904e4c8650 Revert "Fix auth injection" 2024-09-20 12:24:12 -04:00
Christy Jacob 778edf1ac2 Merge pull request #8694 from appwrite/fix-auth-injection
Fix auth injection
cl-1.6.0-14
2024-09-20 02:33:16 +04:00
Binyamin Yawitz 24eef9accf fix: injection name 2024-09-19 18:28:24 -04:00
Christy Jacob 24ecdd71b1 Merge pull request #8691 from appwrite/fix-schedule-base
Fix typo in scheduler base
cl-1.6.0-13
2024-09-19 22:25:52 +04:00
Binyamin Yawitz 0702d7ec9c chore: merge 2024-09-19 14:25:05 -04:00
Christy Jacob 193f94e5e1 Merge pull request #7975 from appwrite/feat-eldad4-coroutines
Feat eldad4 coroutines
2024-09-19 22:16:50 +04:00
Binyamin Yawitz 48d4d873de Merge branch '1.6.x' into feat-eldad4-coroutines 2024-09-19 13:50:27 -04:00
Binyamin Yawitz fe7f39d7a5 fix: reviews 2024-09-19 13:48:15 -04:00
fogelito 2517605cd1 Add this 2024-09-19 18:45:00 +03:00
Bradley Schofield 82687c8ca4 Merge branch 'main' into 1.5.x-db-storage-metrics
# Conflicts:
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/swagger2-latest-console.json
#	app/controllers/api/project.php
#	src/Appwrite/Utopia/Response/Model/UsageProject.php
#	tests/e2e/General/UsageTest.php
2024-09-19 15:37:27 +09:00
Steven Nguyen e406dead9a Merge pull request #8686 from appwrite/1.6.x
Sync 1.6.x into main
2024-09-18 13:19:30 -07:00
Christy Jacob d633ad2bfb Merge branch 'main' into 1.6.x 2024-09-18 22:48:42 +04:00