Commit Graph
18621 Commits
Author SHA1 Message Date
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
0d24ebd6f5 Update src/Appwrite/Utopia/Response/Model/Key.php
Co-authored-by: Torsten Dittmann <torsten.dittmann@googlemail.com>
2022-06-01 12:55:46 +03:00
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 ff949392ed linter: exclude max line width rule 2022-05-31 17:36:38 +02:00
Torsten Dittmann 70286f57dc ci: update php composer version for linter 2022-05-31 17:27:40 +02:00
Torsten DittmannandGitHub f58aa0c818 Update linter.yml 2022-05-31 17:26:45 +02:00
Torsten Dittmann 2d58f48b72 ci: fix linter 2022-05-31 17:22:40 +02:00
Torsten Dittmann 30ffcafc04 ci: fix linter os 2022-05-31 17:18:12 +02:00
Torsten Dittmann 981e82eb45 ci: fix php sniffer configuration 2022-05-31 17:16:27 +02:00
Torsten Dittmann 02bc2f6390 ci: introduce linter 2022-05-31 17:09:45 +02:00
adityaoberai e056dc15c9 Fix .NET logo 2022-05-31 20:26:15 +05:30
Torsten DittmannandGitHub 15107f0f5c Merge pull request #3312 from appwrite/introduce-formatter-and-linter
Introduce PHP code sniffer and format code
2022-05-31 16:42:47 +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 DittmannandGitHub 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 DittmannandGitHub 957ba08817 Merge pull request #3282 from appwrite/refactor-database
refactor `database.php`
2022-05-31 15:33:14 +02:00
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 93016d6174 Merge branch 'master' of https://github.com/appwrite/appwrite into introduce-formatter-and-linter 2022-05-31 12:15:35 +00:00
Eldad A. FuxandGitHub 301ff91f03 Merge pull request #2987 from emattiza/feat/enhance-gitpod-load
chore: enhance gitpod Dockerfile steps for prebuilds
2022-05-31 15:03:55 +03: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 DittmannandGitHub 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 DittmannandGitHub 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
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 f839903497 tests: fix timeout tests 2022-05-31 12:30:30 +02:00
Torsten DittmannandGitHub 103709eb8f Merge pull request #3286 from appwrite/refactor-mock
Refactor `mock.php`
2022-05-31 12:29:06 +02:00
Torsten DittmannandGitHub 26b975597b Merge pull request #3288 from appwrite/refactor-home
Refactor `home.php`
2022-05-31 11:21:27 +02:00
Torsten DittmannandGitHub 0792819fbd Merge pull request #2561 from varghesejose2020/master
Update Malayalam translations
2022-05-31 11:14:51 +02:00
Torsten DittmannandGitHub 99e0fff296 Merge pull request #3252 from appwrite/fix-empty-build-logs
fix: empty build logs
2022-05-31 11:12:50 +02:00
Torsten DittmannandGitHub cdbcdea2d2 Merge pull request #3255 from appwrite/fix-zoom-scopes
Fix: Zoom OAuth scopes
2022-05-31 11:09:29 +02:00
Torsten DittmannandGitHub a6c27841e1 Merge pull request #3277 from 2002Bishwajeet/fix-typo-error-dart
fix small typo error dart
2022-05-31 11:09:12 +02:00
Torsten DittmannandGitHub ce84dd1377 Merge pull request #3290 from appwrite/refactor-api
Refactor `api.php`
2022-05-31 11:04:39 +02:00
Torsten DittmannandGitHub 0fdd785ba9 Merge branch 'master' into refactor-functions 2022-05-31 10:54:03 +02:00
Torsten DittmannandGitHub 40724a5863 Merge pull request #3289 from appwrite/refactor-console
Refactor `console.php`
2022-05-31 10:53:17 +02:00
Torsten DittmannandGitHub 648644848a Merge branch 'master' into refactor-mock 2022-05-31 10:37:55 +02:00