Commit Graph

6937 Commits

Author SHA1 Message Date
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
Jake Barnby df7fa7c344 Revert payload to text 2024-09-05 15:44:49 +12:00
Damodar Lohani cd40df8388 fix tests and membership update 2024-09-05 03:43:02 +00:00
Jake Barnby 24746de9ba Merge remote-tracking branch 'origin/1.6.1' into feat-renaming-attributes
# Conflicts:
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	app/controllers/api/databases.php
2024-09-05 15:31:04 +12:00
Jake Barnby c58fa78962 Remove tenant in filter 2024-09-05 14:25:11 +12:00
Binyamin Yawitz 74a8c7da12 fix: fixes 2024-09-04 16:41:45 -04:00
Binyamin Yawitz feb775d2c4 chore: merge, lint, stan 2024-09-04 14:52:01 -04:00
Jake Barnby d29938107c Merge branch '1.6.1' into feat-renaming-attributes
# Conflicts:
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-1.6.x-console.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	composer.lock
2024-09-04 21:18:51 +12:00
Jake Barnby 72d6fb3901 Merge branch '1.6.1' into feat-string-attribute-resizing
# Conflicts:
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	composer.lock
2024-09-04 21:06:21 +12:00
Jake Barnby db269d8b8f Merge remote-tracking branch 'origin/1.6.x' into migrations-backups 2024-09-04 20:23:14 +12:00
Damodar Lohani cb537534e3 remove dump 2024-09-04 07:42:35 +00:00
Damodar Lohani bc5ac28b84 update validator and formatting 2024-09-04 02:01:56 +00:00
Damodar Lohani 413f3c20ab use proper scope for platforms and keys endpoint 2024-09-04 01:51:32 +00:00
Binyamin Yawitz cedf3cf28d chore: format 2024-09-03 19:32:30 -04:00
Binyamin Yawitz 7d6eac4ddb Merge branch '1.6.x' into feat-eldad4-coroutines
# Conflicts:
#	app/cli.php
#	app/controllers/api/account.php
#	app/controllers/api/functions.php
#	app/controllers/api/projects.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	app/http.php
#	app/init.php
#	app/realtime.php
#	app/worker.php
#	composer.json
#	composer.lock
#	src/Appwrite/Migration/Migration.php
#	src/Appwrite/Platform/Tasks/Migrate.php
#	src/Appwrite/Platform/Tasks/ScheduleExecutions.php
#	src/Appwrite/Platform/Workers/Builds.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Specification/Format/Swagger2.php
#	src/Appwrite/Utopia/Response.php
2024-09-03 19:06:48 -04:00
Richard Choi 08b539ba05 change API reference endpoints to sentence case 2024-09-03 16:32:11 +00:00
Richard Choi 4e780c0f75 Change API reference endpoints to sentence casing 2024-09-03 16:22:30 +00:00
loks0n 2bf5809505 feat: add methodType upload to create deployment 2024-09-03 14:44:11 +01:00
Jake Barnby 2c2e88f645 Merge remote-tracking branch 'origin/1.6.x' into migrations-backups
# Conflicts:
#	app/init.php
#	composer.json
#	composer.lock
#	src/Appwrite/Platform/Tasks/ScheduleBase.php
#	src/Appwrite/Specification/Format/Swagger2.php
2024-09-03 14:48:57 +12:00
Damodar Lohani 550a479532 Merge remote-tracking branch 'origin/1.6.x' into feat-console-roles-dl 2024-09-03 02:05:43 +00:00