Commit Graph

7006 Commits

Author SHA1 Message Date
Torsten Dittmann 2841875714 Merge branch 'main' of https://github.com/appwrite/appwrite into migrations-backups 2024-09-27 12:15:11 +02:00
fogelito b1cfd1c0ff Merge branch '1.6.x' of https://github.com/appwrite/appwrite into migrations-backups
# Conflicts:
#	app/controllers/api/databases.php
#	composer.lock
2024-09-26 10:42:15 +03: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
Steven Nguyen 52e5947822 Merge branch 'main' into docs-fix-endpoints 2024-09-25 14:05:59 -07:00
Luke B. Silver 36368f3d80 Merge branch 'main' into fix-oauth-trigger-create-user-event 2024-09-25 11:26:58 +01:00
loks0n 3ba7d7c7de fix: add payload 2024-09-25 10:48:39 +01:00
loks0n ab5ef97767 fix: oauth trigger create user event 2024-09-25 10:39:11 +01: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
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 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
shimon aa0a795ec6 Merge branch '1.6.x' of github.com:appwrite/appwrite into multi-region-support 2024-09-22 09:49:50 +03:00
Damodar Lohani c31e928def fix linter 2024-09-22 02:44:53 +00:00
loks0n 8ae99cb373 feat: make create execution async loose 2024-09-20 20:00:59 +01:00
Binyamin Yawitz 5512340cdd Revert "Feat eldad4 coroutines" 2024-09-20 12:30:05 -04:00
Binyamin Yawitz 904e4c8650 Revert "Fix auth injection" 2024-09-20 12:24:12 -04:00
Binyamin Yawitz 24eef9accf fix: injection name 2024-09-19 18:28:24 -04:00
fogelito b519f5e23a Merge branch '1.6.x' of https://github.com/appwrite/appwrite into migrations-backups
# Conflicts:
#	composer.json
#	composer.lock
#	src/Appwrite/Platform/Tasks/ScheduleBase.php
#	src/Appwrite/Specification/Format/Swagger2.php
2024-09-19 18:19:45 +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
Binyamin Yawitz 1581a8c654 chore: merge 2024-09-18 09:28:55 -04:00
Bradley Schofield e88cfed03a Normalize algorithm being used 2024-09-18 16:30:02 +09:00
Damodar Lohani 1aa99a0f3e Merge branch '1.6.x' into feat-console-roles-dl 2024-09-18 11:58:09 +05:45
Bradley Schofield be3e3790c9 Update Database lib, update instances where findOne is used to ensure we check document is empty. 2024-09-18 14:47:36 +09:00
Christy Jacob af126a28ae Merge pull request #8639 from appwrite/fix-scheduled-executions
Fix: scheduled executions data
2024-09-18 01:40:31 +04:00
shimon 134f90a464 fix 2024-09-17 23:32:36 +03:00
shimon fd8b7eb6fc update 2024-09-17 15:35:48 +03:00
Damodar Lohani e1238d0fe9 Merge branch '1.6.x' into feat-console-roles-dl 2024-09-17 14:52:29 +05:45
Binyamin Yawitz e246005c51 chore: merge 2024-09-16 11:17:40 -04:00
Torsten Dittmann c5dae9f018 fix: backwards compatibility 2024-09-16 13:49:13 +02:00
Torsten Dittmann 8ac2f64353 fix: function storage metrics 2024-09-16 11:58:08 +02:00
shimon bee844fcdb sync against 1.6x 2024-09-15 17:40:55 +02:00
Matej Bačo c4991b9941 Merge remote-tracking branch 'origin/1.6.x' into fix-scheduled-executions 2024-09-14 10:28:30 +00:00
Jake Barnby 28642b9f04 Shared tables array 2024-09-12 17:06:16 +12:00
Christy Jacob 876bb6e2c8 Merge pull request #8631 from appwrite/feat-vcs-env-vars
Feat: VCS vars to deployments & executions
2024-09-10 14:48:22 +04:00
Matej Bačo 8a2083feb5 Merge branch '1.6.x' of https://github.com/appwrite/appwrite into fix-scheduled-executions 2024-09-10 10:38:01 +00:00
Binyamin Yawitz 3ca7672726 chore: merge 2024-09-09 17:59:38 +02:00
Steven Nguyen 9febb06052 fix: update abuse-key for mfa challenge endpoints
Because the key was not specific enough, when one user triggered the
rate limit, all users were affected.
2024-09-09 14:10:58 +00:00
Binyamin Yawitz ef1380bf61 chore: merge 2024-09-09 14:52:47 +02:00
Jake Barnby f86b75733e Revert body validator 2024-09-09 22:34:24 +12:00
Jake Barnby af7bd705f4 Update console SDK version 2024-09-09 19:17:47 +12:00
Matej Bačo b1769ed5ca Fix scheduled executions data 2024-09-07 12:20:23 +02:00
Matej Bačo ff1d64a36a Add VCS vars to deployments & executions 2024-09-06 10:50:29 +00:00
Jake Barnby e73053d5b2 Merge remote-tracking branch 'origin/1.6.x' into 1.6.1 2024-09-06 22:26:01 +12:00
Binyamin Yawitz 9e525366cb Merge branch '1.6.x' into feat-eldad4-coroutines
# Conflicts:
#	app/controllers/api/functions.php
#	app/init.php
#	composer.lock
#	src/Appwrite/Specification/Format/Swagger2.php
2024-09-05 18:09:16 -04:00
Matej Bačo 9891f61610 Improve mail datetime format 2024-09-05 16:33:16 +02:00
Jake Barnby 3f99f01953 Recreate original on create failure with new key 2024-09-05 20:41:50 +12:00
Jake Barnby a28f19ff3c Merge fix 2024-09-05 16:16:28 +12:00
Jake Barnby 57c5925526 Wrap attribute recreate in transaction 2024-09-05 15:45:28 +12:00
Jake Barnby d39729d830 Param reorder 2024-09-05 15:45:13 +12:00