1
0
Fork 0
mirror of synced 2024-09-06 04:41:12 +12:00
Commit graph

12413 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
Eldad A. Fux
aacdf50f63
Merge pull request #3620 from appwrite/feat-ui-datetime
ui: datetime
2022-08-16 23:49:37 +03:00
Christy Jacob
11ad9c8dd9 feat: update abuse library 2022-08-16 20:47:05 +00:00
Christy Jacob
d2305a7900 feat: update abuse library 2022-08-16 20:45:55 +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
Matej Bačo
7a1dfbfb8d Fix passwordUpdate time for non-pass users 2022-08-16 15:56:54 +00:00
shimon
1abd57567f linter fix 2022-08-16 18:02:17 +03:00
Matej Bačo
4e7c976608 Fix node runtime test 2022-08-16 14:58:42 +00:00
shimon
7ad7d1807e fill gaps from merge 2022-08-16 17:56:05 +03:00
Matej Bačo
7d9f973c62 Fix escaping, write tests for stdout/stderr, upgrade runtimes to V2 2022-08-16 14:49:08 +00: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
Christy Jacob
51cb03a93e feat: linter fix 2022-08-16 17:58:30 +05:30
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
Matej Bačo
e41de7575c Remove unnessessary change 2022-08-16 12:05:22 +00: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
63977da7ee Lint 2022-08-16 23:39:57 +12:00
Jake Barnby
7626a0c121 Update lock 2022-08-16 23:38:17 +12:00
Jake Barnby
24af94c569 Fix tests 2022-08-16 23:29:11 +12: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
Matej Bačo
2202994060 Update lockfile 2022-08-16 11:01:47 +00:00
Matej Bačo
44310876d2 build JS 2022-08-16 10:45:08 +00:00
Matej Bačo
f10cf58ec3 Update console sdk 2022-08-16 10:42:21 +00: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
Matej Bačo
3adca4588c Update lock files 2022-08-16 09:46:00 +00:00
Matej Bačo
17600deace Merge branch '0.16.x' into feat-password-hash-algos 2022-08-16 09:35:20 +00: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
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