Commit graph

184 commits

Author SHA1 Message Date
Steven Nguyen
b19efb619b
feat(events): update build event reset to reset everything
Instead of using setType('') to prevent events from triggering, it
makes more sense to use reset(). However, reset() didn't properly
reset type, resource, deployment, or template. This change makes
sure to reset all those private variables.
2024-03-11 11:17:40 +01:00
Torsten Dittmann
dfef0e732c sync: main -> 1.5.x 2024-03-07 17:16:39 +01:00
Torsten Dittmann
0a1d572c72 chore: run formatter 2024-03-06 18:34:21 +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
7ae09ba795
Revert "Revert "usage/usage-dump queue health endpoints"" 2024-02-25 13:42:28 +05:30
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
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
Jake Barnby
b265106af2
Fix tests 2024-02-21 02:20:09 +13:00
Jake Barnby
bbce53cda5
Auto trigger messaging events 2024-02-21 01:06:35 +13:00
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
2a5f21e982 Addressed comments 2024-02-15 17:12:37 +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
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
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
Torsten Dittmann
9f5a0312cf Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 11:24:59 +01:00
Matej Bačo
20322589dd Improve SMTP test email design 2024-01-17 11:22:08 +00: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
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
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
Jake Barnby
4b58d08fd8
Add providerType to Message 2023-11-29 17:09:44 +13: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
prateek banga
549dcc493d lint fix 2023-11-16 01:33:05 +05:30
prateek banga
c24664f5d9 removes internal provider 2023-11-16 01:30:47 +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
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
Prateek Banga
0b1b7646d5 review changes 2023-10-13 18:26:54 +05:30
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