fogelito
|
7a865dbda9
|
Run tests
|
2024-03-28 12:05:11 +02:00 |
|
|
fogelito
|
dfeaec0f7b
|
transactions fix
|
2024-03-28 11:22:12 +02:00 |
|
Torsten Dittmann
|
dfef0e732c
|
sync: main -> 1.5.x
|
2024-03-07 17:16:39 +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 |
|
|
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 |
|
|
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 |
|
|
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 |
|