1
0
Fork 0
mirror of synced 2024-07-01 20:50:49 +12:00
Commit graph

6413 commits

Author SHA1 Message Date
Torsten Dittmann 8ce669da6f feat: initial phone authentication 2022-06-08 11:00:38 +02:00
Torsten Dittmann 94b2db96c2 chore: run formatter 2022-06-03 11:12:19 +02:00
Torsten Dittmann 372939c727 Merge branch 'master' of https://github.com/appwrite/appwrite into 0.15.x 2022-06-03 11:09:14 +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 b8058c51e5 Merge branch 'master' of https://github.com/appwrite/appwrite into fix-subquery-limit 2022-06-01 19:14:46 +02:00
Torsten Dittmann 2255c789df fix: subquery return for sessions 2022-06-01 19:13:15 +02:00
Torsten Dittmann b55d2c1b6d
Merge pull request #3316 from appwrite/ci-introduce-linter
ci: introduce linter
2022-06-01 19:03:43 +02:00
Shimon Newman 57e0679524
Update collections.php 2022-06-01 19:51:12 +03:00
Torsten Dittmann dd4dcebdeb Merge branch 'master' of https://github.com/appwrite/appwrite into fix-subquery-limit 2022-06-01 16:32:59 +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
Torsten Dittmann f1322175da
Merge pull request #3270 from stnguyen90/feat-3269-skip-service-check-for-server
Update service checks to ignore server app users
2022-06-01 16:23:27 +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 1a28c3a909 api keys, validation and test 2022-06-01 09:38:11 +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
shimon 8013276515 api keys, validation and test 2022-06-01 09:26:55 +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
Steven Nguyen f645c2ce53 Update service checks to ignore server app users 2022-05-31 20:42:41 -07:00
Torsten Dittmann 540738101f fix: error type 2022-06-01 00:09:23 +02:00
shimon 8bca5cd13e api keys 2022-05-31 18:41:12 +03:00
Torsten Dittmann 981e82eb45 ci: fix php sniffer configuration 2022-05-31 17:16:27 +02: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
Torsten Dittmann 63092dd1fa
Merge pull request #3214 from appwrite/refactor-functions
Refactor `functions.php`
2022-05-31 13:51:54 +02:00
Everly Precia Suresh f039fb36fc format newly added changes 2022-05-31 11:35:59 +00:00
Everly Precia Suresh 746dc72439 fix merge conflicts 2022-05-31 11:32:46 +00:00
Torsten Dittmann 60ffee2c5e
Merge pull request #3287 from appwrite/refactor-general
Refactor `general.php`
2022-05-31 13:15:56 +02: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 103709eb8f
Merge pull request #3286 from appwrite/refactor-mock
Refactor `mock.php`
2022-05-31 12:29:06 +02:00
Torsten Dittmann 26b975597b
Merge pull request #3288 from appwrite/refactor-home
Refactor `home.php`
2022-05-31 11:21:27 +02:00
Torsten Dittmann 0792819fbd
Merge pull request #2561 from varghesejose2020/master
Update Malayalam translations
2022-05-31 11:14:51 +02:00
Torsten Dittmann 99e0fff296
Merge pull request #3252 from appwrite/fix-empty-build-logs
fix: empty build logs
2022-05-31 11:12:50 +02:00
Torsten Dittmann ce84dd1377
Merge pull request #3290 from appwrite/refactor-api
Refactor `api.php`
2022-05-31 11:04:39 +02:00
Torsten Dittmann 0fdd785ba9
Merge branch 'master' into refactor-functions 2022-05-31 10:54:03 +02:00