1
0
Fork 0
mirror of synced 2024-07-20 05:45:46 +12:00
Commit graph

3275 commits

Author SHA1 Message Date
Damodar Lohani 0b1b7b8170 feat: check history limit 2022-12-16 10:47:08 +00:00
Damodar Lohani cfd5a91c43 feat: project endpoint to set password history limit 2022-12-16 10:37:49 +00:00
Damodar Lohani 61e03eeedf add new password to the history 2022-12-16 10:29:20 +00:00
Damodar Lohani 8e7b89ec03 feat: check password history 2022-12-16 10:22:39 +00:00
Damodar Lohani 12302d5b3d refactor: remove empty param 2022-12-16 06:34:03 +00:00
Damodar Lohani b7d17e82da fix: membership invite email 2022-12-16 06:15:23 +00:00
Damodar Lohani 495da1bfd4 fix: template path 2022-12-16 06:11:12 +00:00
Damodar Lohani 5d195659bd refactor: mails refactor 2022-12-15 09:22:05 +00:00
Jake Barnby d107b92748
Remove debug flags on production instead of abuse enabled 2022-12-15 13:44:23 +13:00
Jake Barnby 64b74d4100
Add alias route to allow for multiple SDK method names 2022-12-15 13:36:47 +13:00
fogelito 8ade726932 Changing Role + Permissions namespace 2022-12-14 18:04:06 +02:00
fogelito f96128e14f Changing Id 2022-12-14 17:42:25 +02:00
Damodar Lohani 5741a960c7 refactor: use refactored maile event and worker 2022-12-14 06:35:04 +00:00
Jake Barnby ff33068906
Merge remote-tracking branch 'origin/1.2.x' into feat-graphql-support 2022-12-13 21:37:21 +13:00
Jake Barnby 5e9eccacd1
Allow create deployment from explorer 2022-12-13 19:49:20 +13:00
Jake Barnby aa7e326ce9
Allow file uploads from explorer 2022-12-13 15:43:29 +13:00
Damodar Lohani c60a3a66a0 feat: session limit separate default and max value 2022-12-12 05:07:18 +00:00
Damodar Lohani e0be09ded6 refactor: use session group for session limit 2022-12-11 08:33:52 +00:00
Damodar Lohani 65bacc6983 fix: naming and use constant 2022-12-11 07:13:11 +00:00
Damodar Lohani f070f0974a session limit check on shutdown 2022-12-09 11:33:26 +00:00
Damodar Lohani 27d7f4f083 fix (projects): session limits
Set max session limits to 100 and default session limits to 10
2022-12-06 10:52:17 +00:00
Damodar Lohani 1da3f7770f feat (projects): auth session limit
Add endpoint on project to set max number of sessions for project users.
2022-12-06 10:45:04 +00:00
Jake Barnby b6723b7c83
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	app/init.php
2022-12-06 20:38:09 +13:00
Christy Jacob 77d4627d42 feat: use constants in switch case 2022-11-26 19:45:29 +04:00
Jake Barnby f44a642998
Get from env in param call 2022-11-25 17:27:19 +13:00
Jake Barnby cefd5660b9
Merge remote-tracking branch 'origin/master' into fix-region-parameter
# Conflicts:
#	CHANGES.md
2022-11-25 10:42:27 +13:00
Jake Barnby de38fed306
Fix empty check 2022-11-25 10:29:22 +13:00
Matej Bačo 8b71e318c2 Fix tests bug 2022-11-24 11:55:49 +00:00
Matej Bačo efe093ce3c
Fix unsaved changes in team inv 2022-11-24 12:35:26 +01:00
Jake Barnby bb01a6d817
Get default region param from env 2022-11-24 11:23:59 +13:00
Steven Nguyen 01556184c7
Fix the default oauth paths to match the route 2022-11-23 09:57:49 -08:00
Torsten Dittmann b819381bed
Merge branch 'master' into fix-623-locale-api-unknown-continent 2022-11-23 18:52:39 +01:00
Torsten Dittmann 991d8749b2
Merge pull request #4757 from gepd/null-failure
bug fix: failure status shoudn't be nulled
2022-11-23 18:51:02 +01:00
Torsten Dittmann 2e9087285d
Merge branch 'master' into fix-function-status-missing 2022-11-23 18:47:15 +01:00
Jake Barnby bd0139ef3b
Make region optional with default of 'default' 2022-11-23 18:16:57 +13:00
Alex Patterson ad1587872b remove dup line 2022-11-22 18:49:31 -05:00
gepd 64ba896738
bug fix: failure status shoudn't be nulled 2022-11-22 17:05:04 -03:00
Matej Bačo d2362aeab0 Improve performance 2022-11-21 11:43:20 +00:00
Matej Bačo 831960245f Permission bug fix 2022-11-21 11:20:52 +00:00
Matej Bačo 0ee49e7895 Fix missing execution status 2022-11-21 09:38:36 +00:00
Jake Barnby 163cbc5052
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	composer.json
#	composer.lock
2022-11-17 21:41:56 +13:00
Jake Barnby f9d2976c1d
Merge remote-tracking branch 'origin/1.1.x' into feat-graphql-support
# Conflicts:
#	CHANGES.md
#	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/init.php
#	app/tasks/sdks.php
#	composer.lock
#	docker-compose.yml
2022-11-16 19:37:35 +13:00
Jake Barnby dd6c5c056f
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	CHANGES.md
2022-11-16 19:31:40 +13:00
Torsten Dittmann 912636b54c Merge branch '1.1.x' of https://github.com/appwrite/appwrite into feat-console-rewrite 2022-11-15 18:22:49 +01:00
shimon ee0950449a Merge branch '1.1.x' of github.com:appwrite/appwrite into fix-cache-permissions 2022-11-15 17:17:58 +02:00
shimon 18618b8e8b cancel cache via avatar::initials 2022-11-15 17:17:35 +02:00
Torsten Dittmann ef1e5a9674 Merge branch '1.1.x' of https://github.com/appwrite/appwrite into feat-console-rewrite 2022-11-15 15:36:25 +01:00
Bradley Schofield a51288da57 Update projects.php 2022-11-15 10:25:34 +00:00
Bradley Schofield 64b725a6f7 Update Defaults 2022-11-15 10:19:35 +00:00
Torsten Dittmann aea13bad72 Merge branch 'chore-prepare-1-1-0' of https://github.com/appwrite/appwrite into feat-console-rewrite 2022-11-14 22:54:23 +01:00
Bradley Schofield 3c71164741 Merge branch '1.1.x' into feat-implement-session-length-api 2022-11-14 15:30:38 +00:00
Bradley Schofield a14ab321bf
Update app/controllers/api/projects.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2022-11-14 15:18:40 +00:00
Torsten Dittmann 310ff90d22 Merge branch '1.1.x' of https://github.com/appwrite/appwrite into feat-console-rewrite 2022-11-14 15:57:40 +01:00
Torsten Dittmann 465dad522e fix: remove unnecessary files 2022-11-14 15:31:24 +01:00
Bradley Schofield a19e668d79 Update storage.php 2022-11-14 13:11:43 +00:00
Bradley Schofield c76057fd37
Update app/controllers/api/projects.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2022-11-14 09:54:49 +00:00
Bradley Schofield 36d4719a3b
Update app/controllers/api/projects.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2022-11-14 09:54:40 +00:00
Bradley Schofield 0b883df5ec Fix Tests 2022-11-14 09:42:18 +00:00
Bradley Schofield cdb4c60c3c Run Linter 2022-11-14 09:33:49 +00:00
Bradley Schofield 66b805829c Move authDuration into auths attribute in project 2022-11-14 09:30:45 +00:00
Bradley Schofield f6b7e0392b Give auth duration it's own endpoint 2022-11-14 09:15:55 +00:00
shimon 180262d166 Merge branch '1.1.x' of github.com:appwrite/appwrite into fix-cache-permissions 2022-11-11 13:18:33 +02:00
shimon f9671ee855 enabling file permissions
via cache preview
2022-11-10 12:08:01 +02:00
Eldad A. Fux 42cedf8ed0
Merge pull request #3909 from appwrite/feat-usage-refactor
new stats to count resources
2022-11-10 11:05:36 +02:00
Bradley Schofield a0ab934328 Fix another null warning 2022-11-09 13:23:14 +00:00
Bradley Schofield 29c30a361b Fix null warnings
- Fixed Avatars isset operator
- Added isset operator to openSSL data in files
- dns_get_record does not throw errors, instead it logs a warning and returns false. Altered code accordingly. PHP Bug Report: https://bugs.php.net/bug.php?id=73149
-
2022-11-09 11:45:15 +00:00
Torsten Dittmann 4befb19c35 feat: add databases and buckets to projects usage 2022-11-08 13:09:18 +01:00
Bradley Schofield 842185e45d Update projects.php 2022-11-07 11:58:57 +00:00
Bradley Schofield 4dfafd1169 Merge branch 'master' into feat-implement-session-length-api 2022-11-04 16:11:38 +00:00
Bradley Schofield e1f9a8e0ce Clean up a couple things and fix tests 2022-11-04 14:48:29 +00:00
Bradley Schofield 4cfc3b3a7f Update authDuration fallback value 2022-11-04 10:12:02 +00:00
Bradley Schofield 94676a6c16 Alter sessionVerify to remove expire 2022-11-04 09:50:59 +00:00
Jake Barnby a47bfe71bf
Merge remote-tracking branch 'origin/1.2.x' into feat-graphql-support
# Conflicts:
#	CHANGES.md
#	composer.json
#	composer.lock
#	tests/e2e/Services/Functions/FunctionsCustomServerTest.php
2022-11-04 21:32:57 +13:00
Eldad A. Fux 44ca7d9459
Merge pull request #4631 from appwrite/feat-fix-account-naming
Updated titles on account routes
2022-11-03 18:19:41 +02:00
Eldad Fux 103469928e Updated routes 2022-11-03 17:24:32 +02:00
Bradley Schofield 4b8287c097 Remove 'expire' from sessions 2022-11-03 15:03:39 +00:00
Christy Jacob 8e99c44c59 Merge branch 'master' of github.com:appwrite/appwrite into sync-1.2.x 2022-11-02 20:39:20 +05:30
Damodar Lohani b66f932b3b Merge remote-tracking branch 'origin/1.1.x' into feat-usage-refactor 2022-11-02 08:43:12 +00:00
Jake Barnby 0827d59f21
Merge remote-tracking branch 'origin/1.1.x' into fix-missing-deployment-attributes
# Conflicts:
#	tests/e2e/Services/Functions/FunctionsCustomServerTest.php
2022-11-02 13:33:10 +13:00
Vincent (Wen Yu) Ge a8a23fb8eb Merge branch 'master' into doc-unique-id 2022-11-01 17:53:48 +00:00
Christy Jacob b2d884e329 Merge branch 'master' of github.com:appwrite/appwrite into 1.1.x 2022-11-01 22:21:19 +05:30
Bradley Schofield cddacfbb78 Handle Eldad's Comments 2022-11-01 14:43:18 +00:00
Bradley Schofield 5dc8a2dee0 Add Tests and fix bugs 2022-11-01 11:15:45 +00:00
Jake Barnby 8a4fd3307d
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	composer.json
#	composer.lock
2022-11-01 11:38:23 +13:00
geisterfurz007 e891424c17 fix: empty payload deleting single user session 2022-10-31 21:01:49 +01:00
Bradley Schofield d34359fd49 Implement Variable Session Duration 2022-10-31 14:54:15 +00:00
Christy Jacob aff7c59097 feat: update database library 2022-10-31 12:02:51 +00:00
Torsten Dittmann d387f198db Merge branch 'master' of https://github.com/appwrite/appwrite into rebase-1.1.x 2022-10-31 09:45:51 +01:00
Damodar Lohani 4086ba93ad Merge remote-tracking branch 'origin/1.1.x' into feat-usage-refactor 2022-10-31 06:36:26 +00:00
Jake Barnby 049e3a2646
Add missing status, buildStdout, buildStderr to getDeployment 2022-10-31 18:11:55 +13:00
Jake Barnby db49e962f4
Use abuse status instead of dev/prod for graphql abuse check 2022-10-28 20:12:11 +13:00
Jake Barnby 89b4d0026a
Move shutdown hook to graphql controller 2022-10-28 10:04:31 +13:00
Jake Barnby e632731c4e
Merge remote-tracking branch 'origin/1.1.x' into feat-graphql-support 2022-10-27 12:24:57 +13:00
Torsten Dittmann eb31bfb78e
Merge pull request #4418 from appwrite/feat-deployment-buildtime
Add build time to deployments
2022-10-26 18:42:53 +02:00
Jake Barnby 2f444ead34
Revert "Review revert unrelated change"
This reverts commit bf064fa5c9.
2022-10-25 18:31:51 +13:00
Jake Barnby e3b5919e40
Review doc fixes 2022-10-25 15:53:15 +13:00
Jake Barnby bf064fa5c9
Review revert unrelated change 2022-10-25 15:44:19 +13:00
Torsten Dittmann 461c12c7fe
Merge pull request #3701 from appwrite/feat-oauth-improvements
Feat: OAuth improvements
2022-10-24 17:57:40 +02:00
Vincent (Wen Yu) Ge 9a1f54baf1
Merge branch 'master' into doc-unique-id 2022-10-21 17:43:52 -04:00
Damodar Lohani dfa35e0a0b fix periods on usage endpoints 2022-10-21 05:45:25 +00:00
Damodar Lohani a7e1e5f25f fix period 2022-10-21 01:40:33 +00:00
Jake Barnby a2b1941a47
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	CONTRIBUTING.md
#	composer.json
#	composer.lock
#	docs/references/teams/list-teams.md
2022-10-19 13:17:56 +13:00
Damodar Lohani f78cb09694 Merge remote-tracking branch 'origin/master' into feat-usage-refactor 2022-10-17 06:55:01 +00:00
Jake Barnby cecc6dada2
Merge remote-tracking branch 'origin/1.1.x' into feat-graphql-support
# 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/init.php
#	composer.json
#	composer.lock
2022-10-17 12:04:13 +13:00
Piotr Rogowski 833e3f8ce1
Fix User not found exception 2022-10-14 18:17:00 +02:00
Damodar Lohani be3743e227 fix renamed function 2022-10-14 11:24:37 +00:00
Damodar Lohani f86a5b5fcd fix renamed methods 2022-10-14 11:12:59 +00:00
Torsten Dittmann d0aedf33ba
Merge pull request #4058 from appwrite/fix-deprecate-team-deletion-with-project
Deprecate team deletion with project
2022-10-14 11:19:27 +02:00
Jake Barnby a99ade13c0
Don't flatten batch results 2022-10-14 14:33:42 +13:00
Jake Barnby 742fc98cfc
Controller cleanup 2022-10-14 14:32:16 +13:00
Jake Barnby 44e4f1e05b
Make param errors consistent 2022-10-14 13:18:08 +13:00
Jake Barnby e4673aaa50
Fix requests using x-sdk-graphql header 2022-10-13 17:33:55 +13:00
Jake Barnby 4e60db0598
Use upstream raw payload function 2022-10-13 16:56:12 +13:00
Jake Barnby 143c53cb20
Always set 200 status code to match spec 2022-10-13 14:52:08 +13:00
Jake Barnby 5debe2c13c
Alias + name fixes 2022-10-12 20:20:44 +13:00
Jake Barnby b6621f5e87
Restructure schema building 2022-10-12 14:04:11 +13:00
Jake Barnby bf194c30e9
Review updates 2022-10-11 13:38:06 +13:00
Jake Barnby fd8d4f4a1b
Add type property to hash algorithms to allow resolving union type implementation 2022-10-11 12:27:03 +13:00
Bradley Schofield 380a45f987 Add build time to deployment 2022-10-10 16:24:40 +01:00
Jake Barnby 575b882b30
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	.github/workflows/tests.yml
#	composer.lock
2022-10-10 18:41:40 +13:00
Eldad A. Fux 0733909d04 Merge pull request #4346 from appwrite/master
Sync 1.1.x
2022-10-10 07:27:26 +03:00
Damodar Lohani 9b2db20b3b fix backfill 2022-10-09 06:33:14 +00:00
Damodar Lohani 22b00c019d update usage period on get for databases 2022-10-09 06:30:26 +00:00
Akshay Rana da9133ae85 fixed: wrong error message show on adding duplicate number to a user 2022-10-04 23:48:15 +05:30
Vincent (Wen Yu) Ge 4cee87273c
Merge branch 'master' into doc-unique-id 2022-10-04 10:51:38 -04:00
Vincent (Wen Yu) Ge ae2100244f Update unique() to be ID.unique() 2022-10-03 20:22:28 +00:00
Matej Bačo 3da4b01f4e Deprecate team deletion with project 2022-10-03 08:06:48 +00:00
Torsten Dittmann e5271dbda9
Merge branch '1.0.x' into fix-function-vars-null 2022-09-30 14:29:22 +02:00
Torsten Dittmann 0c1222f0f5 Merge branch 'master' of https://github.com/appwrite/appwrite into 1.0.x 2022-09-30 14:23:06 +02:00
Torsten Dittmann fbbb150e86 Revert "Merge pull request #4041 from appwrite/revert-3789-feat-app-region"
This reverts commit 2117fa53f0, reversing
changes made to c634d12ef4.
2022-09-30 14:22:11 +02:00
Torsten Dittmann e0b9f57d85
Revert "Feat app region" 2022-09-30 12:32:58 +02:00
Torsten Dittmann 637a97c4de Merge branch '1.0.x' of https://github.com/appwrite/appwrite into fix-function-vars-null 2022-09-30 12:06:32 +02:00
Torsten Dittmann 6c1e2ae537
Merge branch '1.0.x' into fix-boolean-attribute-default-value 2022-09-30 11:56:31 +02:00
Torsten Dittmann 65b4c9f931 fix: default value for optional function vars 2022-09-30 11:52:35 +02:00
Torsten Dittmann b1197d581a
Merge pull request #3908 from appwrite/fix-function-schedule-loops
Fix schedule loop triggering
2022-09-30 11:45:11 +02:00
Torsten Dittmann d45464c6c8 fix: boolean attribute default value 2022-09-30 11:27:19 +02:00
Bradley Schofield eeb6ee0821 Update functions.php 2022-09-29 09:42:46 +01:00
Jake Barnby 471f12b8ba
Only apply max depth and complexity in production to allow introspection 2022-09-29 17:46:01 +13:00
Jake Barnby 69d42fc980
Fix create scrypt user route param defaults types 2022-09-29 16:52:57 +13:00
Eldad A. Fux b575df867e
Merge pull request #3789 from appwrite/feat-app-region
Feat app region
2022-09-25 15:04:56 +03:00
Matej Bačo 46c91899e7
Merge branch '0.16.x' into feat-improve-sms-e2e-tests 2022-09-23 08:23:29 +02:00
Christy Jacob 54d14a5151
Merge pull request #3883 from appwrite/fix-get-membership-response
Fix: Get Membership response
2022-09-23 11:42:33 +05:30
Matej Bačo 0159079608 Fix schedule loop triggering 2022-09-23 06:12:17 +00:00
Jake Barnby a3b75a374b
Update variables and defaults 2022-09-23 15:55:10 +12:00
Christy Jacob 7abb426e3f fix: hash phone auth code 2022-09-23 03:55:17 +05:30
Christy Jacob ba0be549e3
Merge pull request #3881 from appwrite/fix-null-required-param
Fix: Null required ID params
2022-09-23 00:37:17 +05:30
Jake Barnby f7e5ccf296
Merge remote-tracking branch 'origin/fix-team-get-membership-model' into feat-graphql-support
# Conflicts:
#	CONTRIBUTING.md
2022-09-22 20:12:17 +12:00
Jake Barnby 398c3eec29
Fix SDK response model for get team membership 2022-09-22 19:26:54 +12:00
Jake Barnby 144e723431
Update error handling 2022-09-21 18:36:43 +12:00
Damodar Lohani 3166be9da0 remove region from update 2022-09-21 02:01:59 +00:00
Jake Barnby e9f75d32a1
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	Dockerfile
#	app/config/errors.php
#	app/config/roles.php
#	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/graphql.php
#	app/controllers/shared/api.php
#	app/init.php
#	composer.lock
#	docker-compose.yml
#	src/Appwrite/Extend/Exception.php
#	src/Appwrite/Migration/Migration.php
2022-09-20 15:43:09 +12:00
Damodar Lohani e80e65946b Merge branch 'master' of https://github.com/appwrite/appwrite into feat-app-region 2022-09-19 12:01:56 +00:00
Matej Bačo 89afad1a32 Replace nulls with empty strings 2022-09-19 11:58:41 +00:00
Matej Bačo c42bf2d8da Fix documentation response model 2022-09-19 11:43:21 +00:00
Matej Bačo a983e792d8 Refactor required param values 2022-09-19 10:05:42 +00:00
Matej Bačo 6e8a4cc97b Update sms mock to use request catcher 2022-09-19 08:09:48 +00:00
Steven Nguyen 00a4929301 Fix date format for usage APIs 2022-09-15 23:48:09 +00:00
Torsten Dittmann 3df89e65ca
Merge pull request #3816 from appwrite/feat-consistent-parent-id
Update document model
2022-09-14 10:25:36 +02:00
Torsten Dittmann 90af882aa6
Merge pull request #3825 from appwrite/update-team-membership
feat: rename getMemberships to listMemberships
2022-09-14 10:23:13 +02:00
Torsten Dittmann 1043cc4fc1
Merge pull request #3809 from appwrite/fix-function-scheduling
Fix functon scheduling loop logic, and double-loop prevention
2022-09-14 10:20:27 +02:00
Jake Barnby 5d6fff860e
Merge remote-tracking branch 'origin/0.16.x' into fix-datetime-attr-ui 2022-09-14 18:35:21 +12:00
Steven Nguyen 3da21ff2fc Update document model
1. Rename document.$collection to document.$collectionId
2. Add document.$databaseId
2022-09-14 00:53:37 +00:00
Christy Jacob 98c8896588 feat: update get* endpoints to list* endpoints in locale API 2022-09-14 03:48:02 +05:30
Christy Jacob 626e4b1b8a feat: update getSessions to listSessions in users and accounts API 2022-09-14 03:43:04 +05:30
Christy Jacob 937674a373 feat: update getLogs to listLogs in users and account API 2022-09-14 02:35:03 +05:30
Christy Jacob 183bb2e92d feat: update getMemberships to listMemberships in Users API 2022-09-14 02:28:28 +05:30
Christy Jacob 105e5fe71c feat: rename getMemberships to listMemberships 2022-09-14 01:44:56 +05:30
Matej Bačo 20bbbfc493 Merge remote-tracking branch 'origin/0.16.x' into fix-function-scheduling 2022-09-13 20:14:42 +00:00
Christy Jacob 554be364d6
Merge pull request #3755 from appwrite/feat-audits-label-desc-decoupling
audit event decoupling
2022-09-13 22:56:02 +04:00
Christy Jacob efbe21d433 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into matej-qa-3 2022-09-13 18:21:44 +00:00
shimon 1d382cc542 small fix 2022-09-13 10:42:42 +03:00
shimon b86f7689ec Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label-desc-decoupling 2022-09-13 10:29:16 +03:00
Matej Bačo ec5a0b8cde Remove queries from listVariables; add enabled to createFunction 2022-09-12 09:02:14 +00:00
Matej Bačo a315f43039 Fix functon scheduling loop logic, and double-loop prevention 2022-09-11 12:20:26 +00:00
Eldad A. Fux 0124d2c121
Merge pull request #3800 from appwrite/update-avatars-api
feat: update default avatars color
2022-09-11 14:58:21 +03:00
Matej Bačo 8b864324de Merge remote-tracking branch 'origin/0.16.x' into fix-datetime-attr-ui 2022-09-11 07:34:44 +00:00
Christy Jacob cb50220b60 feat: rename time attribute to duration 2022-09-09 16:02:04 +04:00
Christy Jacob 98724c2acd feat: update default avatars color 2022-09-09 15:09:04 +04:00
Matej Bačo b41aaefc7e Implement 'enabled' attribute for functions 2022-09-09 08:49:18 +00:00
Matej Bačo fd6a3ed30c Fix listVariables returing all variables 2022-09-09 08:05:33 +00:00
Eldad A. Fux 0a9a84e357
Merge pull request #3793 from appwrite/fix-datetime-type
Fix $createdAt and $updatedAt so they are datetime instead of string
2022-09-09 07:21:23 +03:00
Damodar Lohani aa2a6d7f11 region in spec 2022-09-09 01:22:04 +00:00
Steven Nguyen 256f83b7ea Fix and so they are datetime instead of string 2022-09-08 22:18:36 +00:00
shimon 342c4a3253 audits.resource label update 2022-09-08 16:06:16 +03:00
shimon 5652e2d94f audits.resource label update 2022-09-08 15:16:54 +03:00
shimon 834e4e03e3 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label-desc-decoupling
 Conflicts:
	app/controllers/api/storage.php
