Commit Graph

4120 Commits

Author SHA1 Message Date
Torsten Dittmann 73a00438ae Merge branch 'master' of https://github.com/appwrite/appwrite into 0.15.x 2022-06-13 14:29:29 +02:00
Matej Bačo 7cb40f3c77 Fix order of params 2022-06-10 08:03:25 +00:00
Matej Bačo 0d94e4c9ce Merge branch 'master' into feat-password-hash-algos 2022-06-10 08:03:09 +00:00
gepd d96b077d22 remove null as param is already nullable
Co-authored-by: Everly Precia Suresh <77877486+everly-gif@users.noreply.github.com>
2022-06-09 15:32:34 -04:00
Torsten Dittmann 5ae6305eb4 Merge pull request #3345 from appwrite/feat-increase-jwt-abuse-limit
Feat increase jwt abuse limit
2022-06-09 21:15:58 +02:00
Torsten Dittmann 369c851532 Update app/controllers/api/users.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2022-06-09 21:11:49 +02:00
gepd be53bae82b Merge branch 'appwrite:master' into feat-empty-payload 2022-06-08 20:50:04 -04:00
gepd 2e05afe35a Make param optional from utopia 2022-06-08 20:49:27 -04:00
Torsten Dittmann e444ba6886 style: fix linter errors 2022-06-08 16:18:28 +02:00
Torsten Dittmann 70c98b0cfc feat: messaging worker 2022-06-08 15:57:34 +02:00
Torsten Dittmann dc25883685 feat: add update and verification method for account and users 2022-06-08 14:50:31 +02:00
shimon 40016f48c1 linter fix 2022-06-08 12:21:20 +03:00
fogelito f2c545db64 removing some duplication on collections.php
adding var hint for $user
2022-06-08 12:20:23 +03:00
Torsten Dittmann 8ce669da6f feat: initial phone authentication 2022-06-08 11:00:38 +02:00
shimon 64ba33f3aa Small fix 2022-06-08 10:19:50 +03:00
gepd 3cf26d19bc make data optional 2022-06-07 21:08:11 -04:00
shimon 54f6556204 sign webhook flow 2022-06-07 18:11:07 +03:00
fogelito 5310e2cf7c add userInternalId to sesseions , tokens , members + index for each attribute 2022-06-07 12:37:09 +03:00
gepd a107f592cf Merge branch 'master' into feat-empty-payload 2022-06-06 18:57:14 -04:00
gepd 8f831b2be3 Allows to update permissions without payload 2022-06-06 18:27:05 -04:00
Jake Barnby 254a075d7d Update JWT creation abuse limits 2022-06-07 08:57:37 +12:00
Torsten Dittmann 94b2db96c2 chore: run formatter 2022-06-03 11:12:19 +02:00
Torsten Dittmann 153ac5c60d Merge branch '0.15.x' of https://github.com/appwrite/appwrite into 0.15.x 2022-06-02 11:53:41 +02:00
Torsten Dittmann 3d297e825f Merge pull request #3296 from stnguyen90/fix-2955-add-team-member-toast
Update success, loading, and error message for add team member
2022-06-01 16:24:45 +02:00
Shimon Newman 2bad41082b Update projects.php 2022-06-01 17:23:05 +03:00
Shimon Newman ad986fe852 Update app/controllers/api/projects.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2022-06-01 17:14:26 +03:00
Shimon Newman 363c073839 Update app/controllers/api/projects.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2022-06-01 16:39:00 +03:00
shimon cd5e6f2542 small fix 2022-06-01 15:36:04 +03:00
shimon 2d7bc4fb16 small fix 2022-06-01 14:31:03 +03:00
shimon 0c435b9c3b Merge remote-tracking branch 'origin/feat-expire-key' into feat-expire-key
# Conflicts:
#	app/controllers/api/projects.php
2022-06-01 13:11:24 +03:00
shimon e782e4744f small fix 2022-06-01 13:09:53 +03:00
Shimon Newman c31055f144 Update app/controllers/api/projects.php
Co-authored-by: Torsten Dittmann <torsten.dittmann@googlemail.com>
2022-06-01 12:55:35 +03:00
shimon d39e6a842c Merge branch 'master' of github.com:appwrite/appwrite into feat-expire-key
 Conflicts:
	app/controllers/general.php
2022-06-01 09:34:34 +03:00
Steven 4a87e73a45 Update success, loading, and error message for add team member
Remove text indicating invitations since no emails are sent when adding
a user via the Admin console.
2022-05-31 22:00:37 -07:00
Steven ec1c4fd5c3 Bypass SMTP host check for admins adding team members
Since no email is sent when adding team members for admins, there shouldn't
be any need to check the SMTP host.
2022-05-31 20:50:19 -07:00
shimon 8bca5cd13e api keys 2022-05-31 18:41:12 +03:00
Everly Precia Suresh c61dd1e261 remove unecessary semi colons 2022-05-31 14:24:01 +00:00
Everly Precia Suresh 95615416a6 formate function.php 2022-05-31 13:50:27 +00:00
Everly Precia Suresh 61c8cf5ccd Merge branch 'master' of https://github.com/appwrite/appwrite into introduce-formatter-and-linter 2022-05-31 13:48:05 +00:00
Torsten Dittmann fd58c57163 Merge pull request #3280 from appwrite/refactor-accounts
Refactor `account.php`
2022-05-31 15:47:39 +02:00
Everly Precia Suresh 1be5593d9d Merge branch 'master' of https://github.com/appwrite/appwrite into introduce-formatter-and-linter 2022-05-31 13:40:43 +00:00
Torsten Dittmann 957ba08817 Merge pull request #3282 from appwrite/refactor-database
refactor `database.php`
2022-05-31 15:33:14 +02:00
Everly Precia Suresh f1938f5151 update refactor
Co-authored-by: Torsten Dittmann <torsten.dittmann@googlemail.com>
2022-05-31 18:04:20 +05:30
Everly Precia Suresh 94e225411f update refacror 2022-05-31 12:33:13 +00:00
Everly Precia Suresh 318df0d3f3 Merge branch 'master' of https://github.com/appwrite/appwrite into introduce-formatter-and-linter 2022-05-31 11:55:30 +00:00
Everly Precia Suresh 746dc72439 fix merge conflicts 2022-05-31 11:32:46 +00:00
Everly Precia Suresh e80ab77cab update refactor with changes 2022-05-31 11:11:55 +00:00
Everly Precia Suresh f8fc5ca16c remove ?
Co-authored-by: Torsten Dittmann <torsten.dittmann@googlemail.com>
2022-05-31 16:33:16 +05:30
Everly Precia Suresh 13f26a20d6 add string|array type to 2022-05-31 10:51:47 +00:00
Torsten Dittmann 0fdd785ba9 Merge branch 'master' into refactor-functions 2022-05-31 10:54:03 +02:00