Commit Graph
1783 Commits
Author SHA1 Message Date
Jake Barnby 6a5de3e0b6 Merge remote-tracking branch 'origin/fix-datetime-attributes' into refactor-permissions-inc-queries-update-datetime-fixes
# Conflicts:
#	app/config/collections.php
#	app/controllers/api/databases.php
#	app/controllers/api/projects.php
#	app/controllers/api/teams.php
#	composer.json
#	composer.lock
#	tests/e2e/Services/Account/AccountBase.php
#	tests/e2e/Services/Databases/DatabasesBase.php
#	tests/e2e/Services/Functions/FunctionsCustomServerTest.php
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
#	tests/e2e/Services/Storage/StorageBase.php
#	tests/e2e/Services/Storage/StorageCustomClientTest.php
#	tests/e2e/Services/Storage/StorageCustomServerTest.php
#	tests/e2e/Services/Teams/TeamsBase.php
#	tests/e2e/Services/Webhooks/WebhooksBase.php
#	tests/e2e/Services/Webhooks/WebhooksCustomClientTest.php
#	tests/e2e/Services/Webhooks/WebhooksCustomServerTest.php
#	tests/unit/Auth/AuthTest.php
2022-08-14 23:11:05 +12:00
Jake Barnby b007acfa95 ID updates 2022-08-14 22:33:36 +12:00
Jake Barnby a8698b6065 Lint 2022-08-14 17:24:50 +12:00
Jake Barnby fe5d3a1892 Use permission helpers 2022-08-14 17:21:11 +12:00
Jake Barnby 70758927cd Test fixes 2022-08-14 02:55:15 +12:00
Jake Barnby ed712fb196 Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix
# Conflicts:
#	app/controllers/general.php
#	composer.lock
2022-08-14 02:31:06 +12:00
Jake Barnby bdc8202422 Bad request for create permission on document/file 2022-08-14 02:24:28 +12:00
Jake Barnby 68cc919aaa Test fixes 2022-08-14 02:10:28 +12:00
Eldad A. FuxandGitHub ba239de8be Merge branch '0.16.x' into fix-unit-tests 2022-08-13 12:28:33 +03:00
Jake Barnby 737ebe408c Don't add create permission to documents/files if missing 2022-08-13 18:34:04 +12:00
Steven 1abe9d4c01 Merge branch '0.16.x' into fix-datetime-attributes 2022-08-12 22:54:33 +00:00
Christy Jacob 9693c6e941 Merge branch 'master' of github.com:appwrite/appwrite into 0.16.x 2022-08-12 21:44:36 +05:30
Jake Barnby 09b001e891 PR fixes 2022-08-13 02:41:57 +12:00
Jake Barnby d2b9102f84 Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix
# Conflicts:
#	tests/e2e/Services/Databases/DatabasesBase.php
#	tests/e2e/Services/Databases/DatabasesCustomServerTest.php
2022-08-13 00:54:27 +12:00
Bradley Schofield 47129afcfa Remove constants from response models 2022-08-12 03:00:29 +01:00
Christy JacobandGitHub 0b813ed159 Merge pull request #3649 from appwrite/fix-deployment-example
Deployment object model example updated
2022-08-10 02:01:59 +05:30
fogelito 01106d801a Merge branch 'origin/datetime-attributes' of github.com:appwrite/appwrite into origin/datetime-api
 Conflicts:
	composer.lock
	src/Appwrite/Stats/Usage.php
2022-08-09 14:44:11 +03:00
fogelito 82a240998b Merge branch '0.16.x' of github.com:appwrite/appwrite into origin/datetime-attributes
 Conflicts:
	composer.lock
	src/Appwrite/Stats/Usage.php
