Commit graph

1138 commits

Author SHA1 Message Date
Khushboo Verma
7f17efcdd8 Resolve merge conflicts 2024-10-27 15:43:52 +01:00
Matej Bačo
d8610e0f2a Upgrade executor to fix tests 2024-10-26 18:57:37 +00:00
Matej Bačo
ea6765c68a Support static sites 2024-10-26 18:43:30 +02:00
Khushboo Verma
03d4d4c8fa Add build env vars for sites 2024-10-26 12:29:42 +02:00
Khushboo Verma
fcc51d3352 Add sites build timeout env var 2024-10-26 11:14:55 +02:00
Khushboo Verma
08630cd686 Add timeout and add sites scopes 2024-10-26 11:01:14 +02:00
Matej Bačo
9295a4e7ce Update depenrencies 2024-10-25 19:25:51 +02:00
Khushboo Verma
bbd589f6a8 Add download build endpoint to sites 2024-10-24 18:02:26 +02:00
Khushboo Verma
4240089d41 Add create deployment endpoint 2024-10-22 19:45:49 +02:00
loks0n
c3d6dcad86 chore: bump assistant 2024-10-15 13:46:00 +01:00
Jake Barnby
8bc37026cd
Revert "Feat adding coroutines" 2024-10-08 20:54:40 +13:00
Binyamin Yawitz
d14edf4207
reverting: to set coroutines as head 2024-10-01 10:30:47 -04:00
Binyamin Yawitz
5512340cdd
Revert "Feat eldad4 coroutines" 2024-09-20 12:30:05 -04:00
Binyamin Yawitz
48d4d873de
Merge branch '1.6.x' into feat-eldad4-coroutines 2024-09-19 13:50:27 -04:00
Christy Jacob
156617d147 chroe: update executor 2024-09-18 15:46:21 +00:00
Binyamin Yawitz
1581a8c654
chore: merge 2024-09-18 09:28:55 -04:00
Christy Jacob
8ce9e79cc1 chore:update console 2024-09-17 21:46:23 +00: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
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
Christy Jacob
d13b5ca57e feat: review comments 2024-08-27 16:09:34 +04:00
Christy Jacob
fec30cc614 feat: update SDK version 2024-08-27 15:56:15 +04:00
Christy Jacob
2ccf617dd8 feat: update SDK version 2024-08-27 14:25:25 +04:00
Christy Jacob
a2030c170b chore: update sdks 2024-08-26 20:33:43 +04: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
6b940bad05 gix go runtime 2024-08-22 15:44:58 +00:00
Matej Bačo
f98184405b Upgrade OPR versions 2024-08-22 12:15:38 +00:00
Christy Jacob
5799892f12 feat: update SDKs and docs 2024-08-21 00:25:59 +04:00
Christy Jacob
a6748be70f Merge branch '1.6.x' of github.com:appwrite/appwrite into update-sdks-1.6 2024-08-20 14:53:08 +04:00
Bradley Schofield
4e2b95aecc Update to the latest version of the executor 2024-08-19 20:23:59 +09:00
Christy Jacob
4621a7da74 feat: update sdks 2024-08-18 13:25:08 +04:00
Christy Jacob
77c8ab7e5f feat: update sdks 2024-08-18 13:21:23 +04:00
Christy Jacob
a5ccba7561 chore: update console and specs 2024-08-16 20:58:55 +00:00
Matej Bačo
9d8c0d37f6 PR review changes 2024-08-14 16:00:13 +00:00
Matej Bačo
380dc8a106 Fix manual templates 2024-08-13 10:50:58 +00:00
Christy Jacob
282f5088db
Merge pull request #8523 from appwrite/refactor-console-links
Refactor console links
2024-08-13 01:12:31 +04: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
Khushboo Verma
cd5a9c5c84 Update proxy version 2024-08-12 23:41:33 +05:30
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
f4e2736475
fix: Adding restart to the scheduler 2024-07-18 13:53:31 -04: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
0ecc1849a7 feat: containerized console 2024-07-17 19:24:52 +02:00
Khushboo Verma
0970d784ff Handle false appended to string 2024-07-16 16:10:17 +05:30
Binyamin Yawitz
a3682b72e1
Merge remote-tracking branch 'refs/remotes/origin/main' into feat-eldad4-coroutines
# Conflicts:
#	app/cli.php
#	app/console
#	app/controllers/api/projects.php
#	app/controllers/general.php
#	app/init.php
#	app/realtime.php
#	app/worker.php
#	composer.json
#	composer.lock
2024-07-03 17:03:24 -04:00
Matej Bačo
b49a5fe03b Upgrade executor 2024-07-03 12:03:39 +00:00
Damodar Lohani
75cd558670
Merge pull request #8323 from appwrite/feat-opr-v4-support
OPR v4 support
2024-07-03 15:11:54 +05:45
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
5fb41fd216 Fix executions 2024-07-03 08:00:17 +00:00
Matej Bačo
5ef196ec9a PR review changes 2024-07-03 07:11:15 +00:00
Matej Bačo
7dec126987 Revert unwanted change 2024-07-02 17:16:53 +00:00
Matej Bačo
f1603ecb6a Upgrade executor 2024-07-02 17:15:20 +00:00
Khushboo Verma
ead0b93900 Resolve merge conflict 2024-07-02 14:59:15 +05:30
Steven Nguyen
636497304e
Merge branch '1.5.x' into chore-sync-1.5.x-into-main 2024-06-25 23:47:37 +00:00
Luke B. Silver
dab0a17082
Merge branch '1.6.x' into feat-scheduled-executions 2024-06-25 17:21:44 +01:00
Khushboo Verma
0edbec4f44 OPR v4 support 2024-06-25 15:03:07 +05:30
Christy Jacob
a2f27ec15f Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-with-main 2024-06-21 13:11:35 +00: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
c1ded34c12
test: Functions. reverting time and adding restart policy 2024-06-10 07:16:07 -04:00
Jake Barnby
9e487b8ccf
Revert "Merge pull request #8237 from appwrite/revert-8193-feat-remove-random-shared-tables"
This reverts commit 930ae6ded0, reversing
changes made to 1f6417b156.
2024-06-06 20:11:19 +12:00
Binyamin Yawitz
cf30941514
fix: compose file 2024-06-05 20:46:49 -04:00
Binyamin Yawitz
6b0892a495
refactor: Adjusting to merge and some code cleanups 2024-06-05 20:41:23 -04:00
Christy Jacob
ff6efc2855
Revert "Feat remove random shared tables" 2024-06-06 00:11:56 +05:30
Jake Barnby
f459a5c458
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-remove-random-shared-tables
# Conflicts:
#	docker-compose.yml
2024-06-04 17:43:14 +12:00
Damodar Lohani
66ac96580b
Merge branch 'main' into feat-security-emails 2024-06-04 06:51:24 +05:45
Binyamin Yawitz
ccafc06d93
Merge branch '1.6.x' into feat-unified-app-logger-config 2024-05-28 10:18:39 -04:00
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
00c047d804
Run full tests on shared tables 2024-05-24 20:29:06 +12: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
Christy Jacob
aa76862692 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-with-1.5.x 2024-05-22 19:43:31 +00:00
Binyamin Yawitz
e1863053ad
refactor(messaging worker): Adding volume and volume variables 2024-05-21 15:51:32 -04:00
Matej Bačo
a115f878b3 Merge remote-tracking branch 'origin/1.6.x' into feat-function-tokens 2024-05-21 10:28:21 +00:00
Christy Jacob
d258240f08 Merge pull request #8152 from appwrite/fix-improve-cold-start-error
fix: improve cold start error
2024-05-20 17:26:58 +01:00
Luke B. Silver
ae321268b5
Merge branch 'main' into fix-improve-cold-start-error 2024-05-18 13:53:02 +01:00
Luke B. Silver
237bec49b2
Merge branch 'main' into chore-remove-compose-version 2024-05-18 13:52:48 +01:00
loks0n
3d119ad1a6 fix: improve cold start error 2024-05-17 18:16:10 +01:00
loks0n
96741ac70e chore: remove compose version 2024-05-17 11:19:29 +01:00
Khushboo Verma
8ecc2ee787 Remove hyphen 2024-05-16 14:03:51 +05:30
Christy Jacob
dabb5d18af
Merge branch 'main' into remove-obsolete-tasks 2024-05-16 12:14:07 +04:00
Christy Jacob
10722aa736 chore: cleanup obsolete tasks and workers 2024-05-16 07:11:00 +00:00
Khushboo Verma
503495df16 Update executor image name to exc-1 2024-05-15 18:32:37 +05:30
Bradley Schofield
6dd9611162
Update container_name values 2024-05-15 06:50:59 +00:00
Bradley Schofield
2527ce1e5c
Address Jake's Comments 2024-05-15 06:07:17 +00:00
Bradley Schofield
20bf989dca Improve container naming conventions 2024-05-07 10:46:15 +09:00
Matej Bačo
9252b66493 Add scope tests 2024-05-06 11:27:28 +00:00
Matej Bačo
9a0d9cee15 Merge remote-tracking branch 'origin/main' into feat-function-tokens 2024-05-06 08:35:14 +00:00
Jake Barnby
db94070162
Use DSN for project database 2024-05-06 17:33:36 +12:00
Damodar Lohani
14a0dd3166 Merge remote-tracking branch 'origin/main' into feat-security-emails 2024-05-06 01:04:44 +00:00
Matej Bačo
9616de7576 Merge branch 'main' into refactor-usage-sn-1.5.x 2024-04-26 13:11:21 +02:00
Steven Nguyen
73562fdb2b
fix(platform): update mariadb to auto upgrade on startup
There are times when we need to upgrade MariaDB. Setting this env
variable will have it automatically upgrade so the user doesn't need to
do anything.
2024-04-24 22:38:55 +00:00
Matej Bačo
2551cf6fb1 Merge branch 'refactor-usage-sn' into refactor-usage-sn-1.5.x 2024-04-17 17:56:31 +02:00
Khushboo Verma
6d5b087605 Bump executor version to 0.5.1 2024-04-05 22:39:52 +05:30
Khushboo Verma
008c3ac19a Update executor version 2024-04-03 17:18:15 +05:30
Matej Bačo
d091b37a15 Merge branch 'refactor-usage-sn' into refactor-usage-sn-1.5.x 2024-04-02 18:42:17 +02:00
Damodar Lohani
00c45c2507 new environment for certificates and security emails 2024-03-31 03:32:55 +00:00
Christy Jacob
380b5f7f84
Merge pull request #7414 from appwrite/remove-cloud-scripts
remove cloud related scripts
2024-03-21 01:27:34 +05:30
Steven Nguyen
c8728c3c10
fix(functions): bump executor version to fix docker conflict error 2024-03-19 21:33:22 +00:00
Bradley Schofield
15a6c510a0 Upload 400s to separate error logger 2024-03-11 10:23:52 +01:00
Torsten Dittmann
dfef0e732c sync: main -> 1.5.x 2024-03-07 17:16:39 +01:00
shimon
dfac3d585a Merge branch 'main' of github.com:appwrite/appwrite into remove-cloud-scripts 2024-03-06 17:58:58 +01:00
Torsten Dittmann
4e04a70a49
Merge branch '1.5.x' into feat-new-runtimes 2024-03-05 11:53:10 +01:00
loks0n
a98323d8c9 chore: update executor, update appwrite/runtimes 2024-03-05 11:47:07 +01:00
Torsten Dittmann
a53e630536 Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x-2 2024-03-05 10:31:51 +01:00
Christy Jacob
e90f536bd7 Merge branch 'main' of https://github.com/appwrite/appwrite into revert-7629-revert-7614-chore-usage-queue-health 2024-03-01 16:47:24 +00:00
Christy Jacob
45092a1049
Update docker-compose.yml 2024-03-01 22:10:25 +05:30
Christy Jacob
2ffcb9b07e Merge branch 'main' of https://github.com/appwrite/appwrite into refactor-usage-sn 2024-03-01 16:08:03 +00:00
Torsten Dittmann
7fa578c901 Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x 2024-03-01 14:20:32 +01:00
Steven Nguyen
fed197a313
Merge branch '1.4.x' into chore-sync-1.4.x-into-main 2024-02-29 21:53:39 +00:00
loks0n
52d956b465 chore: upgrade assistant 2024-02-28 10:25:17 +00:00
Christy Jacob
7ae09ba795
Revert "Revert "usage/usage-dump queue health endpoints"" 2024-02-25 13:42:28 +05:30
Jake Barnby
6e4eb348c1
Remove preloading 2024-02-23 19:34:54 +13:00
Jake Barnby
dc3608633b
Revert "Test remove usage dump worker"
This reverts commit 8ec1f7755b.
2024-02-23 00:37:38 +13:00
Jake Barnby
8ec1f7755b
Test remove usage dump worker 2024-02-23 00:20:11 +13:00
Christy Jacob
a8098831a3
Revert "usage/usage-dump queue health endpoints" 2024-02-22 12:21:48 +05:30
Jake Barnby
942847cf3a
Merge remote-tracking branch 'origin/main' into 1.5.x
# Conflicts:
#	app/config/collections.php
#	app/config/errors.php
#	app/config/specs/open-api3-latest-client.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	app/controllers/api/account.php
#	app/controllers/api/teams.php
#	app/controllers/api/users.php
#	app/controllers/shared/api.php
#	app/init.php
#	app/worker.php
#	composer.json
#	composer.lock
#	docker-compose.yml
#	src/Appwrite/Extend/Exception.php
#	src/Appwrite/Platform/Services/Tasks.php
#	src/Appwrite/Platform/Tasks/Maintenance.php
#	src/Appwrite/Platform/Workers/Certificates.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Platform/Workers/Messaging.php
#	src/Appwrite/Platform/Workers/Usage.php
#	src/Appwrite/Platform/Workers/UsageHook.php
#	src/Appwrite/Specification/Format/OpenAPI3.php
#	src/Appwrite/Specification/Format/Swagger2.php
#	tests/e2e/Services/Account/AccountConsoleClientTest.php
2024-02-22 01:29:28 +13:00
Torsten Dittmann
3476ab2627 dev: introduce redis insights 2024-02-13 12:26:02 +00:00
shimon
8c44627da1 Merge branch 'main' of github.com:appwrite/appwrite into remove-cloud-scripts
 Conflicts:
	Dockerfile
	src/Appwrite/Platform/Services/Workers.php