2022-09-08 15:13:22 +03:00
Damodar Lohani ed81ff1263 regions using config instead 2022-09-08 07:19:14 +00:00
Damodar Lohani f46327d206 description 2022-09-08 06:25:54 +00:00
Damodar Lohani cf1c9452c1 region in UI 2022-09-08 06:24:58 +00:00
Jake Barnby 15939bb155
Merge remote-tracking branch 'origin/0.16.x' into fix-storage-audit-resources 2022-09-08 17:24:00 +12:00
Damodar Lohani 119344031a region on endpoint 2022-09-08 05:04:16 +00:00
Eldad A. Fux 30e18d43a2
Merge pull request #3781 from appwrite/fix-async-default-value
Update createExecution param default value
2022-09-07 21:39:46 +03:00
Eldad Fux c442a5bce2 Fix linter test 2022-09-07 14:23:57 +03:00
Eldad Fux c22c28bc67 Fixed indentation 2022-09-07 14:14:53 +03:00
Eldad Fux 01fb4045bd Sync with 0.16 2022-09-07 14:11:10 +03:00
Eldad Fux 1f17fb34e4 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into fix-response-syntax 2022-09-07 14:07:40 +03:00
Eldad Fux 0895a25615 Fixed response syntax with new FW version 2022-09-07 14:02:36 +03:00
Matej Bačo e9c29a4812 Update createExecution param default value 2022-09-07 08:24:49 +00:00
Jake Barnby 9665ec09e7
Make storage audit resources consistent with other resources 2022-09-07 20:22:25 +12:00
Jake Barnby 4590c464ef
Use write const 2022-09-06 21:17:25 +12:00
Matej Bačo 39434c3fec Fix datetime attribute default 2022-09-06 09:07:39 +00:00
Jake Barnby 27af4e3b7c
Merge remote-tracking branch 'origin/0.16.x' into fix-write-permission-not-allowed
# Conflicts:
#	composer.lock
2022-09-06 12:28:57 +12:00
Bradley Schofield 9e0e2f8e77 Add Tests
+ Added Tests
+ Remove unneeded rand variable
2022-09-05 11:21:04 +01:00
Bradley Schofield 37530d30df Remove color param and fix bug 2022-09-05 10:36:01 +01:00
Bradley Schofield ea51786192 Modify profile images to suit new theme 2022-09-05 10:24:56 +01:00
shimon 1362902082 audit event name reformation 2022-09-05 11:00:08 +03:00
Jake Barnby e55faff0a1
Fix tests 2022-09-05 19:51:33 +12:00
Jake Barnby 5c08e066aa
Fix allowed permissions for documents/files 2022-09-05 13:41:01 +12:00
Christy Jacob ccabbc4fdf feat: update datetime descriptions 2022-09-05 01:41:26 +04:00
Christy Jacob 6df57b7975 feat: update descriptions 2022-09-05 01:33:52 +04:00
shimon db715f3e7d decouple audits log from events 2022-09-04 13:31:38 +03:00
shimon 5d16c39d5f account labels 2022-09-04 11:13:44 +03:00
shimon 8e1dc84a48 account labels 2022-09-04 10:32:56 +03:00
Jake Barnby 1896193718
Fix missed optional updates 2022-09-03 12:44:33 +12:00
Jake Barnby f4f178d3bf
Merge remote-tracking branch 'origin/rc-qa-matej' into fix-rc-qa 2022-09-03 11:44:14 +12:00
Matej Bačo ae2826ad1f Bug fixes 2022-09-02 14:19:36 +00:00
Jake Barnby ddcb68c944
Make document/file security optional for create collection/bucket 2022-09-02 15:39:54 +12:00
Matej Bačo c3d04848f4 Mark permissions optional param 2022-09-01 13:14:15 +00:00
Matej Bačo a85a471d3b Merge remote-tracking branch 'origin/0.16.x' into fix-ui-with-queries-v2 2022-08-31 13:33:18 +00:00
Damodar Lohani 8fe365d66e Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-additional-compression-support 2022-08-31 13:21:45 +00:00
Matej Bačo dccb9b7291 Merge remote-tracking branch 'origin/0.16.x' into fix-ui-with-queries-v2 2022-08-31 12:38:40 +00:00
Christy Jacob 0438e830b0
Merge pull request #3634 from appwrite/feat-variables-api
Implement Function Variable API
2022-08-31 14:37:30 +02:00
Matej Bačo d5997d92c3 Updated all UI components for new queries V2. introduced queries to listProjects 2022-08-31 12:30:16 +00:00
Damodar Lohani 7b5cee8da9 fix description to use markdown for links 2022-08-31 10:24:13 +00:00
Damodar Lohani d647bdaf9e update compression attribute description 2022-08-31 09:55:55 +00:00
Christy Jacob 5a58312b53
Merge pull request #3741 from appwrite/refactor-guest-rate-limits
Refactor guest rate limits
2022-08-31 10:41:23 +02:00
Matej Bačo 0897cd0fe4
Merge branch '0.16.x' into feat-variables-api 2022-08-31 09:37:47 +02:00
Matej Bačo 3fc2e70007 updateVariable 'key' param marked as required 2022-08-31 07:33:43 +00:00
Jake Barnby ce28dd8201
Use route method in abuse key for guest writes 2022-08-31 15:58:32 +12:00
Damodar Lohani 594b66c18a fix missing break 2022-08-31 02:59:51 +00:00
Damodar Lohani bc7ec3854f linter fix 2022-08-31 02:56:44 +00:00
Damodar Lohani 63f95c0a5c Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-additional-compression-support 2022-08-31 02:55:26 +00:00
Jake Barnby 190d9684f0
Use consts for rate limit count + period 2022-08-31 11:34:17 +12:00
Jake Barnby 1d4866c5b5
Use IP + User ID as abuse key for create routes 2022-08-31 11:33:19 +12:00
Jake Barnby b9148d380b
Fix only variables can passed by reference errors 2022-08-31 11:31:43 +12:00
Christy Jacob fe8295c2ec Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-improve-keys 2022-08-30 17:35:46 +00:00
Damodar Lohani 2d1741504a compression on update bucket endpoint 2022-08-30 13:50:38 +00:00
Damodar Lohani 5fa7d34757 zstd compression support on endpoints 2022-08-30 13:46:55 +00:00
Christy Jacob 7591f68970
Merge pull request #3702 from appwrite/feat-list-endpoints-queries
Feat: List endpoint queries
2022-08-30 14:56:09 +02:00
Damodar Lohani 6c04550558 compression attribute on create bucket endpoint 2022-08-30 12:55:26 +00:00
Matej Bačo 1e95346205 PR review changes 2022-08-30 12:30:52 +00:00
Matej Bačo 63c02677a0
PR review changes 2022-08-30 13:55:23 +02:00
Christy Jacob 3da3e2100c
Merge pull request #3727 from appwrite/feat-allow-guest-writes
Allow guest write scope for document, file and execution
2022-08-30 13:28:51 +02:00
Christy Jacob 177354407a
Merge pull request #3689 from appwrite/feat-list-users-queries 2022-08-30 13:19:56 +04:00
Matej Bačo 2b3dc48bf1 PR review changes 2022-08-30 08:21:34 +00:00
Matej Bačo 2534e9ad8f Remove unnessessary internal queries 2022-08-30 08:20:54 +00:00
Matej Bačo 087b7df52a Failure tests for variables 2022-08-30 07:53:16 +00:00
Matej Bačo 677121edca
Update app/controllers/api/functions.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2022-08-30 09:29:30 +02:00
Matej Bačo 471cac8187
Update app/controllers/api/functions.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2022-08-30 09:29:20 +02:00
Matej Bačo ce334b9518
Update app/controllers/api/functions.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2022-08-30 09:29:09 +02:00
Matej Bačo 8620b1f3a0
Update app/controllers/api/functions.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2022-08-30 09:28:48 +02:00
Matej Bačo e5a63a5078
Update app/controllers/api/functions.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2022-08-30 09:28:37 +02:00
Matej Bačo 8ec8843a09
Update app/controllers/api/functions.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2022-08-30 09:28:27 +02:00
Matej Bačo 6cf3cdcadb
Update app/controllers/api/functions.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2022-08-30 09:28:20 +02:00
Matej Bačo 4b50fe3f15
Update app/controllers/api/functions.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2022-08-30 09:28:09 +02:00
Matej Bačo ce5c8d6817
Update app/controllers/api/functions.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2022-08-30 09:28:01 +02:00
Matej Bačo 3e2a7e2941
Update app/controllers/api/functions.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2022-08-30 09:27:54 +02:00
Matej Bačo 883207240c
Update app/controllers/api/functions.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2022-08-30 09:27:44 +02:00
Jake Barnby 938f8394e0
Add abuse limits for create/update/delete document/file 2022-08-30 00:49:01 +12:00
Matej Bačo ad0e856e1b Merge branch 'feat-variables-api' into feat-list-endpoints-queries 2022-08-29 10:28:25 +00:00
Matej Bačo cdbfe4ae10 Variabe name bug fix 2022-08-29 10:27:56 +00:00
Matej Bačo 79eb351381 Merge remote-tracking branch 'origin/feat-list-endpoints-queries' into feat-variables-api 2022-08-29 10:08:44 +00:00
Matej Bačo 99b95cfb74 Fix bug after merge conflict 2022-08-29 10:05:11 +00:00
Matej Bačo 951ed70fb0 Merge branch 'feat-list-endpoints-queries' into feat-variables-api 2022-08-29 08:56:14 +00:00
Matej Bačo 889eaff418 Merge remote-tracking branch 'origin/feat-list-users-queries' into feat-list-endpoints-queries 2022-08-29 08:52:28 +00:00
Matej Bačo 6b5a0cbd4f Fix bug after merge comflict 2022-08-29 08:49:00 +00:00
Jake Barnby ccfd104545
Allow guest write scope for document, file and execution 2022-08-29 17:53:37 +12:00
Jake Barnby 44970cc628 Sync master 2022-08-28 11:01:46 +12:00
Christy Jacob f6e7d00b1e Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-list-users-queries 2022-08-27 20:21:51 +00:00
Christy Jacob 25d9c8e501 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-improve-keys 2022-08-27 20:03:15 +00:00
Jake Barnby a16cd37f1a Remove filter_var usage 2022-08-27 15:19:51 +12:00
Jake Barnby c531213a5f Doc updates 2022-08-27 15:19:00 +12:00
Jake Barnby 82bea82d94 Update passwordUpdate check 2022-08-27 15:17:48 +12:00
Matej Bačo dca0b211f6 Implement queries into list variables 2022-08-26 13:38:39 +00:00
Matej Bačo 3b7ac045d7 Merge remote-tracking branch 'origin/feat-list-endpoints-queries' into feat-variables-api 2022-08-26 07:51:54 +00:00
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 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
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 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 e6e126dff4 Catch AuthorzationExceptions from database to throw 401 instead of 500 2022-08-25 23:30:26 +12:00
Matej Bačo bc73b7bbf0 Fix bugs after merge 2022-08-25 10:28:13 +00:00
Matej Bačo e44efb43d1 Fix exception params 2022-08-25 10:13:36 +00:00
Matej Bačo 9d440552bd Merge remote-tracking branch 'origin/feat-list-endpoints-queries' into feat-variables-api 2022-08-25 10:02:27 +00:00
Matej Bačo c85363f355 Fix bugs after merge 2022-08-25 09:59:28 +00: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 f15f8e7bf0 Linter fix 2022-08-25 09:34:36 +00:00
Matej Baco 8513bb2dbe Merge branch 'feat-list-endpoints-queries' into feat-variables-api 2022-08-25 11:14:42 +02: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 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 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
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 65d09705ac Simplify class name 2022-08-24 18:25:15 +00:00
Matej Bačo cb6a186c5d PR review changes 2022-08-24 15:07:18 +00:00
Matej Bačo b765ad603d Merge remote-tracking branch 'origin/refactor-permissions-inc-console-fix' into feat-variables-api 2022-08-24 14:12:41 +00:00
Matej Bačo 4b01ff3f51 Use new query methods 2022-08-24 14:10:56 +00: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
Matej Bačo bd7395cb44 Bug fixing, upgrade tests to new syntax 2022-08-24 09:22:13 +00:00
Jake Barnby dabaa49f8d Remove redundant extra permissions checks for document read/update/delete 2022-08-24 20:50:05 +12:00
Jake Barnby ea4b177b83 Fix team permissions 2022-08-24 20:26:47 +12:00
Matej Bačo 01a57d91ad Fix listDocument queries validation 2022-08-23 16:33:08 +00:00
Matej Bačo 7fb74027d4 Upgrade listDocuments queries 2022-08-23 15:18:59 +00:00
Matej Bačo 531d57feff Upgrade listMemberships queries 2022-08-23 13:16:46 +00:00
Matej Bačo 2d82eed4be Linter fix 2022-08-23 13:10:27 +00:00
Matej Bačo b1348dbdd8 Upgrade account logs queries 2022-08-23 13:06:59 +00:00
Matej Bačo 36903d6358 Upgrade document&collection&database logs queries 2022-08-23 13:03:38 +00:00
Matej Bačo 79560c13e6 Upgrade teamListLogs queries 2022-08-23 12:50:52 +00:00
Matej Bačo e068bcdbc1 Upgrade listCollections queries 2022-08-23 12:30:28 +00:00
Matej Bačo 94acd32d69 Upgrade listDatabases queries 2022-08-23 09:40:17 +00:00
Matej Bačo 17e41eee1d Upgrade listExecutions queries 2022-08-23 09:26:34 +00:00
Matej Bačo a92f96bf80 Upgrade listDeployments queries 2022-08-23 09:12:48 +00:00
Matej Bačo 1eee0baa28 Upgrade listFunctions queries 2022-08-23 09:02:06 +00:00
Matej Bačo 6c971f6ece Upgrade listTeams queries 2022-08-23 08:56:28 +00:00
Matej Bačo d1f6cb31d6 Upgrade listFiles queries 2022-08-23 08:49:39 +00:00
Matej Bačo 6fcd3757fe Upgrade listBuckets queries 2022-08-23 08:37:55 +00:00
Matej Bačo e780c90dd6 Merge branch 'feat-list-users-queries' into feat-list-endpoints-queries 2022-08-23 08:10:13 +00:00
Jake Barnby 00441885d2 Remove fallback setting for missing permissions 2022-08-23 13:42:53 +12:00
Jake Barnby e989735e89 Remove permissions processor 2022-08-23 13:42:25 +12:00
Steven 66ff297103 Refactor Queries Validation 2022-08-22 19:16:20 +00:00
Jake Barnby 8841f8fe76 Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	composer.json
#	composer.lock
2022-08-22 21:13:29 +12:00
Jake Barnby eb1476b28b Apply validator updates to OpenAPI3 2022-08-22 14:27:17 +12:00
Damodar Lohani 77958b465e update database usage params label 2022-08-21 02:10:21 +00:00
Damodar Lohani 6af467398b update usage labels 2022-08-21 02:04:52 +00:00
Damodar Lohani c5a8e470c5 update usage labels to match audits labels pattern 2022-08-21 02:03:19 +00:00
Damodar Lohani 2205ecd9c6 null safety checks 2022-08-20 11:20:31 +00:00
Steven e70eb61717 Fix bug with list documents and new queries 2022-08-20 00:47:10 +00:00
Steven 2bde7aa02b Fix databases tests 2022-08-20 00:15:18 +00:00
Steven 3890dea35b Add additional Validators for Queries 2022-08-19 23:20:22 +00:00
Steven a5bc07c9e4 Merge branch 'feat-list-users-queries' into feat-list-user-logs-queries 2022-08-19 22:00:54 +00:00
Steven c1cdad5566 Merge branch 'refactor-permissions-inc-console-fix' into feat-list-users-queries 2022-08-19 14:50:50 +00:00
Matej Bačo 926d1c6459 Fix incorrect endpoint information 2022-08-19 14:14:39 +00:00
Bradley Schofield 0d81918685 Merge remote-tracking branch 'origin/refactor-permissions-inc-console-fix' into feat-variables-api 2022-08-19 11:25:39 +01:00
Christy Jacob 74a5bd2556 feat: update default values 2022-08-19 09:54:26 +00:00
Matej Bačo 30c157c23e Linter fix, update tests 2022-08-19 09:43:03 +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
Matej Bačo 61ab41bf86 Implement status of oauth providers, and refactor response models 2022-08-19 09:21:51 +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 e4392bdbfb Merge fixes
(cherry picked from commit 24875e352d)
2022-08-19 17:12:20 +12:00
Jake Barnby 24875e352d Merge fixes 2022-08-19 17:05:39 +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 5f990ecb6d Fix imports 2022-08-19 16:28:40 +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 9819088563 Lint 2022-08-19 16:05:00 +12:00
Jake Barnby 66539bbe3a Review updates for role helper usage 2022-08-19 16:04:33 +12:00
Steven 27f69e3c09 Consolidate List User Logs API params
Replace limit and offset params with a single queries param since the
Queries V2 change now allows for different types of queries.
2022-08-19 00:09:34 +00:00
Steven f0d66985f7 Consolidate List Users API params
Replace search, limit, offset, cursor, cursorDirection, and orderType
params with a single queries param since the Queries V2 change now
allows for different types of queries.
2022-08-18 19:30:39 +00:00
Damodar Lohani db9faebcc9
Update app/controllers/api/account.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-18 16:04:19 +05:45
Damodar Lohani 3e43424129 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-18 00:49:31 +00:00
Damodar Lohani 4d482ebb81 fix accounts PR 2022-08-18 00:31:56 +00:00
shimon d1aa3fea4f sync with 0.16 2022-08-17 18:03:53 +03:00
shimon a2af9fef2d sync with 0.16 2022-08-17 17:57:56 +03:00
shimon 9fc2e4c3a5 sync with 0.16 2022-08-17 17:29:22 +03:00
shimon cc9a166146 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label
 Conflicts:
	app/controllers/api/storage.php
	app/controllers/shared/api.php