2022-08-09 14:20:26 +03:00
Torsten Dittmann 08ba652464 fix: tests 2022-08-09 12:45:15 +02:00
Jake Barnby 1ddd34059b Append type to open bracket to ensure permissions containing a permission type name are not removed 2022-08-09 13:23:03 +12:00
Bishwajeet ParhiandGitHub 4ac204d230 Merge branch 'appwrite:master' into feat-disqus-Oauth-provider 2022-08-08 21:21:47 +05:30
Wen Yu Ge 75595dd07f Deployment payload example updated 2022-08-08 10:45:45 -04:00
Bishwajeet Parhi f4c5b4c11d lints fixed 2022-08-08 12:44:11 +00:00
Jake Barnby 4b78169152 Fix setting default permissions 2022-08-08 22:59:16 +12:00
Torsten Dittmann 641740db77 fix: response model with nullable defaults 2022-08-08 12:35:28 +02:00
Jake Barnby 686c42ae07 Add permission allowed for user type check function 2022-08-08 22:26:07 +12:00
Jake Barnby ac11617655 Handle null permissions when processing aggregates 2022-08-08 22:19:47 +12:00
Eldad A. FuxandGitHub e93c3483c8 Merge pull request #3640 from appwrite/fix-deployment-object
Add possible status codes to deployment object.
2022-08-06 07:20:55 +03:00
Bishwajeet Parhi 6c653d8f2a remove whitespace 2022-08-05 16:21:47 +00:00
Bishwajeet Parhi 999962d161 add comments denoting return type and parameters if any 2022-08-05 16:09:38 +00:00
9cd10686bb Update src/Appwrite/Auth/OAuth2/Disqus.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-05 21:25:41 +05:30
6fdf578919 Update src/Appwrite/Auth/OAuth2/Disqus.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-05 21:25:34 +05:30
dab0a8ec27 Update src/Appwrite/Auth/OAuth2/Disqus.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-05 21:25:21 +05:30
Bishwajeet ParhiandGitHub 3f15035c1a Merge branch 'appwrite:master' into feat-disqus-Oauth-provider 2022-08-05 21:24:19 +05:30
Matej BačoandGitHub 6c21723ecb Merge branch 'appwrite:master' into shiftra 2022-08-05 13:32:06 +02:00
Christy JacobandGitHub 78d02f50af Merge pull request #3180 from Aragur/feat-XXX-authentik-oauth
feat: Add authentik as a OAuth provider
2022-08-05 13:06:05 +05:30
Jake Barnby 08609af053 Add permissions process function to add default 2022-08-05 17:24:11 +12:00
Jake Barnby 62b1eba836 Replace write refs 2022-08-05 17:23:18 +12:00
Vincent (Wen Yu) Ge c6223fd6b0 add possible status codes 2022-08-04 17:51:57 +00:00
Jake Barnby 7b9fb32fae Update role references 2022-08-03 21:52:34 +12:00
Jake Barnby 1ab86c9331 Role reference updates 2022-08-03 16:17:49 +12:00
Jake Barnby ce38e74ba2 Update remaining services to new permissions 2022-08-02 21:21:53 +12:00
Jake Barnby 4520114780 Refactor storage to use new permissions 2022-08-02 21:19:15 +12:00
Jake Barnby 9a182d615a Refactor databases to use new permissions 2022-08-02 21:18:49 +12:00
Torsten Dittmann bf9533007b tests: fix unit tests 2022-08-01 12:22:04 +02:00
Matej Bačo 8c825d477f Merge commit '8d99860c55cff4ab1291a51ee5b6c7900641e1eb' into shiftra 2022-08-01 04:37:30 +00:00
Torsten Dittmann a4588cc848 Merge branch 'master' of https://github.com/appwrite/appwrite into origin/datetime-api 2022-07-28 14:49:28 +02:00
fogelito fcc4ed396a Change $conditions to TYPE_DATETIME 2022-07-28 15:03:14 +03:00
fogelito ba40ac4e90 Change models Class name 2022-07-28 13:26:22 +03:00
Torsten DittmannandGitHub 0bf39bd152 Merge pull request #3603 from appwrite/0.15.x
master <- 0.15.x
2022-07-26 11:22:23 +02:00