2024-02-13 10:29:17 +02:00
Jake Barnby
18f7168160
Merge main 2024-02-12 14:18:19 +13:00
shimon
790cdc297b composer update 2024-02-08 10:26:45 +02:00
shimon
632f78140f Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into usage-queue-poc
 Conflicts:
	composer.json
	composer.lock
2024-02-08 09:29:12 +02:00
Khushboo Verma
1fefb7e133 Add a 20 second delay to maintenance worker 2024-02-05 15:01:23 +05:30
shimon
6a6c3445fa updates 2024-02-04 20:02:01 +02:00
Khushboo Verma
d40a51b50a Only disallow console requests 2024-02-02 20:01:54 +05:30
Khushboo Verma
7b4f334f31 Update error message 2024-02-02 19:30:54 +05:30
Jake Barnby
01d92d3125
Merge pull request #7526 from appwrite/feat-update-containers
Update containers
2024-02-02 22:23:11 +13:00
Khushboo Verma
0ea7b28a6b Resolve merge conflicts 2024-02-02 12:53:25 +05:30
Torsten Dittmann
9c0bd9fc6e
Merge pull request #7489 from appwrite/update-webhook-abuse-limit
Add webhook max failed attempts as env variable
2024-02-01 13:34:57 +01:00
Jake Barnby
9051c31a02
Update traefik, mariadb, redis containers 2024-02-01 02:36:35 +13:00
Khushboo Verma
dadb94c499 Merge branch '1.5.x' into feat-block-countries 2024-01-31 12:24:21 +05:30
shimon
be829e2db4 Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into remove-cloud-scripts
 Conflicts:
	Dockerfile
	docker-compose.yml
	src/Appwrite/Platform/Services/Tasks.php
	src/Appwrite/Platform/Services/Workers.php
	src/Appwrite/Platform/Tasks/CalcTierStats.php
	src/Appwrite/Platform/Workers/Hamster.php
