Commit graph

2268 commits

Author SHA1 Message Date
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
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
shimon
de42895096 fill gaps from merge 2022-08-16 14:27:50 +03: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
shimon
8f8f033d1a fill gaps from merge 2022-08-16 12:00:28 +03:00
Christy Jacob
5b7b39a300
Revert "Fix Endpoint Order" 2022-08-16 12:29:03 +05:30
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
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
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
shimon
f12ccfa02a prefix removed from storage audits label 2022-08-15 16:59:58 +03:00
Christy Jacob
7723c633a0 feat: fix tests 2022-08-15 13:24:54 +05:30
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
Damodar Lohani
c0d05132df fix usage metric typo in database 2022-08-15 05:50:36 +00:00
Damodar Lohani
a5aa20ac5c Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-15 05:35:14 +00:00
shimon
5e476a2e5a some fixes 2022-08-15 07:29:44 +03:00
shimon
c0d8337417 some fixes 2022-08-14 23:45:05 +03:00
shimon
104e6564f7 some fixes 2022-08-14 23:06:21 +03:00
shimon
1109004727 some fixes 2022-08-14 22:27:43 +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
Damodar Lohani
5120158bdb Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-14 11:39:41 +00:00
Christy Jacob
26634cdf0b feat: linter fix 2022-08-14 15:52:19 +05:30
Christy Jacob
bb4693ddfc feat: update email session endpoint 2022-08-14 15:41:21 +05:30
Christy Jacob
979768fc9f Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-reorder-endpoints-2 2022-08-14 14:42:14 +05:30
Christy Jacob
70d2ebf55b feat: tests 2022-08-14 14:25:59 +05:30
Christy Jacob
ebb9af1eb2 feat: re-order functions endpoint 2022-08-14 13:56:11 +05:30
Christy Jacob
8e24dbe22f feat: update exception class 2022-08-14 13:35:11 +05:30
Christy Jacob
cfab9221f2 feat: exceptions on more files 2022-08-14 12:32:41 +05:30
Christy Jacob
a5bc0a61ca feat: exceptions on more files 2022-08-14 12:26:12 +05:30
Christy Jacob
5296e61d35 feat: address issues on accounts controller 2022-08-13 20:45:19 +05:30
shimon
630954c94e some fixes 2022-08-13 17:55:27 +03:00
Christy Jacob
8b23dcd69e fix: update constructor, remove account entity, add missing ID error 2022-08-13 20:14:04 +05:30
shimon
51e3fc8cab some fixes 2022-08-13 12:59:34 +03:00
shimon
48b2fb0b36 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label 2022-08-13 10:34:25 +03:00
shimon
cc9dad6bb8 Tidy up 2022-08-13 10:34:03 +03:00
Damodar Lohani
560bd97fcd organize metrics 2022-08-13 05:02:18 +00:00
Damodar Lohani
c1c325505b organize metrics 2022-08-13 05:01:43 +00:00
Damodar Lohani
85f39ec0ef organize metrics 2022-08-13 05:00:22 +00:00
Damodar Lohani
02074a93ef remove unused import 2022-08-13 04:55:42 +00:00
Damodar Lohani
d688187e23 update metrics value 2022-08-13 04:39:01 +00:00
Damodar Lohani
74a159ab99 fix key 2022-08-13 03:44:57 +00: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
Christy Jacob
9693c6e941 Merge branch 'master' of github.com:appwrite/appwrite into 0.16.x 2022-08-12 21:44:36 +05:30
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