Damodar Lohani
5105d07bbf
Merge remote-tracking branch 'origin/refactor-usage-sn' into fix-tests-for-cl-1
2024-05-08 06:09:46 +00:00
Jake Barnby
6e3dee4e1f
Fix shared tables db queue name
2024-05-08 16:25:12 +12:00
Jake Barnby
0e9838d290
Remove logging and test files
2024-05-07 15:48:20 +12:00
Damodar Lohani
e25e7f8ec7
fix null
2024-05-06 06:50:36 +00:00
Damodar Lohani
53547f8677
fix null
2024-05-06 06:48:19 +00:00
Jake Barnby
b2e956a14d
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-isolation-modes
...
# Conflicts:
# .gitignore
# app/cli.php
# app/controllers/api/account.php
# app/controllers/api/databases.php
# app/controllers/api/projects.php
# app/controllers/general.php
# app/controllers/shared/api.php
# app/init.php
# app/realtime.php
# app/worker.php
# composer.json
# composer.lock
# src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php
# src/Appwrite/Platform/Tasks/GetMigrationStats.php
# src/Appwrite/Platform/Workers/Databases.php
# src/Appwrite/Platform/Workers/Deletes.php
# src/Appwrite/Platform/Workers/Hamster.php
# tests/e2e/General/HTTPTest.php
# tests/e2e/Services/Databases/DatabasesCustomServerTest.php
# tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
2024-04-30 19:40:47 +12:00
Matej Bačo
d091b37a15
Merge branch 'refactor-usage-sn' into refactor-usage-sn-1.5.x
2024-04-02 18:42:17 +02:00
Jake Barnby
c7bf9bb3ec
Debug
2024-03-12 17:09:09 +01:00
Jake Barnby
cfc69b0f92
Debug
2024-03-12 16:54:06 +01:00
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
shimon
dfac3d585a
Merge branch 'main' of github.com:appwrite/appwrite into remove-cloud-scripts
2024-03-06 17:58:58 +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
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
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
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
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
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
