Commit graph

5394 commits

Author SHA1 Message Date
shimon
c853b6593a debug 2024-10-20 17:22:37 +03:00
shimon
d980711c30 debug 2024-10-20 16:32:19 +03:00
shimon
7ab55e0694 debug 2024-10-20 16:21:39 +03:00
shimon
db244937ff debug 2024-10-20 16:10:14 +03:00
shimon
bcb593e6df debug 2024-10-20 15:56:43 +03:00
shimon
9bfab69062 debug 2024-10-20 15:33:10 +03:00
shimon
5451a9cd23 sync against feat-migration 2024-10-20 10:56:44 +03:00
shimon
7d7b2c7544 debug 2024-10-08 21:51:43 +03:00
shimon
d2c66894fd debug 2024-10-07 17:56:08 +03:00
shimon
1cd3e69161 debug 2024-10-07 11:42:14 +03:00
shimon
5850caff35 debug 2024-10-07 11:25:52 +03:00
shimon
3f19fac0b4 Merge branch '1.6.x' of https://github.com/appwrite/appwrite into multi-region-support
# Conflicts:
#	app/init.php
#	app/realtime.php
#	composer.json
#	src/Appwrite/Platform/Tasks/ScheduleBase.php
#	src/Appwrite/Platform/Tasks/ScheduleExecutions.php
#	src/Appwrite/Platform/Tasks/ScheduleFunctions.php
#	src/Appwrite/Platform/Tasks/ScheduleMessages.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Platform/Workers/Migrations.php
2024-10-04 16:26:47 +03:00
Torsten Dittmann
ec77ab1007 Merge branch '1.6.x' of https://github.com/appwrite/appwrite into migrations-backups 2024-10-03 11:13:44 +02:00
Binyamin Yawitz
671f801cd5
fix: missing protocol 2024-10-02 13:27:02 -04:00
Torsten Dittmann
4f4edc48af Merge branch '1.6.x' of https://github.com/appwrite/appwrite into migrations-backups 2024-10-02 17:38:50 +02:00
Damodar Lohani
769a8ee6c9
Remove JPEG fallback for webp
- Now that safari supports webp but without the appropriate header, remove the fallback
2024-10-02 11:23:27 +05:45
Christy Jacob
c610c9aff1
Merge pull request #8565 from appwrite/feat-console-roles-dl
chore: Changes for console roles support
2024-10-01 19:20:04 +04:00
fogelito
54f55f65f4 deletes-worker-set-project 2024-10-01 17:17:36 +03:00
Matej Bačo
2b3cab887f Merge branch 'main' into 1.6.x 2024-09-30 15:33:15 +02:00
shimon
19912c87c9 Merge branch '1.6.x' of github.com:appwrite/appwrite into multi-region-support 2024-09-29 17:04:34 +03:00
Damodar Lohani
e9a5299547 Merge remote-tracking branch 'origin/1.6.x' into feat-console-roles-dl 2024-09-29 02:01:42 +00:00
Torsten Dittmann
5f15c34ad5 Merge branch 'feat-console-roles-dl' of https://github.com/appwrite/appwrite into migrations-backups 2024-09-27 14:55:57 +02:00
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
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
Damodar Lohani
1aa99a0f3e
Merge branch '1.6.x' into feat-console-roles-dl 2024-09-18 11:58:09 +05:45
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