Commit graph

168 commits

Author SHA1 Message Date
shimon
7df94fcee6 Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into feat-sms-locale
 Conflicts:
	composer.json
	composer.lock
2024-04-07 18:17:16 +03:00
shimon
dfac3d585a Merge branch 'main' of github.com:appwrite/appwrite into remove-cloud-scripts 2024-03-06 17:58:58 +01:00
Damodar Lohani
9fe0a5a31b
Update Mail.php 2024-02-24 21:03:18 +05:45
Damodar Lohani
d91a0e3048 reset variables 2024-02-24 14:56:53 +00:00
Damodar Lohani
ea484e593b format 2024-02-24 14:49:17 +00:00
Damodar Lohani
ca1c83c2cf method to reset attachment 2024-02-24 14:33:38 +00:00
Christy Jacob
a8098831a3
Revert "usage/usage-dump queue health endpoints" 2024-02-22 12:21:48 +05:30
Shimon Newman
3f7d35065e
Merge pull request #7614 from appwrite/chore-usage-queue-health
usage/usage-dump queue health endpoints
2024-02-20 09:59:52 +02:00
shimon
22e7c58d7d Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into remove-cloud-scripts 2024-02-19 17:38:13 +02:00
shimon
2a5f21e982 Addressed comments 2024-02-15 17:12:37 +02:00
shimon
62ee10493b usage sms per country code count 2024-02-15 10:10:01 +02:00
shimon
dac0e2a543 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
 Conflicts:
	src/Appwrite/Platform/Workers/UsageHook.php
2024-02-13 10:48:47 +02: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
shimon
6b6f04d2d3 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
 Conflicts:
	app/config/collections.php
	app/controllers/shared/api.php
2024-02-12 10:55:53 +02:00
shimon
93a99b561c remove debug lines 2024-02-07 11:54:18 +02:00
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
shimon
44ed6826a9 refactor usage poc 2024-01-28 15:33:04 +02:00
shimon
7a2ee683e3 refactor usage poc 2024-01-28 11:28:59 +02:00
shimon
1da476e5ac remove cloud related scripts 2024-01-09 11:13:58 +02:00
shimon
03f2041913 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc 2024-01-07 18:09:48 +02: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
Damodar Lohani
ffdc662022 fix formatting 2023-12-09 06:41:24 +00:00
Damodar Lohani
e4467521f8
Merge branch 'refactor-usage-sn' into feat-mail-template-override-ur 2023-12-09 07:36:11 +01:00
Damodar Lohani
e3bab623f1 fix redis issue by encoding content 2023-12-08 21:34:39 +00:00
Damodar Lohani
386cee5137 mail support string as attachment 2023-12-08 19:57:15 +00:00
Damodar Lohani
83d4de9f73
support maile template override 2023-12-06 14:52:13 +01:00
德华 刘
d4ff696173 chore: fix linter issues 2023-11-30 20:35:18 +00:00
德华 刘
d34050a5df chore: address review comments 2023-11-30 16:22:26 +00:00
Bradley Schofield
dea3e74b6a Implement Job based hamster 2023-11-28 10:19:55 +00:00
shimon
1869852985 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
 Conflicts:
	app/controllers/shared/api.php
	composer.lock
	src/Appwrite/Platform/Workers/Deletes.php
2023-11-26 16:29:18 +02:00
Christy Jacob
be26e4b729 chore: remove resque library and update health check endpoints 2023-10-18 19:44:06 +00:00
shimon
593e5ab316 some fixes 2023-10-17 22:08:01 +03:00
shimon
56f565bf30 addressing some comments 2023-10-17 07:23:33 +03:00
shimon
e8dbd043ec addressing some comments 2023-10-17 07:02:54 +03:00
shimon
9a6d88a819 addressing some comments 2023-10-17 06:44:36 +03:00
shimon
0e2cf14e12 minor fix 2023-10-16 18:17:13 +03:00
Shimon Newman
710ac707e3
Update src/Appwrite/Event/Audit.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-10-16 18:11:29 +03:00
Jake Barnby
1ac3372239
Set queue name per worker 2023-10-12 17:55:30 +13:00
Jake Barnby
096a529618
Revert "Merge branch 'feat-db-per-process' of github.com:appwrite/appwrite into feat-db-per-process"
This reverts commit 6f42305484, reversing
changes made to 69abd222e8.
2023-10-12 15:30:01 +13:00
Jake Barnby
6f42305484
Merge branch 'feat-db-per-process' of github.com:appwrite/appwrite into feat-db-per-process
# Conflicts:
#	bin/worker-databases
#	src/Appwrite/Event/Database.php
#	src/Appwrite/Platform/Workers/Databases.php
2023-10-12 15:28:52 +13:00
Jake Barnby
69abd222e8
Simplify 2023-10-12 15:26:01 +13:00
Jake Barnby
7a78f49eb9
Allow multiprocess for db queue 2023-10-12 15:23:16 +13:00
Jake Barnby
5d845208d9
Simplify 2023-10-12 15:02:53 +13:00
Jake Barnby
d238d79e29
Allow multiprocess for db queue 2023-10-11 21:28:29 +13:00
shimon
b02d51c794 migrations worker 2023-10-01 20:39:26 +03:00
shimon
c4bd6e008e Merge branch 'master' of github.com:appwrite/appwrite into refactor-workers
 Conflicts:
	.env
	app/cli.php
	app/config/collections.php
	app/console
	app/controllers/api/account.php
	app/controllers/api/databases.php
	app/controllers/api/functions.php
	app/controllers/api/projects.php
	app/controllers/api/storage.php
	app/controllers/api/teams.php
	app/controllers/api/users.php
	app/controllers/general.php
	app/controllers/shared/api.php
	app/init.php
	app/worker.php
	app/workers/audits.php
	app/workers/builds.php
	app/workers/certificates.php
	app/workers/databases.php
	app/workers/deletes.php
	app/workers/functions.php
	app/workers/mails.php
	bin/worker-usage
	composer.json
	composer.lock
	docker-compose.yml
	src/Appwrite/Event/Delete.php
	src/Appwrite/Event/Mail.php
	src/Appwrite/Platform/Tasks/Maintenance.php
2023-09-27 18:51:17 +03:00
Binyamin Yawitz
5cb03da001 Extracting function event validator to its own class. 2023-09-11 23:24:11 -04:00
shimon
ec93239630 Merge branch 'master' of github.com:appwrite/appwrite into refactor-cache-poc
 Conflicts:
	app/config/collections.php
	app/controllers/api/storage.php
	app/controllers/shared/api.php
	app/init.php
	app/workers/deletes.php
2023-09-05 19:19:59 +03:00
Matej Bačo
c98d5bd3cd Fix SMTP after QA 2023-08-29 11:40:30 +02:00
Bradley Schofield
77aa48c22a Update Mail.php 2023-08-28 06:53:29 +01:00