1
0
Fork 0
mirror of synced 2024-10-03 10:46:27 +13:00
Commit graph

2979 commits

Author SHA1 Message Date
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
shimon
e94c7eba83 more audit labels on users new routes 2022-08-17 13:01:16 +03: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
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
1abd57567f linter fix 2022-08-16 18:02:17 +03: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
Christy Jacob
51cb03a93e feat: linter fix 2022-08-16 17:58:30 +05:30
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
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
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
078b1ec377 updating to use if condition 2022-08-16 04:34:49 +00: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
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
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
df0bdeb8a3 some fixes 2022-08-15 16:55:11 +03:00
shimon
67d12d3120 some fixes 2022-08-15 15:16:32 +03:00
shimon
edecd8dc22 some fixes 2022-08-15 13:52:20 +03:00
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
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
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
cabe989555 some fixes 2022-08-14 22:42:20 +03:00
shimon
1109004727 some fixes 2022-08-14 22:27:43 +03:00
Eldad Fux
95181546b4 Adpated tests 2022-08-14 21:09:24 +03:00
shimon
857803e362 some fixes 2022-08-14 21:02:38 +03:00
Eldad Fux
98e2564330 Merge branch 'feat-password-hash-algos' of https://github.com/appwrite/appwrite into feat-missing-phone-param 2022-08-14 20:22:52 +03:00
Eldad Fux
bd77354926 Fixed test 2022-08-14 20:22:01 +03:00
Eldad A. Fux
340cfb0104
Update app/controllers/api/users.php 2022-08-14 20:01:32 +03:00
Eldad Fux
22c38a484f Merge branch 'feat-password-hash-algos' of https://github.com/appwrite/appwrite into feat-missing-phone-param 2022-08-14 19:43:53 +03:00