Commit Graph

18621 Commits

Author SHA1 Message Date
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 fd76332aca Merge pull request #3691 from appwrite/datetime-attributes-merge
Datetime attributes merge
2022-08-16 20:20:41 +12:00
fogelito 78b0b24c25 composer changes for audit abuse 2022-08-16 10:45:16 +03: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
Christy Jacob 6dd6436291 Merge pull request #3690 from appwrite/revert-3667-feat-reorder-endpoints-2
Revert "Fix Endpoint Order"
2022-08-16 12:35:32 +05:30
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
Damodar Lohani 34fd6763e1 Update app/controllers/api/account.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2022-08-16 11:14:55 +05:45
Damodar Lohani 4fb743e934 fix lint errors 2022-08-16 05:23:51 +00: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
Damodar Lohani e59f00fcd0 update runtime package 2022-08-16 04:37:54 +00:00
Damodar Lohani 078b1ec377 updating to use if condition 2022-08-16 04:34:49 +00:00
fogelito f52d28e75f Auth tests 2022-08-15 22:18:37 +03:00
fogelito 9b85a89e71 Projects tests 2022-08-15 20:37:26 +03:00
shimon 9770f10a8c fill gaps from merge 2022-08-15 20:33:44 +03:00
shimon f091774afd fill gaps from merge 2022-08-15 20:04:23 +03:00
fogelito 9c82a842b6 tests for database + account 2022-08-15 19:08:17 +03:00
shimon 590c1467bc 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-15 18:19:59 +03:00
Bradley Schofield e1cc6bc624 Start work on response filters for 0.16 2022-08-15 16:09:09 +01:00
fogelito f1d186d6ae filters for collections 2022-08-15 18:03:03 +03:00
fogelito f7948285f7 Merge branch 'refactor-permissions-inc-console-fix' of github.com:appwrite/appwrite into datetime-jake-tz
 Conflicts:
	composer.json
	composer.lock
2022-08-15 17:56:18 +03:00
fogelito 8d1127182f datetime tz 2022-08-15 17:12:03 +03:00
shimon f64c82a8cb addressing comments 2022-08-15 17:03:03 +03:00
shimon f12ccfa02a prefix removed from storage audits label 2022-08-15 16:59:58 +03:00
shimon a3a9def48d composer 2022-08-15 16:56:50 +03:00
shimon df0bdeb8a3 some fixes 2022-08-15 16:55:11 +03:00
Christy Jacob 4f80bb87c2 Merge pull request #3667 from appwrite/feat-reorder-endpoints-2
Fix Endpoint Order
2022-08-15 19:23:05 +05:30
Jake Barnby bf2fa212aa Fix setting defaults 2022-08-16 01:16:20 +12:00
Jake Barnby 28e7934aeb Update document/file validator allowed permissions 2022-08-16 01:02:02 +12:00
Jake Barnby b53f185ec6 Remove permissions processor 2022-08-16 00:56:19 +12:00
shimon 67d12d3120 some fixes 2022-08-15 15:16:32 +03:00
Jake Barnby 564f5dbf64 Find replace fix 2022-08-15 23:40:41 +12:00
Jake Barnby 77a28a2de7 Don't use ID helper with existing ID's 2022-08-15 23:24:31 +12:00
shimon edecd8dc22 some fixes 2022-08-15 13:52:20 +03:00
Jake Barnby 813e9135c6 Review fixes 2022-08-15 22:11:17 +12:00
Christy Jacob 51afc8bdfb feat: generate latest specs 2022-08-15 14:37:41 +05:30
shimon 0dc485d8d7 some fixes 2022-08-15 12:05:41 +03:00
Eldad A. Fux 72e524963c Update app/controllers/api/account.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-15 11:30:58 +03:00
Christy Jacob 7723c633a0 feat: fix tests 2022-08-15 13:24:54 +05:30
Jake Barnby 5870e6367c Update abuse lib 2022-08-15 19:50:20 +12:00
Damodar Lohani 246d9b94b7 null safety 2022-08-15 13:27:02 +05:45
Eldad A. Fux c17918007d Merge pull request #3683 from appwrite/snyk-upgrade-f8457e365b50a61a738fa5518f8d4655
[Snyk] Upgrade chart.js from 3.8.0 to 3.8.1
2022-08-15 10:23:29 +03:00
Jake Barnby 33970276b2 Self review 2022-08-15 19:20:10 +12:00
Christy Jacob 509f9083c9 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-reorder-endpoints-2 2022-08-15 12:43:24 +05:30
Eldad Fux 6f74c565e8 Fixed docblock 2022-08-15 09:55:37 +03:00
Christy Jacob 794f07c3b0 feat: accounts test 2022-08-15 12:13:09 +05:30
Jake Barnby 66f518b531 Fix team membership delete 2022-08-15 18:04:00 +12:00
Damodar Lohani c0d05132df fix usage metric typo in database 2022-08-15 05:50:36 +00:00