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 |
|
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 |
|
|
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 |
|
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 |
|