Commit Graph
2477 Commits
Author SHA1 Message Date
Matej Baco c6e614d896 Merge branch 'refactor-permissions-inc-console-fix' into feat-list-users-queries 2022-08-25 10:38:43 +02: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
Jake Barnby 3149a298a7 Aggregate before role checks 2022-08-25 15:51:21 +12:00
Jake Barnby 002b30d110 Fix missing check for existing validity on listFiles 2022-08-25 13:05:31 +12:00
Jake Barnby b434dfb6b8 Fix missing check for existing validity on listDocuments 2022-08-25 13:04:47 +12:00
Steven fc38771d69 Merge branch 'refactor-permissions-inc-console-fix' into feat-list-users-queries 2022-08-24 18:52:39 +00:00
Jake Barnby d4b270e527 Better storage permission checks 2022-08-25 01:24:54 +12:00
Jake Barnby 0d3c1cba9a Better database permission checks 2022-08-25 01:24:19 +12:00
Jake Barnby dabaa49f8d Remove redundant extra permissions checks for document read/update/delete 2022-08-24 20:50:05 +12:00
Jake Barnby ea4b177b83 Fix team permissions 2022-08-24 20:26:47 +12:00
Jake Barnby 00441885d2 Remove fallback setting for missing permissions 2022-08-23 13:42:53 +12:00
Jake Barnby e989735e89 Remove permissions processor 2022-08-23 13:42:25 +12:00
Steven 66ff297103 Refactor Queries Validation 2022-08-22 19:16:20 +00:00
Jake Barnby eb1476b28b Apply validator updates to OpenAPI3 2022-08-22 14:27:17 +12:00
Damodar Lohani 77958b465e update database usage params label 2022-08-21 02:10:21 +00:00
Damodar Lohani 6af467398b update usage labels 2022-08-21 02:04:52 +00:00
Damodar Lohani c5a8e470c5 update usage labels to match audits labels pattern 2022-08-21 02:03:19 +00:00
Damodar Lohani 2205ecd9c6 null safety checks 2022-08-20 11:20:31 +00:00
Steven e70eb61717 Fix bug with list documents and new queries 2022-08-20 00:47:10 +00:00
Steven 2bde7aa02b Fix databases tests 2022-08-20 00:15:18 +00:00
Steven 3890dea35b Add additional Validators for Queries 2022-08-19 23:20:22 +00:00
Steven a5bc07c9e4 Merge branch 'feat-list-users-queries' into feat-list-user-logs-queries 2022-08-19 22:00:54 +00:00
Steven c1cdad5566 Merge branch 'refactor-permissions-inc-console-fix' into feat-list-users-queries 2022-08-19 14:50:50 +00:00
Jake Barnby 24875e352d Merge fixes 2022-08-19 17:05:39 +12:00
Jake Barnby cb6fc7f618 Merge branch 'origin/datetime-attributes' into refactor-permissions-inc-console-fix
# Conflicts:
#	.gitignore
#	app/config/collections.php
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/controllers/api/users.php
#	composer.lock
#	tests/e2e/Services/Account/AccountCustomClientTest.php
2022-08-19 16:49:34 +12:00
Jake Barnby 5f990ecb6d Fix imports 2022-08-19 16:28:40 +12: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
Jake Barnby 9819088563 Lint 2022-08-19 16:05:00 +12:00
Jake Barnby 66539bbe3a Review updates for role helper usage 2022-08-19 16:04:33 +12:00
Steven 27f69e3c09 Consolidate List User Logs API params
Replace limit and offset params with a single queries param since the
Queries V2 change now allows for different types of queries.
2022-08-19 00:09:34 +00:00
Steven f0d66985f7 Consolidate List Users API params
Replace search, limit, offset, cursor, cursorDirection, and orderType
params with a single queries param since the Queries V2 change now
allows for different types of queries.
2022-08-18 19:30:39 +00:00
Damodar LohaniandChristy Jacob db9faebcc9 Update app/controllers/api/account.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-18 16:04:19 +05:45
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
Damodar Lohani 4d482ebb81 fix accounts PR 2022-08-18 00:31:56 +00:00
shimon d1aa3fea4f sync with 0.16 2022-08-17 18:03:53 +03:00
shimon a2af9fef2d sync with 0.16 2022-08-17 17:57:56 +03: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 d4f02402bd Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-17 10:38:16 +00:00
Damodar Lohani 0d97580361 fix usage params in execution 2022-08-17 10:13:50 +00:00
shimon e94c7eba83 more audit labels on users new routes 2022-08-17 13:01:16 +03:00
Damodar Lohani a1e6f7bdf4 Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-17 09:34:40 +00:00
shimon 835ef0ffc1 small fix 2022-08-17 12:25:47 +03: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
shimon 88f6a67802 sync with 0.16 2022-08-17 10:36:38 +03:00
shimon cc887beae9 sync with 0.16 2022-08-17 10:32:42 +03:00
shimon 2dc8fba40a Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label
 Conflicts:
	app/controllers/api/account.php
	app/controllers/api/users.php
	composer.json
	composer.lock
2022-08-17 10:05:37 +03:00
Damodar Lohani 3bc0aa8dca fix merge issues 2022-08-17 02:35:55 +00: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
Christy Jacob 4b0c707fd3 Merge branch 'origin/datetime-attributes' of https://github.com/appwrite/appwrite into feat-ui-datetime 2022-08-16 20:37:05 +00:00