1
0
Fork 0
mirror of synced 2024-07-06 07:00:56 +12:00
Commit graph

250 commits

Author SHA1 Message Date
Jake Barnby e25fbd1c2a Fix default for usage params 2022-08-25 23:51:59 +12:00
Jake Barnby 625608804e Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix
# 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
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/workers/builds.php
#	src/Appwrite/Stats/Usage.php
#	src/Appwrite/Usage/Calculators/Database.php
2022-08-25 18:21:15 +12:00
Damodar Lohani fa165a735b linter fix 2022-08-21 10:16:55 +00:00
Damodar Lohani 0d57c67cc0 use same method to parse usage params labels 2022-08-21 02:10:42 +00:00
Jake Barnby 7019be987c Merge remote-tracking branch 'origin/0.16.x' into origin/datetime-attributes
# 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
#	app/controllers/api/account.php
#	app/controllers/api/users.php
#	app/controllers/shared/api.php
#	app/workers/deletes.php
#	composer.lock
#	docker-compose.yml
#	phpunit.xml
#	src/Appwrite/Event/Delete.php
2022-08-19 16:20:19 +12:00
Damodar Lohani 3e43424129 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-18 00:49:31 +00:00
shimon 9fc2e4c3a5 sync with 0.16 2022-08-17 17:29:22 +03:00
shimon cc9a166146 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label
 Conflicts:
	app/controllers/api/storage.php
	app/controllers/shared/api.php
2022-08-17 17:08:54 +03:00
Damodar Lohani c0119e6a0d fix formatting 2022-08-17 11:10:17 +00:00
Damodar Lohani 6b11fa26ce rename and remove unused param 2022-08-17 10:55:01 +00:00
shimon 9c68cff317 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-file-cache-cleanup
 Conflicts:
	composer.json
	composer.lock
2022-08-17 11:16:09 +03:00
Damodar Lohani 80dfa85c82 Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-17 00:45:07 +00:00
shimon 1abd57567f linter fix 2022-08-16 18:02:17 +03:00
shimon 5d284b8c27 fill gaps from merge 2022-08-16 16:20:35 +03:00
Christy Jacob 51cb03a93e feat: linter fix 2022-08-16 17:58:30 +05:30
shimon 8f8f033d1a fill gaps from merge 2022-08-16 12:00:28 +03:00
Jake Barnby fb34ecfa7d Merge remote-tracking branch 'origin/0.16.x' into datetime-attributes-merge
# Conflicts:
#	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
2022-08-16 19:20:26 +12:00
shimon 590c1467bc Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label
 Conflicts:
	app/controllers/api/account.php
	app/controllers/api/functions.php
	app/controllers/api/users.php
2022-08-15 18:19:59 +03:00
shimon f64c82a8cb addressing comments 2022-08-15 17:03:03 +03:00
shimon df0bdeb8a3 some fixes 2022-08-15 16:55:11 +03:00
shimon 67d12d3120 some fixes 2022-08-15 15:16:32 +03:00
shimon edecd8dc22 some fixes 2022-08-15 13:52:20 +03:00
shimon 0dc485d8d7 some fixes 2022-08-15 12:05:41 +03:00
Damodar Lohani 246d9b94b7
null safety 2022-08-15 13:27:02 +05:45
Damodar Lohani a5aa20ac5c Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-15 05:35:14 +00:00
shimon 1109004727 some fixes 2022-08-14 22:27:43 +03:00
shimon ab27e0a74d some fixes 2022-08-14 18:01:34 +03:00
Damodar Lohani 5120158bdb Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-14 11:39:41 +00:00
Steven 610ec1a6a4 Update database query syntax 2022-08-14 05:44:55 +00:00
shimon d132202662 some fixes 2022-08-13 20:29:33 +03:00
shimon af56db4048 some fixes 2022-08-13 18:36:44 +03:00
shimon 51e3fc8cab some fixes 2022-08-13 12:59:34 +03:00
Christy Jacob 3ded17badf fix: linter 2022-08-13 13:40:39 +05:30
shimon 45c46c1794 sync with 0.16 2022-08-13 11:02:00 +03:00
Damodar Lohani 792d657a4f formatting fixes 2022-08-13 05:10:34 +00:00
Eldad Fux 3c7a7f0fa4 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into origin/datetime-attributes 2022-08-13 06:21:50 +03:00
Damodar Lohani be00b64b7e Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-13 03:14:28 +00:00
shimon 1af95fcdaa Tidy up 2022-08-12 16:21:32 +03:00
shimon 90cfac9b52 replace request param extractions 2022-08-12 14:01:12 +03:00
shimon e86aab5e88 ident 2022-08-11 16:47:53 +03:00
shimon b5f977e46d adding user to audits labels 2022-08-11 16:19:05 +03:00
shimon 6a4fee641d clean 2022-08-11 12:04:05 +03:00
shimon 2d8abac0e3 clean 2022-08-11 11:47:18 +03:00
Damodar Lohani f0827fef38 formatting issues 2022-08-11 07:02:40 +00:00
Damodar Lohani d05e1fdfb3 enable ignoring stats on admin requests 2022-08-11 06:16:10 +00:00
Damodar Lohani 63371ce76e functions usage stats using route labels 2022-08-11 05:25:39 +00:00
shimon ac827f6861 cache ver updated 2022-08-10 13:13:05 +03:00
Damodar Lohani cb369dd326 update account routes usage labels 2022-08-10 08:45:10 +00:00
shimon f9b8a0a661 disabling route from cache 2022-08-10 10:08:48 +03:00
Damodar Lohani 8aa7486e71 database usage stats working via labels 2022-08-10 02:33:46 +00:00