1
0
Fork 0
mirror of synced 2024-07-02 21:20:58 +12:00
Commit graph

12482 commits

Author SHA1 Message Date
Matej Bačo 7f0507473d Merge remote-tracking branch 'origin/feat-list-users-queries' into feat-list-endpoints-queries 2022-08-26 07:47:42 +00:00
Matej Bačo 281eb2fafe Merge remote-tracking branch 'origin/refactor-permissions-inc-console-fix' into feat-list-users-queries 2022-08-26 07:40:35 +00:00
Jake Barnby a679f2f767 Improve permission parameter descriptions 2022-08-26 16:37:06 +12:00
Jake Barnby f904698d66 Add permissions doc links to model rule descriptions 2022-08-26 16:34:05 +12:00
Jake Barnby a320e220c3 Console fixes 2022-08-26 15:34:26 +12:00
Jake Barnby 57048400dc Merge branch 'refactor-permissions-inc-console-fix' of github.com:appwrite/appwrite into refactor-permissions-inc-console-fix 2022-08-26 15:01:39 +12:00
Jake Barnby 593c62116c Review fixes 2022-08-26 15:01:16 +12:00
Jake Barnby f945ab79ec
Apply suggestions from code review
Co-authored-by: Damodar Lohani <lohanidamodar@users.noreply.github.com>
2022-08-26 14:52:25 +12:00
Jake Barnby 8307b2148f Remove redundant auth exceptions catches 2022-08-26 14:23:23 +12:00
Damodar Lohani 8e26f93211
Merge pull request #3718 from appwrite/fix-usage-refactor-permissions 2022-08-26 06:29:38 +05:45
Steven 60a4563908 Fix usage tests 2022-08-25 22:15:11 +00:00
Matej Bačo 78f65401e8 Attempt to fix usage tests 2022-08-25 14:56:15 +00:00
Jake Barnby 31bd5cbeda Merge remote-tracking branch 'origin/origin/datetime-attributes' into refactor-permissions-inc-console-fix
# Conflicts:
#	app/tasks/maintenance.php
2022-08-26 00:10:11 +12:00
Jake Barnby e25fbd1c2a Fix default for usage params 2022-08-25 23:51:59 +12:00
Jake Barnby b12fc12caa Fix usage for datetime attributes 2022-08-25 23:49:45 +12:00
Jake Barnby 9ccffe9af2 Inherit permissions after role checks to ensure users can update document permissions created by server with other users roles 2022-08-25 23:46:56 +12:00
Jake Barnby 51e6d024ab Lock update 2022-08-25 23:30:54 +12:00
Jake Barnby e6e126dff4 Catch AuthorzationExceptions from database to throw 401 instead of 500 2022-08-25 23:30:26 +12:00
Jake Barnby a373297a6b Add storage tests for all roles and permission levels 2022-08-25 23:29:23 +12:00
Matej Bačo bc73b7bbf0 Fix bugs after merge 2022-08-25 10:28:13 +00:00
Matej Bačo c85363f355 Fix bugs after merge 2022-08-25 09:59:28 +00:00
fogelito ddabb540c1 fix maintenance.php setDatetime 2022-08-25 12:57:59 +03:00
Matej Bačo 6a22768c9c Merge remote-tracking branch 'origin/feat-list-users-queries' into feat-list-endpoints-queries 2022-08-25 09:35:06 +00:00
Matej Bačo 035e72edf7 Lockfile update 2022-08-25 09:34:59 +00:00
Matej Bačo f15f8e7bf0 Linter fix 2022-08-25 09:34:36 +00:00
Matej Baco fd1068a600 Merge branch 'feat-list-users-queries' into feat-list-endpoints-queries 2022-08-25 10:56:06 +02:00
Jake Barnby 7159f9c187 Merge remote-tracking branch 'origin/origin/datetime-attributes' 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
#	src/Appwrite/Usage/Calculators/Database.php
2022-08-25 20:53:52 +12:00
Matej Baco c6e614d896 Merge branch 'refactor-permissions-inc-console-fix' into feat-list-users-queries 2022-08-25 10:38:43 +02:00
fogelito 064d538023 Merge remote-tracking branch 'origin/origin/datetime-attributes' into origin/datetime-attributes 2022-08-25 11:14:48 +03:00
fogelito c30189f903 Vincent Changes Apply 2022-08-25 11:14:27 +03:00
Shmuel Fogel deb5164eb3
Update src/Appwrite/Utopia/Response/Model/Func.php
Co-authored-by: Vincent (Wen Yu) Ge <wenyu1999@hotmail.com>
2022-08-25 11:11:17 +03:00
Shmuel Fogel 26a2569b8e
Update src/Appwrite/Utopia/Response/Model/Func.php
Co-authored-by: Vincent (Wen Yu) Ge <wenyu1999@hotmail.com>
2022-08-25 11:11:08 +03:00
Shmuel Fogel c04734048f
Update app/controllers/api/databases.php
Co-authored-by: Vincent (Wen Yu) Ge <wenyu1999@hotmail.com>
2022-08-25 11:05:01 +03:00
Jake Barnby 10b8b4b4f6 Format 2022-08-25 18:48:05 +12:00
Jake Barnby 292037f90b Fix datetime calculation 2022-08-25 18:47:19 +12:00
Jake Barnby ec3c2628b1 Fix datetime calculation 2022-08-25 18:45:05 +12:00
Jake Barnby 9f3dd54198 Fix merge clobber 2022-08-25 18:27:55 +12:00
Jake Barnby e7298b13b0 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/workers/builds.php
#	src/Appwrite/Stats/Usage.php
#	src/Appwrite/Usage/Calculators/Database.php
2022-08-25 18:26:30 +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
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
Matej Bačo 756d0bbd5b Linter fix 2022-08-24 18:59:34 +00:00
Steven fc38771d69 Merge branch 'refactor-permissions-inc-console-fix' into feat-list-users-queries 2022-08-24 18:52:39 +00:00
Matej Bačo b1dfd94d49 Add indexes for internal queries 2022-08-24 18:41:26 +00:00
Matej Bačo 65d09705ac Simplify class name 2022-08-24 18:25:15 +00:00
Matej Bačo 55a2e52764 Allow unindexed internal queries 2022-08-24 18:23:34 +00:00
Jake Barnby e0a1f4b8fe Database test updates 2022-08-25 01:32:52 +12: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