2024-01-30 20:47:35 +02:00
Christy Jacob
2ff7c5ac8e chore: rename env variable 2024-01-29 20:07:17 +00:00
Christy Jacob
dc6f9e6d59 chore: add new env variable 2024-01-29 20:01:14 +00:00
Khushboo Verma
f4426d553c Throw 451 exception 2024-01-29 16:49:13 +05:30
Matej Bačo
36ce992e9f Add API Tokens 2024-01-29 11:15:07 +00:00
Khushboo Verma
4cd5999bb3 Merge branch '1.5.x' into feat-block-countries 2024-01-29 16:25:31 +05:30
shimon
7a2ee683e3 refactor usage poc 2024-01-28 11:28:59 +02:00
Khushboo Verma
e4b3f652e7 Add webhook abuse as env variable 2024-01-26 21:25:35 +05:30
fogelito
a782e20315 Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing
 Conflicts:
	app/controllers/api/account.php
	composer.json
	composer.lock
	src/Appwrite/Platform/Tasks/CalcTierStats.php
	tests/e2e/Services/Account/AccountBase.php
2024-01-25 17:44:05 +02:00
Torsten Dittmann
9f5a0312cf Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 11:24:59 +01:00
Khushboo Verma
c07a3889e6 WIP: Add new group to api.php 2024-01-24 14:41:35 +05:30
fogelito
3689435176 Arrays tests 2024-01-21 10:10:18 +02:00
Khushboo Verma
a134ca7efd Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-19 17:12:14 +05:30
Khushboo Verma
3e5443f127 Add env variables to mails worker instead of webhooks worker 2024-01-19 17:09:48 +05:30
shimon
a0b38a5a7c Merge branch 'main' of github.com:appwrite/appwrite into refactor-usage-sn 2024-01-18 14:19:19 +02:00
Khushboo Verma
d443602cbc resolve merge conflicts 2024-01-12 01:55:32 +05:30
Jake Barnby
322dae626a
Merge branch '1.5.x' into feat-message-scheduling 2024-01-11 22:29:49 +13:00
Jake Barnby
aca07a20c7
Merge branch 'main' into 1.5.x 2024-01-11 22:28:50 +13:00
Jake Barnby
320919fef2
Merge remote-tracking branch 'origin/1.4.x' into 1.5.x 2024-01-11 19:59:59 +13:00
Jake Barnby
38e9aefa2f
Update compose 2024-01-11 16:14:38 +13:00
Jake Barnby
513ed9de05
Merge remote-tracking branch 'origin/1.5.x' into scheduling-temp
# Conflicts:
#	app/controllers/api/messaging.php
#	tests/e2e/Services/Messaging/MessagingBase.php
2024-01-11 13:06:15 +13:00
loks0n
310d75b6be feat: update assistant 2024-01-10 10:17:52 +00:00
Khushboo Verma
b3e87d7de8 Formatted email as per design 2024-01-10 01:55:36 +05:30
shimon
1da476e5ac remove cloud related scripts 2024-01-09 11:13:58 +02:00
Torsten Dittmann
0a17e2bce9
feat: add new env variable to compsoe files 2024-01-02 19:53:37 +00:00
shimon
99f1543f1b Merge branch 'main' of github.com:appwrite/appwrite into refactor-usage-sn
 Conflicts:
	.gitmodules
	Dockerfile
	app/console
	app/init.php
	composer.lock
	src/Appwrite/Platform/Services/Workers.php
	src/Appwrite/Platform/Tasks/Hamster.php
