Commit Graph

7006 Commits

Author SHA1 Message Date
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
Damodar Lohani be00b64b7e Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-13 03:14:28 +00: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
Christy Jacob 4521907b83 feat: refactor workers 2022-08-12 21:39:45 +05:30
Bradley Schofield 83c1129ed5 Add TODO Warning 2022-08-12 17:01:25 +01:00
Bradley Schofield 930120fc4d Update app/controllers/api/users.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2022-08-12 16:55:58 +01:00
Bradley Schofield cb87c248d5 Rebuild Specs, SDKs and start working on subqueries 2022-08-12 16:51:24 +01:00
Jake Barnby 8d4191b1a0 Lint 2022-08-13 02:46:50 +12:00
Jake Barnby 09b001e891 PR fixes 2022-08-13 02:41:57 +12:00
Bradley Schofield d86e4ac0b6 Run Linter 2022-08-12 15:15:58 +01:00
Bradley Schofield d9104ceced Update capitalisation on some names 2022-08-12 15:15:36 +01:00
Bradley Schofield 7af92b3b30 Fix Endpoint Order 2022-08-12 15:10:41 +01:00
shimon 1af95fcdaa Tidy up 2022-08-12 16:21:32 +03: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
Jake Barnby c104860448 Use roles validator for function execution 2022-08-13 00:23:58 +12:00
shimon 90cfac9b52 replace request param extractions 2022-08-12 14:01:12 +03:00
Jake Barnby 1d7c25b561 Single role per permissions entry 2022-08-12 22:36:59 +12:00
shimon b5f977e46d adding user to audits labels 2022-08-11 16:19:05 +03:00
Eldad A. Fux f4bbcc9fa3 Merge pull request #3619 from appwrite/fix-phone-search
Fix: User Search attribute (phone)
2022-08-11 14:20:44 +03:00
Damodar Lohani cd9efec4d2 refactor 2022-08-11 06:49:20 +00:00
Damodar Lohani 1753dbe8b0 fix formatting 2022-08-11 06:18:37 +00:00
Damodar Lohani b5f5aff626 fix response and project usage issues 2022-08-11 06:05:38 +00:00
Damodar Lohani 63371ce76e functions usage stats using route labels 2022-08-11 05:25:39 +00:00
Damodar Lohani c5993ba8b9 storage usage stats via route labels 2022-08-11 02:18:22 +00:00
Damodar Lohani e666ae2b2e fix users usage endpoint 2022-08-11 02:11:31 +00:00
Damodar Lohani 5647f957a7 users metrics via route labels 2022-08-11 01:43:02 +00:00
Damodar Lohani 73f675aebe Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-11 01:15:29 +00:00
Bradley Schofield 15fbe86124 Fix variables not being correctly used 2022-08-10 14:43:05 +01:00
shimon 5a15d29a22 sync with 0.16.x 2022-08-10 12:22:55 +03:00
shimon d31c23d25a Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label
 Conflicts:
	app/controllers/api/databases.php
2022-08-10 12:18:05 +03:00
Damodar Lohani cb369dd326 update account routes usage labels 2022-08-10 08:45:10 +00:00
Damodar Lohani 391d1127ca update container to accept new response format 2022-08-10 07:19:07 +00:00
Damodar Lohani 8aa7486e71 database usage stats working via labels 2022-08-10 02:33:46 +00:00
Damodar Lohani ebf3d813cb refactor database usage to labels 2022-08-10 02:18:18 +00:00
Damodar Lohani 16fe9e241a Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-10 01:49:27 +00:00
Bradley Schofield 42e0895dad Fix Tests 2022-08-09 16:29:24 +01:00
shimon d2519c9a5b addressing comments 2022-08-09 17:38:54 +03:00
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
Bradley Schofield 6882ffaa00 Merge branch '0.16.x' into feat-variables-api 2022-08-09 13:37:24 +01:00
Bradley Schofield d4da9d823b Add API Descriptions and use APP_LIMIT_COUNT 2022-08-09 13:11:50 +01:00
shimon 092e682591 Merge branch 'master' of github.com:appwrite/appwrite into feat-file-cache-cleanup
 Conflicts:
	app/controllers/shared/api.php
2022-08-09 15:02:29 +03:00
Bradley Schofield c4d453b738 Update Variables API Signature 2022-08-09 12:56:45 +01:00
fogelito db5d737235 Merge branch '0.16.x' of github.com:appwrite/appwrite into origin/datetime-api
 Conflicts:
	tests/e2e/Services/Databases/DatabasesBase.php
2022-08-09 14:37:21 +03:00
Christy Jacob 6a6c7d4b90 Merge pull request #3547 from appwrite/fix-update-status-codes
Use 202 when resources are created asyncronously
2022-08-09 14:42:40 +05:30
Jake Barnby 3611f9df94 Parameter order fix 2022-08-09 18:58:08 +12:00
Damodar Lohani bce998cb53 update imports and fix database usage 2022-08-09 06:28:38 +00:00
Jake Barnby 216486a4c6 Fix DB tests 2022-08-09 18:03:41 +12:00
Jake Barnby fb0168ea50 Fix erroneous whitespace 2022-08-09 14:48:39 +12:00
shimon 6e0b7cc650 leftovers 2022-08-08 18:44:11 +03:00