1
0
Fork 0
mirror of synced 2024-09-30 17:26:48 +13:00
Commit graph

1688 commits

Author SHA1 Message Date
Christy Jacob
28d9e15980 feat: update response model 2022-08-19 09:45:36 +00:00
Christy Jacob
2a750eaa73 Merge branch 'refactor-permissions-inc-console-fix' of https://github.com/appwrite/appwrite into feat-improve-keys 2022-08-19 09:32:22 +00:00
Christy Jacob
278afd77c0 Merge branch 'origin/datetime-attributes' of https://github.com/appwrite/appwrite into feat-improve-keys 2022-08-19 09:20:08 +00:00
Jake Barnby
c1c3a7c7ae Remove redundant exception 2022-08-19 20:31:19 +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
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
66539bbe3a Review updates for role helper usage 2022-08-19 16:04:33 +12:00
fogelito
c21b563614 Merge branch 'refactor-permissions-inc-console-fix' of github.com:appwrite/appwrite into datetime-jake-tz
 Conflicts:
	app/controllers/general.php
	composer.json
	composer.lock
2022-08-17 21:04:23 +03:00
fogelito
5d99f7c3a6 after branch change to datetime attributes 2022-08-17 17:09:21 +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
Christy Jacob
11ad9c8dd9 feat: update abuse library 2022-08-16 20:47:05 +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
Eldad A. Fux
69a4f51d58
Merge pull request #3656 from appwrite/feat-functions-console-logs
Functions Console Logs Capture
2022-08-16 23:23:53 +03:00
Eldad A. Fux
ccb8a1144c
Merge pull request #2747 from appwrite/feat-password-hash-algos
Password Hashing algos
2022-08-16 22:30:23 +03:00
Eldad A. Fux
e0abc972ff
Merge pull request #3681 from appwrite/feat-missing-phone-param
Changed provider name from phone to sms and added phone param to create endpoints
2022-08-16 21:01:54 +03:00
Torsten Dittmann
32b1e0db51 fix: remove unnecessary data 2022-08-16 13:58:29 +02:00
Torsten Dittmann
381374209a fix: models 2022-08-16 13:57:13 +02:00
Matej Bačo
ebb4d402b7 Linter fix 2022-08-16 11:41:49 +00:00
Matej Bačo
eaf9cd59e9 Fix OpenAPI3 nested anyOf/oneOf 2022-08-16 11:40:19 +00:00
Jake Barnby
5d84d6d43f Lint 2022-08-16 20:33:06 +12:00
Jake Barnby
bbf7f8d8c3 Merge remote-tracking branch 'origin/origin/datetime-attributes' into refactor-permissions-inc-console-fix
# Conflicts:
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	src/Appwrite/Extend/Exception.php
2022-08-16 20:30:00 +12:00
Jake Barnby
39231f8cf9 Lint 2022-08-16 19:26:40 +12:00
Jake Barnby
fb34ecfa7d Merge remote-tracking branch 'origin/0.16.x' into datetime-attributes-merge
# Conflicts:
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/functions.php
#	app/controllers/api/projects.php
#	app/controllers/api/storage.php
#	app/controllers/api/teams.php
#	app/controllers/api/users.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
2022-08-16 19:20:26 +12:00
Jake Barnby
f672269a8c Handle aggregates per resource type at the controller level 2022-08-16 17:54:44 +12:00
Damodar Lohani
94d9bb8a18 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-functions-console-logs 2022-08-16 04:42:03 +00:00
fogelito
f52d28e75f Auth tests 2022-08-15 22:18:37 +03:00
Jake Barnby
b53f185ec6 Remove permissions processor 2022-08-16 00:56:19 +12:00
shimon
0dc485d8d7 some fixes 2022-08-15 12:05:41 +03:00
Jake Barnby
33970276b2 Self review 2022-08-15 19:20:10 +12:00
Eldad Fux
6f74c565e8 Fixed docblock 2022-08-15 09:55:37 +03: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
Eldad Fux
f88a64df1c Fix for linter 2022-08-14 22:01:58 +03:00
Eldad Fux
9b897629ba Fixed code generator 2022-08-14 21:57:23 +03:00
Eldad Fux
22c38a484f Merge branch 'feat-password-hash-algos' of https://github.com/appwrite/appwrite into feat-missing-phone-param 2022-08-14 19:43:53 +03:00
Eldad Fux
98fc8669e1 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-password-hash-algos 2022-08-14 19:23:30 +03:00
shimon
ab27e0a74d some fixes 2022-08-14 18:01:34 +03:00
Eldad Fux
53b60c9244 Fix for linter 2022-08-14 17:22:51 +03:00
Jake Barnby
613a0f8006 ID and test fixes 2022-08-15 02:22:38 +12:00
Eldad Fux
b36c24c508 Decouple Auth code from SMS provider adapter 2022-08-14 17:19:58 +03:00
fogelito
74ae43b092 global const for TYPE_DATETIME_EXAMPLE change value 2022-08-14 16:56:55 +03:00
Eldad Fux
1da208ad10 Fix adapter name 2022-08-14 16:53:19 +03:00
Eldad Fux
25f176875d Changed provider name from phone to sms 2022-08-14 16:43:41 +03:00
Eldad A. Fux
d641fbb635
Merge pull request #3588 from appwrite/feat-simplify-exceptions
Simplify Exception Creation
2022-08-14 15:27:52 +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