Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-18 14:38:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
26362 commits 1250 branches 495 tags 497 MiB
Commit graph

851 commits

Author SHA1 Message Date
Damodar Lohani
74a293d425
Merge branch 'main' into feat-file-tokens 2024-06-20 15:43:38 +05:45
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
Damodar Lohani
52d27179a9 fix jwt response 2024-03-17 03:01:55 +00:00
Damodar Lohani
c6d524c25d fix formatting 2024-03-17 02:08:22 +00:00
Damodar Lohani
8d67498e52 Merge remote-tracking branch 'origin/main' into feat-file-tokens 2024-03-17 01:59:07 +00: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
Damodar Lohani
fa40a33631 fixes and refactor 2024-01-04 06:53:22 +00:00
Damodar Lohani
1065abb0a7 update preview to use token 2024-01-04 04:57:10 +00:00
Damodar Lohani
c1c98e4ac8 improve API to new data structure and supprot JWT 2024-01-04 02:46:52 +00:00
Damodar Lohani
fa09a69a7f Merge remote-tracking branch 'origin/main' into feat-file-tokens 2024-01-04 02:23:50 +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
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
Damodar Lohani
eb1562f56b rename param to expiry for consistency 2023-12-28 10:48:42 +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
b23369c548 improve token endpoints 2023-12-27 02:15:59 +00:00
Damodar Lohani
23d0aae23b improve get file token 2023-12-27 00:03:16 +00:00
Damodar Lohani
92c2e26f3a improve list file tokens 2023-12-26 23:59:41 +00:00
Damodar Lohani
2e39fbe70f improve file token create 2023-12-26 23:52:20 +00:00
Damodar Lohani
bfa941d69c WIP: file tokens endpoint 2023-12-25 07:09:35 +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
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
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
shimon
45f16e560c sync against master 2023-09-05 21:17:54 +03:00
shimon
ec93239630 Merge branch 'master' of github.com:appwrite/appwrite into refactor-cache-poc 
 Conflicts:
	app/config/collections.php
	app/controllers/api/storage.php
	app/controllers/shared/api.php
	app/init.php
	app/workers/deletes.php
 2023-09-05 19:19:59 +03: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