2024-01-02 11:49:23 +02:00
Torsten Dittmann
cc1272f80b feat: add new env variable to compsoe files 2023-12-29 22:09:59 +01:00
shimon
d1751565cf refactor usage worker 2023-12-24 20:38:15 +02:00
Khushboo Verma
557565b949 Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2023-12-15 01:46:47 +05:30
Jake Barnby
5135262b79
Merge remote-tracking branch 'origin/1.4.x' into 1.5.x
# Conflicts:
#	app/config/errors.php
#	composer.lock
2023-12-15 02:41:46 +13:00
Prateek Banga
b8aa2faa7b adds scheduling commit, still need to resolve pools error 2023-12-07 11:25:19 +01:00
德华 刘
49bb3444bf chore: add logs 2023-11-30 21:11:31 +00:00
Bradley Schofield
dea3e74b6a Implement Job based hamster 2023-11-28 10:19:55 +00:00
Khushboo Verma
2bcb6c18fb Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2023-11-20 17:40:32 +05:30
Marton Schneider
5a2f06fb83 add support endpoint URL for S3 2023-11-18 13:02:47 +01:00
prateek banga
c24664f5d9 removes internal provider 2023-11-16 01:30:47 +05:30
Khushboo Verma
3f584b85be Limit webhook failure attempts to 10 2023-11-14 14:20:26 +05:30
Prateek Banga
270e6e7c15 review changes 2023-11-02 16:43:24 +05:30
prateek banga
0dafc59cc2 converted env vars to dsn format 2023-10-31 02:05:50 +05:30
shimon
4c6976488c clean up 2023-10-25 15:06:54 +03:00
shimon
9fad9dca88 usage sync 2023-10-25 10:39:59 +03:00
prateek banga
6c260223ba Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x 2023-10-20 15:00:22 +05:30
prateek banga
161bbfb822 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x 2023-10-20 14:55:17 +05:30
Matej Bačo
20c37db8fc Upgrade executor 2023-10-19 11:54:56 +02:00
prateek banga
99b5ac8669 adds push and sms controllers 2023-10-19 13:29:48 +05:30
Christy Jacob
20985c7ee4
Merge pull request #6946 from appwrite/remove-resque
chore: remove resque library and update health check endpoints
2023-10-18 16:59:44 -04:00
Christy Jacob
be26e4b729 chore: remove resque library and update health check endpoints 2023-10-18 19:44:06 +00:00
Christy Jacob
f822f86517
Merge branch '1.4.x' into refactor-workers-sn 2023-10-18 15:26:45 -04:00
Christy Jacob
67642f9f91 chore: update docker compose config 2023-10-18 01:56:05 +04:00
shimon
b42a9e94e2 some fixes 2023-10-17 18:12:24 +03:00
shimon
3d5930c104 some fixes 2023-10-17 16:55:08 +03:00
Matej Bačo
97ea29bba2 Add dart 3.1 support 2023-10-17 10:18:29 +02:00