CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-07-05 06:31:08 +12:00
Code Issues Projects Releases Wiki Activity
18775 commits 205 branches 384 tags 334 MiB
Commit graph

493 commits

Author SHA1 Message Date
shimon e7ace61273 Sync against main 2024-02-12 11:10:52 +02:00
Damodar Lohani 5e59d73f78 rename stats collection 2023-12-18 10:11:10 +00: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
Prateek Banga b68be491b9 updated description 2023-11-17 20:59:09 +05:30
Prateek Banga 9183f2a875 changes enum size validation in update controller 2023-11-17 20:56:18 +05:30
Prateek Banga ab35b75c37 fix test message 2023-11-17 20:14:55 +05:30
Prateek Banga 228b813994 fixes test case 2023-11-17 20:06:28 +05:30
Prateek Banga 827ad84f53 fixes adding longer length enum 2023-11-17 19:09:31 +05:30
shimon ad63a377ab added inf metric 2023-11-08 11:09:32 +02:00
Steven Nguyen 55a73efeab Ensure usage endpoints don't throw 500 when usage is disabled 2023-11-06 21:28:45 +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
Jake Barnby 354211950f
Add timeout test 2023-10-19 17:06:57 +13:00
Jake Barnby b6b8fe7d51
Allow overriding timeout per request in dev mode 2023-10-19 16:19:40 +13:00
Jake Barnby db3fa21468
Update database 2023-10-19 14:26:44 +13:00
Christy Jacob 133cb62b4e fix: update injection name 2023-10-18 19:07:17 +00:00
Christy Jacob 4724d729fb Merge branch 'refactor-workers-sn' of https://github.com/appwrite/appwrite into feat-delegate-deletes 2023-10-18 18:59:51 +00:00
Christy Jacob 066dd6393d Merge branch 'refactor-workers-sn' of https://github.com/appwrite/appwrite into feat-delegate-deletes 2023-10-18 18:57:16 +00:00
Christy Jacob 72d0865ad8 chore: use deletes worker for deleting audit logs 2023-10-18 18:54:20 +00:00
Christy Jacob 050cb28d4f fix: incorrect events 2023-10-18 20:30:47 +04:00
Jake Barnby dbfe5e45aa
Delegate custom deletes 2023-10-17 12:18:51 +13: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 002fc19d60 tests fix 2023-10-10 21:02:24 +03:00
shimon 24e09d3d8e queueForBuilds fix via functions controller 2023-10-09 13:16:05 +03:00
shimon 948f36a023 sync with 1.4 2023-10-05 16:15:39 +03:00
shimon 7f1507f810 sync with 1.4 2023-10-04 11:20:32 +03:00
shimon e3668a4d06 sync with 1.4 2023-10-03 21:56:36 +03:00
shimon 2bb4d8fb89 sync with 1.4 2023-10-02 17:02:48 +03:00
shimon b02d51c794 migrations worker 2023-10-01 20:39:26 +03:00
shimon dcf0107a79 sync with master 2023-09-27 20:10:21 +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
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 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
Jake Barnby 6c67172fd7
Fix missing ID 2023-08-21 23:45:32 -04:00
Jake Barnby 942705b5f3
Fix database upgrade 2023-08-21 23:25:55 -04:00
shimon 8147f3ee7d rolling back usage flow 2023-08-20 15:29:43 +03:00
Jake Barnby 1e3fd5291e
Merge remote-tracking branch 'origin/cl-1.4.x' into fix-collection-disabled-mode-checks 2023-08-18 13:25:21 -04:00
Jake Barnby a88f90dd90
Merge remote-tracking branch 'origin/1.4.x' into chore-1.4.x-upgrade 
# Conflicts:
#	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
#	composer.lock
 2023-08-17 19:51:36 -04:00
prateek banga 860e9958c7 lint fix 2023-08-17 19:04:41 +05:30
Jake Barnby 414d85be8e
Update mode checks 2023-08-16 17:58:25 -04:00
Jake Barnby b6ffb385a7
Merge remote-tracking branch 'origin/cl-1.4.x' into fix-collection-disabled-mode-checks 
# Conflicts:
#	tests/e2e/Services/Databases/DatabasesConsoleClientTest.php
 2023-08-16 15:55:19 -04:00
Jake Barnby 8820d422be
Update app/controllers/api/databases.php 2023-08-14 20:45:05 -04:00
prateek banga 8e1ef812d3 resolve merge conflicts 2023-08-14 21:59:24 +05:30