2022-08-17 17:08:54 +03:00
Damodar Lohani d4f02402bd Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-17 10:38:16 +00:00
Damodar Lohani 0d97580361 fix usage params in execution 2022-08-17 10:13:50 +00:00
shimon e94c7eba83 more audit labels on users new routes 2022-08-17 13:01:16 +03:00
Damodar Lohani a1e6f7bdf4 Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-17 09:34:40 +00:00
shimon 835ef0ffc1 small fix 2022-08-17 12:25:47 +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
shimon 88f6a67802 sync with 0.16 2022-08-17 10:36:38 +03:00
shimon cc887beae9 sync with 0.16 2022-08-17 10:32:42 +03:00
shimon 2dc8fba40a Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label
 Conflicts:
	app/controllers/api/account.php
	app/controllers/api/users.php
	composer.json
	composer.lock
2022-08-17 10:05:37 +03:00
Damodar Lohani 3bc0aa8dca fix merge issues 2022-08-17 02:35:55 +00:00
Damodar Lohani 80dfa85c82 Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-17 00:45:07 +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
Matej Bačo 7a1dfbfb8d Fix passwordUpdate time for non-pass users 2022-08-16 15:56:54 +00:00
shimon 7ad7d1807e fill gaps from merge 2022-08-16 17:56:05 +03:00
shimon 5d284b8c27 fill gaps from merge 2022-08-16 16:20:35 +03:00
Matej Bačo 2814a6f680 Linter fix 2022-08-16 13:03:38 +00:00
Matej Bačo 3088535806 Added phone number to UsersAPI createUser + tests 2022-08-16 13:02:28 +00:00
Jake Barnby b09aaabd14 Fix teams exception 2022-08-17 00:14:22 +12:00
Matej Bačo 1e96f8c3d9 Revert changes regarding AccountAPI createAccount 2022-08-16 12:05:46 +00:00
shimon de42895096 fill gaps from merge 2022-08-16 14:27:50 +03:00
Jake Barnby e3ec275a51 Cleaner permission checks 2022-08-16 23:26:38 +12:00
shimon beaad6c49d fill gaps from merge 2022-08-16 13:19:38 +03:00
shimon 923a741c5a Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label
 Conflicts:
	app/controllers/api/account.php
	app/controllers/api/functions.php
	app/controllers/api/users.php
2022-08-16 12:47:51 +03:00
Jake Barnby 1aa36b6b2c Simplify permission checks 2022-08-16 21:08:14 +12:00
Jake Barnby 326220762e Exception fixes 2022-08-16 21:07:30 +12:00
shimon 8f8f033d1a fill gaps from merge 2022-08-16 12:00:28 +03: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 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
Christy Jacob 5b7b39a300
Revert "Fix Endpoint Order" 2022-08-16 12:29:03 +05:30
Jake Barnby f672269a8c Handle aggregates per resource type at the controller level 2022-08-16 17:54:44 +12:00