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

11904 commits

Author SHA1 Message Date
Jake Barnby 77a28a2de7 Don't use ID helper with existing ID's 2022-08-15 23:24:31 +12:00
Jake Barnby 813e9135c6 Review fixes 2022-08-15 22:11:17 +12:00
Jake Barnby 5870e6367c Update abuse lib 2022-08-15 19:50:20 +12:00
Jake Barnby 33970276b2 Self review 2022-08-15 19:20:10 +12:00
Jake Barnby 66f518b531 Fix team membership delete 2022-08-15 18:04:00 +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
Eldad A. Fux 1210b4f59a
Merge pull request #3675 from appwrite/feat-datetime-attributes-with-database-query-update
Update database query syntax
2022-08-15 07:28:21 +03: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 bb46d950df Handle permissions quotes 2022-08-15 13:04:14 +12:00
Jake Barnby d5a1872f93 Spec + dist + lock update 2022-08-15 12:21:11 +12: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
fogelito 00e64e3518 datetime tests fixes 2022-08-14 13:10:32 +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 c627226ac9 Merge branch 'refactor-permissions-inc-console-fix' of github.com:appwrite/appwrite into refactor-permissions-inc-console-fix 2022-08-14 17:21:44 +12:00
Jake Barnby b2e659bd3f Review fixes 2022-08-14 17:21:33 +12:00
Jake Barnby fe5d3a1892 Use permission helpers 2022-08-14 17:21:11 +12:00
Jake Barnby 89dd4be9f1
Update app/config/errors.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2022-08-14 17:06:48 +12:00
Jake Barnby 9e02c26908 Update libs 2022-08-14 15:35:00 +12:00
Jake Barnby 2ca2f4e135 Update audits 2022-08-14 03:17:18 +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
Jake Barnby c6c5ce0619 Fix create file permissions not resetting after create 2022-08-13 23:51:26 +12:00
Eldad A. Fux cec8e9188b
Merge pull request #3631 from appwrite/fix-unit-tests
tests: fix unit tests
2022-08-13 12:34:14 +03:00
Eldad A. Fux ba239de8be
Merge branch '0.16.x' into fix-unit-tests 2022-08-13 12:28:33 +03:00
Eldad A. Fux 1accc36d8c
Merge pull request #3599 from appwrite/feat-upgrade-database-docker-images
feat: upgrade mariadb and redis
2022-08-13 12:25:07 +03:00
Jake Barnby bfa4abbf87 Dist update 2022-08-13 21:07:25 +12:00
Jake Barnby 9a488d1d8c Fix create file permissions 2022-08-13 21:07:17 +12:00
Jake Barnby 7da5f3a04d Fix hardcoded permission types 2022-08-13 21:07:07 +12:00
Jake Barnby a44e9f2c09 Add bucket/file permissions comps 2022-08-13 21:02:32 +12:00
Jake Barnby 0cd1b232ed Fix hidden forms 2022-08-13 21:01:33 +12:00
Christy Jacob 4d9c37f2db Merge branch '0.16.x' of github.com:appwrite/appwrite into origin/datetime-attributes 2022-08-13 13:38:02 +05:30
Christy Jacob 4be3f23757 fix: merge conflict 2022-08-13 13:31:27 +05:30
Jake Barnby 62200eda9e Pull secondary form into matrix component to allow multiple in the same page 2022-08-13 19:47:04 +12:00
Jake Barnby 3c8acac758 Show permission block for documents if document security is enabled 2022-08-13 18:34:47 +12:00
Jake Barnby 737ebe408c Don't add create permission to documents/files if missing 2022-08-13 18:34:04 +12:00
Jake Barnby c66a1991d8 Make permissions matrix reusable 2022-08-13 18:33:11 +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
Jake Barnby fc119ecd98 Fix abuse 2022-08-13 13:31:31 +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