Christy Jacob
a2f27ec15f
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-with-main
2024-06-21 13:11:35 +00:00
Christy Jacob
991a22f642
Merge pull request #8290 from appwrite/1.5.x
...
Sync 1.5.x into refactor-usage-sn
2024-06-21 00:38:21 +05:30
Christy Jacob
fdf44c7bab
Merge branch 'main' of https://github.com/appwrite/appwrite into sync-with-main
2024-06-20 15:26:17 +00:00
Damodar Lohani
a93dcfa1b3
Update storage.php
2024-06-18 11:46:31 +05:45
Damodar Lohani
3dcd1314f5
fix file size multiplier
2024-06-17 04:50:22 +00:00
choir27
84d9b4befe
docs: fix hyperlink in storage code snippet
2024-06-13 09:59:20 -04:00
Matej Bačo
711e26c605
Relay on lib to verify JWT expiry
2024-05-28 10:59:53 +00:00
Matej Bačo
b1ff989c3f
Implement tests, fix JWT maxAge
2024-05-28 09:25:54 +00:00
Jake Barnby
921eb2b900
App::getEnv -> System::getEnv
2024-05-07 22:08:00 +12:00
shimon
8e291f3700
Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into fix-file-size-limit
...
Conflicts:
app/controllers/api/storage.php
composer.lock
2024-05-05 11:52:49 +03:00
Matej Bačo
9616de7576
Merge branch 'main' into refactor-usage-sn-1.5.x
2024-04-26 13:11:21 +02:00
Steven Nguyen
b75f5263a2
Merge branch 'main' into chore-sync-main-into-1.5.x
2024-04-23 23:43:53 +00:00
Steven Nguyen
4a2056890d
fix(storage): add missing chunkId param to create file abuse key
...
A previous PR added chunkId as an abuse key param to fix a problem where uploading multiple chunks of a file would trigger the `general_rate_limit_exceeded` error. For some reason, the parameter disappeared from the abuse key causing a regression. This PR adds the param back to fix the regression.
Reference:
* https://github.com/appwrite/appwrite/issues/7879
* https://github.com/appwrite/appwrite/pull/7154
2024-04-03 13:28:41 -07:00
Matej Bačo
1234770dc8
CI/CD fixes
2024-04-02 18:48:12 +02: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
Eldad Fux
beda5293b4
Fix format
2024-04-01 13:08:46 +02:00
Eldad Fux
8ed1da4ea8
Updated getEnv to use system lib
2024-04-01 13:02:47 +02:00
shimon
fa97ac7019
maximumFileSize fix
2024-03-19 15:16:21 +02:00
shimon
0ee4b95648
maximumFileSize fix
2024-03-19 15:09:03 +02:00
shimon
2213ddb54d
maximumFileSize fix
2024-03-19 12:54:47 +02:00
shimon
63a30ed083
maximumFileSize fix
2024-03-19 12:15:39 +02:00
Jake Barnby
cea4e0d8b6
Wrap all db exceptions in error handler
2024-03-11 12:54:42 +01:00
Jake Barnby
207ad5fed6
Fix param order
2024-03-08 11:51:24 +01:00
Jake Barnby
2c92837d3a
Remove permissions check
2024-03-08 09:46:43 +01:00
Jake Barnby
2318fad508
Remove JWT param
2024-03-07 20:51:47 +01:00
Jake Barnby
2d02a7df53
Add JWT preview route for push images
2024-03-07 20:43:20 +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
4d873eb5a2
fix: stats collection name
2024-03-05 10:36:23 +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
Jake Barnby
19d7e533fa
Usage desc updates
2024-02-26 15:44:20 +13:00
Christy Jacob
7ae09ba795
Revert "Revert "usage/usage-dump queue health endpoints""
2024-02-25 13:42:28 +05:30
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
379c79dae9
Consistent naming for device resources
2024-02-21 03:10:51 +13:00
Jake Barnby
66e51c0f18
Merge remote-tracking branch 'origin/1.5.x' into 1.5.x-response-request-models
...
# Conflicts:
# src/Appwrite/Platform/Workers/Usage.php
# src/Appwrite/Platform/Workers/UsageHook.php
2024-02-13 15:07:16 +13:00
Jake Barnby
06b15c79ff
Merge pull request #7572 from appwrite/attributes-query-fix
...
fix Indexes
2024-02-13 12:37:59 +13:00
fogelito
ace75b0786
parseQueries
2024-02-12 18:02:04 +02:00
fogelito
e5bada0493
typo
2024-02-12 12:03:31 +02:00
fogelito
adbe11fd50
fix Indexes
2024-02-12 11:55:45 +02:00
shimon
e7ace61273
Sync against main
2024-02-12 11:10:52 +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
350d72eb1f
updates
2024-02-01 12:21:50 +02:00
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
03f2041913
Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
2024-01-07 18:09:48 +02:00
