Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,155 Commits 1,269 Branches 495 Tags
db9faebcc9c28f3b57717265abbcd190677f7ac8
Commit Graph

528 Commits

Author SHA1 Message Date
Damodar Lohani db9faebcc9 Update app/controllers/api/account.php 
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
 2022-08-18 16:04:19 +05:45
Damodar Lohani 4d482ebb81 fix accounts PR 2022-08-18 00:31:56 +00:00
Damodar Lohani a1e6f7bdf4 Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-17 09:34:40 +00: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
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
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 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 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
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
Eldad Fux 95181546b4 Adpated tests 2022-08-14 21:09:24 +03:00
Eldad Fux bd77354926 Fixed test 2022-08-14 20:22:01 +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
Eldad Fux 98fc8669e1 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-password-hash-algos 2022-08-14 19:23:30 +03:00
Eldad Fux 2ed9199bf1 Added the ability to create a user with a phone number 2022-08-14 18:10:12 +03:00
Eldad Fux b36c24c508 Decouple Auth code from SMS provider adapter 2022-08-14 17:19:58 +03:00
Eldad Fux 25f176875d Changed provider name from phone to sms 2022-08-14 16:43:41 +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 bb4693ddfc feat: update email session endpoint 2022-08-14 15:41:21 +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 be00b64b7e Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-13 03:14:28 +00: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
shimon 90cfac9b52 replace request param extractions 2022-08-12 14:01:12 +03:00
shimon b5f977e46d adding user to audits labels 2022-08-11 16:19:05 +03:00
Damodar Lohani cb369dd326 update account routes usage labels 2022-08-10 08:45:10 +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
shimon d2519c9a5b addressing comments 2022-08-09 17:38:54 +03:00
Damodar Lohani bce998cb53 update imports and fix database usage 2022-08-09 06:28:38 +00:00
shimon 62ef532801 leftovers 2022-08-08 17:32:54 +03:00
shimon 89f164bdd7 resource namespace 2022-08-08 15:19:41 +03:00
shimon a6a9ad8cc0 databases controller 2022-08-08 11:14:27 +03:00