Commit graph

1799 commits

Author SHA1 Message Date
Jake Barnby
b53f185ec6 Remove permissions processor 2022-08-16 00:56:19 +12:00
Jake Barnby
33970276b2 Self review 2022-08-15 19:20:10 +12:00
Jake Barnby
86f209800a Merge remote-tracking branch 'origin/origin/datetime-attributes' into refactor-permissions-inc-queries-update-datetime-fixes
# Conflicts:
#	composer.json
#	composer.lock
#	src/Appwrite/Utopia/Response/Model/AttributeDatetime.php
2022-08-15 16:43:47 +12:00
Jake Barnby
7c34387d22 Update specs + console SDK 2022-08-15 16:39:30 +12:00
Steven
6b618a5824 Merge branch 'origin/datetime-attributes' into feat-datetime-attributes-with-database-query-update 2022-08-15 01:45:56 +00:00
Jake Barnby
cb4a256d5f Merge remote-tracking branch 'origin/feat-ui-datetime' into refactor-permissions-inc-queries-update-datetime-fixes
# 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
#	public/dist/scripts/app-all.js
#	public/dist/scripts/app-dep.js
#	public/dist/scripts/app.js
#	public/dist/styles/default-ltr.css
#	public/dist/styles/default-rtl.css
#	public/scripts/dependencies/appwrite.js
2022-08-15 12:05:52 +12:00
Jake Barnby
613a0f8006 ID and test fixes 2022-08-15 02:22:38 +12:00
fogelito
74ae43b092 global const for TYPE_DATETIME_EXAMPLE change value 2022-08-14 16:56:55 +03:00
Jake Barnby
9c260164ef Merge remote-tracking branch 'origin/feat-datetime-attributes-with-database-query-update' into refactor-permissions-inc-queries-update-datetime-fixes
# Conflicts:
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	composer.json
#	composer.lock
2022-08-14 23:46:34 +12:00
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
fogelito
9b9f2fe428 global const for TYPE_DATETIME_EXAMPLE 2022-08-14 13:27:07 +03:00
Steven
610ec1a6a4 Update database query syntax 2022-08-14 05:44:55 +00: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. Fux
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
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
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 Jacob
0b813ed159
Merge pull request #3649 from appwrite/fix-deployment-example
Deployment object model example updated
2022-08-10 02:01:59 +05:30
Torsten Dittmann
5db5f7217f Merge branch 'origin/datetime-attributes' of https://github.com/appwrite/appwrite into feat-ui-datetime 2022-08-09 14:49:08 +02:00
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 Parhi
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. Fux
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
Bishwajeet Parhi
9cd10686bb
Update src/Appwrite/Auth/OAuth2/Disqus.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-05 21:25:41 +05:30
Bishwajeet Parhi
6fdf578919
Update src/Appwrite/Auth/OAuth2/Disqus.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-05 21:25:34 +05:30
Bishwajeet Parhi
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 Parhi
3f15035c1a
Merge branch 'appwrite:master' into feat-disqus-Oauth-provider 2022-08-05 21:24:19 +05:30
Matej Bačo
6c21723ecb
Merge branch 'appwrite:master' into shiftra 2022-08-05 13:32:06 +02:00
Christy Jacob
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