Jake Barnby
ab0fae216d
Merge remote-tracking branch 'origin/1.5.x' into feat-php-8-1
...
# Conflicts:
# composer.lock
2024-01-30 18:44:16 +13:00
fogelito
9c8c017618
Merge branch '1.5.x' of github.com:appwrite/appwrite into feat-php-8-1
...
Conflicts:
app/controllers/api/databases.php
app/controllers/api/projects.php
app/controllers/api/users.php
composer.json
composer.lock
2024-01-29 08:50:53 +02:00
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
fogelito
8dd387cfbe
Parsing and Throw Error
2024-01-23 17:14:14 +02:00
Jake Barnby
b3819186cb
Fix chunked upload file ID validation for first chunk
2024-01-09 15:38:56 +13:00
Jake Barnby
51b2019ab6
Merge remote-tracking branch 'origin/1.5.x' into json-parsing
...
# Conflicts:
# composer.lock
2024-01-09 13:56:01 +13: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
879320e23e
update comment regarding validation
2024-01-02 11:53:48 +05:45
Damodar Lohani
b2b863f09f
Merge branch 'main' into fix-chunk-upload-permission
2024-01-02 11:51:09 +05:45
Damodar Lohani
a2ad870084
use compression constant from utopia/storage
2023-12-31 11:46:45 +00:00
Damodar Lohani
1c236959ba
fix algorithm attribute on file if size is above read buffer size
2023-12-29 01:49:56 +00:00
Damodar Lohani
9cb5eb0180
use constants for compression type
2023-12-28 11:42:40 +00:00
Damodar Lohani
a28be2bf48
return when response is sent to prevent further execution
2023-12-28 11:32:04 +00:00
Damodar Lohani
5455db7c7f
improve order
2023-12-28 11:26:45 +00:00
shimon
260b280e10
preview_output_fix
2023-12-28 11:54:21 +02:00
Damodar Lohani
94a18ede78
fix formatting
2023-12-28 01:35:10 +00:00
Damodar Lohani
e8ff828039
fix for file extension not supported
...
- the error occured with jfif extension, which is essentially a jpeg file
2023-12-28 01:31:25 +00:00
Damodar Lohani
cbd3e85b38
fix formatting
2023-12-25 06:07:28 +00:00
Damodar Lohani
26ac88c32e
validate create permission while updating chunk uploaded file
2023-12-25 05:54:59 +00:00
Damodar Lohani
5e59d73f78
rename stats collection
2023-12-18 10:11:10 +00:00
Jake Barnby
121521d7c5
Merge remote-tracking branch 'origin/1.5.x' into json-parsing
...
# Conflicts:
# composer.lock
# src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php
# src/Appwrite/Platform/Tasks/Hamster.php
2023-12-15 18:22:08 +13:00
fogelito
2fe50717d1
TYPE_CURSOR_AFTER TYPE_CURSOR_BEFORE
2023-12-06 15:10:40 +01:00
shimon
21895e3ac0
Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn
...
Conflicts:
.gitmodules
CHANGES.md
Dockerfile
app/controllers/api/storage.php
app/init.php
composer.lock
src/Appwrite/Migration/Migration.php
src/Appwrite/Platform/Services/Tasks.php
src/Appwrite/Usage/Calculators/TimeSeries.php
2023-11-26 10:28:17 +02:00
Khushboo Verma
fccbe405db
Add chunkId to abuse key to prevent rate limit for SDKs
2023-11-16 23:04:38 +05:30
shimon
ad63a377ab
added inf metric
2023-11-08 11:09:32 +02:00
Christy Jacob
9fc7c1384a
Merge pull request #7071 from appwrite/fix-swoole-warning
...
feat: fix swoole warning
2023-11-03 19:46:59 +04:00
loks0n
305c781206
feat: fix swoole warning
2023-11-03 12:18:24 +00:00
shimon
1c1028412a
refactor users, project, functions usage display
2023-11-01 20:44:06 +02:00
shimon
04290730b2
refactor storage, databases usage display
2023-11-01 17:20:12 +02:00
shimon
4c6976488c
clean up
2023-10-25 15:06:54 +03:00
shimon
9fad9dca88
usage sync
2023-10-25 10:39:59 +03:00
shimon
2451d9fef1
Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-workers-sn
...
Conflicts:
src/Appwrite/Platform/Workers/Deletes.php
2023-10-16 17:06:59 +03:00
shimon
94178f8eaf
rollback to Usage
2023-10-15 20:41:09 +03:00
Torsten Dittmann
3778939605
fix: relative links to absolute
2023-10-13 15:43:23 +02:00
shimon
429dabaaee
sync with 1.4
2023-10-03 19:50:48 +03:00
shimon
2bb4d8fb89
sync with 1.4
2023-10-02 17:02:48 +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
Vincent (Wen Yu) Ge
86f0e6008c
Merge branch 'master' into sentence-case
2023-09-27 11:11:58 -04:00
Steven Nguyen
9bc6011876
Fix fileSecurity check
...
Because of the `getAttributes()` call, `$fileSecurity` was always true
which lead to invalid permission check. This resulted in files being
deleted when a user had delete permissions on the file even though
they didn't on the bucket.
2023-08-31 20:28:13 -07:00
Matej Bačo
43b1c196e0
Merge branch 'feat-git-integration' into feat-git-integration-copy
2023-08-23 10:16:23 +02:00
Jake Barnby
efd25d6a70
Merge remote-tracking branch 'origin/feat-git-integration' into feat-framework-router-v2
...
# Conflicts:
# app/controllers/api/users.php
# composer.json
# composer.lock
# tests/e2e/Services/Storage/StorageBase.php
2023-08-22 17:58:42 -04:00
Vincent (Wen Yu) Ge
07a7a710ee
Improve error and copy in params/models
2023-08-22 20:11:33 +00:00
Jake Barnby
2edbb1269f
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
2023-08-22 16:02:29 -04:00
Jake Barnby
c929fe113e
Fix colliding ID overrides
2023-08-22 13:11:32 -04:00
Jake Barnby
b48a64d1ad
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
...
# Conflicts:
# app/controllers/api/functions.php
# composer.json
# composer.lock
# tests/e2e/Services/Databases/DatabasesConsoleClientTest.php
2023-08-22 00:59:36 -04:00
Vincent (Wen Yu) Ge
caf6bcae95
Remove mention of environment variables in docs
2023-08-22 04:16:41 +00:00
Jake Barnby
942705b5f3
Fix database upgrade
2023-08-21 23:25:55 -04:00
shimon
83ffea68d1
rolling back usage flow
2023-08-20 16:53:26 +03:00
shimon
8147f3ee7d
rolling back usage flow
2023-08-20 15:29:43 +03:00
Jake Barnby
414d85be8e
Update mode checks
2023-08-16 17:58:25 -04:00
