Commit Graph

1586 Commits

Author SHA1 Message Date
Binyamin Yawitz 48d4d873de Merge branch '1.6.x' into feat-eldad4-coroutines 2024-09-19 13:50:27 -04:00
Christy Jacob d633ad2bfb Merge branch 'main' into 1.6.x 2024-09-18 22:48:42 +04:00
Christy Jacob 4a29091ff4 chroe: update executor 2024-09-18 15:46:39 +00:00
Binyamin Yawitz 1581a8c654 chore: merge 2024-09-18 09:28:55 -04:00
Christy Jacob 607d723037 Merge branch '1.6.x' of https://github.com/appwrite/appwrite into chore-bump-console 2024-09-17 21:47:28 +00:00
Christy Jacob 8ce9e79cc1 chore:update console 2024-09-17 21:46:23 +00:00
Steven Nguyen d1296dcc08 fix: add retention env vars to deletes worker
The resources are injected in the deletes worker so the env vars need to be passed to the container.
2024-09-13 16:37:04 +02:00
Binyamin Yawitz ef1380bf61 chore: merge 2024-09-09 14:52:47 +02:00
Jake Barnby 5511e3d0ec Update console 2024-09-09 20:37:52 +12:00
Fernando 20cf7643dc Update docker-compose to restart usage-dump
Currently, docker doesn't restart the usage-dump container after a system reboot, causing appwrite to not show usage correctly. This fix makes it restart along with the other containers.
2024-09-07 14:44:16 -03: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
Christy Jacob d8c15079b6 chore: update console 2024-09-06 00:08:22 +04:00
Binyamin Yawitz 5d70884e6c chore: cleaning 2024-09-05 13:11:39 -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
Torsten Dittmann b1c047df47 chore: bump console to 5.0.6 2024-08-27 14:27:52 +02:00
Torsten Dittmann 588475cddf chore: bump console version 2024-08-26 17:51:03 +02:00
Torsten Dittmann b215ab07fc chore: bump console to 5.0.1 2024-08-23 22:12:27 +02:00
Torsten Dittmann 853bd9a67c chore: upgrade console 2024-08-23 22:11:37 +02:00
Matej Bačo f98184405b Upgrade OPR versions 2024-08-22 12:15:38 +00:00
Matej Bačo ef8075f86b Fix missing function variables 2024-08-19 08:50:30 +00:00
Christy Jacob a5ccba7561 chore: update console and specs 2024-08-16 20:58:55 +00:00
Binyamin Yawitz 4373e72262 fix: typo 2024-08-12 16:37:49 -04:00
Binyamin Yawitz 0690e05807 chore: Updating console version 2024-08-12 16:27:44 -04:00
Steven Nguyen 6a4fa91aac chore: bump executor version from 0.5.5 to 0.5.7 2024-08-08 22:55:35 +00:00
Binyamin Yawitz 9ed43ebbc2 Merge branch 'refs/heads/1.6.x' into feat-eldad4-coroutines
# Conflicts:
#	app/controllers/api/functions.php
#	app/controllers/general.php
#	app/init.php
#	composer.lock
#	dev/xdebug.ini
#	src/Appwrite/Utopia/Response.php
2024-08-06 14:57:05 -04:00
Matej Bačo bce06a6178 Supply autorestart to executor 2024-08-03 09:14:19 +00:00
Khushboo Verma d43039387e Merge branch '1.6.x' into fix-disabled-function-logging 2024-07-29 11:19:36 +05:30
Binyamin Yawitz f7a28bcf71 Merge branch 'refs/heads/1.6.x' into feat-eldad4-coroutines
# Conflicts:
#	app/init.php
#	src/Appwrite/Migration/Migration.php
2024-07-19 09:59:08 -04:00
Torsten Dittmann 8ad15b2df1 feat: base migration for 1.6.x 2024-07-19 13:53:42 +02:00
Torsten Dittmann 0661291d4c chore: upgrade console 2024-07-18 20:59:55 +02:00
Binyamin Yawitz 349c4f706f Merge branch 'refs/heads/1.6.x' into feat-eldad4-coroutines
# Conflicts:
#	app/controllers/web/console.php
#	app/http.php
2024-07-18 11:54:01 -04:00
Torsten Dittmann af998ef868 chore: update console 2024-07-18 17:29:15 +02:00
Torsten Dittmann bcd472ca59 fix: compose console port 2024-07-17 22:39:32 +02:00
Binyamin Yawitz 927dbc7e11 Merge branch 'refs/heads/1.6.x' into feat-eldad4-coroutines
# Conflicts:
#	app/console
#	app/controllers/api/account.php
#	app/controllers/api/functions.php
#	app/controllers/api/projects.php
#	app/controllers/api/users.php
#	app/controllers/api/vcs.php
#	app/controllers/general.php
#	app/controllers/mock.php
#	app/controllers/shared/api.php
#	app/init.php
#	composer.json
#	composer.lock
#	src/Appwrite/Platform/Tasks/Doctor.php
#	src/Appwrite/Platform/Tasks/ScheduleMessages.php
#	src/Appwrite/Platform/Workers/Builds.php
#	src/Appwrite/Utopia/Response.php
2024-07-17 14:31:13 -04:00
Torsten Dittmann 8210e0ffaf fix: new image 2024-07-17 20:29:58 +02:00
Torsten Dittmann 9e1b00d8e5 fix: console image 2024-07-17 20:19:34 +02:00
Torsten Dittmann e61ff28c0f fix: production compose template 2024-07-17 19:26:27 +02:00
Torsten Dittmann 0ecc1849a7 feat: containerized console 2024-07-17 19:24:52 +02:00
Khushboo Verma e42e7e91fb Update compose.phtml as well 2024-07-16 19:19:38 +05:30
Damodar Lohani 1c0490aa91 Merge pull request #8315 from appwrite/feat-new-session-alert
Feat new session alert
2024-07-03 14:58:16 +05:45
Matej Bačo 5ef196ec9a PR review changes 2024-07-03 07:11:15 +00:00
Luke B. Silver dab0a17082 Merge branch '1.6.x' into feat-scheduled-executions 2024-06-25 17:21:44 +01:00
Binyamin Yawitz 6c26e2eb51 Merge branch 'refs/heads/main' into feat-eldad4-coroutines
# Conflicts:
#	app/cli.php
#	composer.json
#	composer.lock
2024-06-20 17:23:15 -04: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
loks0n 2f0f7bf9c7 fix: test 2024-06-17 13:44:12 +01:00
Binyamin Yawitz b5a241db8d merge: Main into Coroutines 2024-06-05 18:38:39 -04:00
Damodar Lohani 66ac96580b Merge branch 'main' into feat-security-emails 2024-06-04 06:51:24 +05:45
Christy Jacob cd5f6f58a2 Merge branch 'main' of https://github.com/appwrite/appwrite into sync-with-main 2024-05-24 12:43:56 +00:00
Jake Barnby 5510a25066 Merge pull request #8148 from appwrite/chore-remove-compose-version
chore: remove compose version
2024-05-24 13:47:40 +12: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