3259 Commits
Author SHA1 Message Date
shimon 3d1228ba13 sync with master
and renaming attr
2023-02-12 10:56:11 +02:00
shimon edaa93936f Merge branch 'master' of github.com:appwrite/appwrite into __stream
 Conflicts:
	composer.json
	composer.lock
2023-02-09 19:28:26 +02:00
Bhaskar Singh e9d53cbc46 Adding missing audits.userId to routes 2023-02-05 12:32:56 +05:30
Damodar Lohani daa121262b fix boolean param 2023-01-30 06:06:52 +00:00
Damodar Lohani 91abc2b079 fix SDK method 2023-01-30 06:06:05 +00:00
Damodar Lohani 2070cccd54 update description 2023-01-30 06:05:32 +00:00
munyoudoum ff5c5c7138 fix(api/account): formatTz for expire property in POST email sessions 2023-01-30 00:32:05 +07:00
Damodar LohaniandGitHub 31b4c73b16 use variable 2023-01-29 15:30:39 +05:45
Christy JacobandGitHub e5a6db6133 Merge pull request #4890 from appwrite/doc-clarify-permission
Update permission and ID param descriptions for grammar and clarity.
2023-01-28 04:15:20 +05:30
Torsten Dittmann 24a7caf936 Merge branch 'master' of https://github.com/appwrite/appwrite into feat-4803-flutter-web-platform-type 2023-01-27 13:24:41 +01:00
Christy JacobandGitHub 54f4bef67a Merge pull request #5004 from appwrite/feat-remove-validators
Replace Appwrite Validators with backported Utopia ones
2023-01-26 16:03:06 +05:30
Christy JacobandGitHub 7c2c68c5ec Merge pull request #4988 from appwrite/fix-storage-device-case
Convert _APP_STORAGE_DEVICE env var to lowercase
2023-01-26 15:24:26 +05:30
Christy JacobandGitHub 4ea82fb2d0 Merge pull request #4795 from appwrite/fix-compression-logic
feat: use constants in switch case
2023-01-23 17:50:33 +05:30
Vincent (Wen Yu) Ge b25dc38a63 clarify custom ID vs unique ID 2023-01-20 22:22:16 +00:00
StevenandGitHub e14f4404e0 Merge branch 'master' into feat-4803-flutter-web-platform-type 2023-01-20 12:04:58 -08:00
1466e7b770 Update app/controllers/api/teams.php
Co-authored-by: Vincent (Wen Yu) Ge <vincent@appwrite.io>
2023-01-18 09:33:47 +05:45
Bradley SchofieldandGitHub 4cc135e8e2 Merge branch 'master' into fix-test-warnings 2023-01-17 10:16:53 +00:00
fogelito c4ae047833 Merge branch 'master' of github.com:appwrite/appwrite into feat-technical-debt-2
 Conflicts:
	app/init.php
	composer.json
	composer.lock
2023-01-16 10:24:37 +02:00
Damodar Lohani 4f35353289 Merge branch 'feat-password-history' of https://github.com/appwrite/appwrite into feat-password-dictionary 2023-01-16 05:09:55 +00:00
Damodar Lohani fe472e5b36 Merge branch '1.3.x' of https://github.com/appwrite/appwrite into feat-password-history 2023-01-16 05:04:13 +00:00
Vincent (Wen Yu) Ge 45aea5b941 Update branch with master 2023-01-13 14:53:54 -05:00
Vincent (Wen Yu) Ge 92a384e31c Fix descriptions for ID and regen 1.2.x specs 2023-01-13 14:27:08 -05:00
Bradley Schofield 31b718d829 Replace Appwrite Validators with backported Utopia ones
+ Updated Utopia Framework to 0.26.0
+ Replaced Appwrite Validators with Utopia ones
2023-01-13 15:28:04 +00:00
Damodar Lohani afaa64b54b fix invitation after merge 2023-01-13 06:05:16 +00:00
Damodar LohaniandGitHub 3146ec363d Merge branch 'master' into feat-team-invite-improvements 2023-01-13 11:39:20 +05:45
Eldad A. FuxandGitHub f0bb8dcc33 Merge pull request #4859 from appwrite/refactor-mails-next
refactor: make mails event and worker general
2023-01-12 09:07:43 +02:00
Steven Nguyen be77b10549 Add flutter-web as a platform type
Having a dedicated type for flutter-web will allow us to differentiate
between Flutter Web and Web in the Appwrite Console.
2023-01-11 15:47:49 -08:00
Steven Nguyen 2b4dbfb4b9 Convert _APP_STORAGE_DEVICE env var to lowercase
This is done for backwards compatibility. Up to utopia-php/storage
version 0.12.X, the devices were not lowercase. Starting 0.13.X, they
are all converted to lowercase, but people would still have the old
case in their .env file. This change makes the value check insensitive
so that the value from older versions still works.
2023-01-11 11:41:26 -08:00
shimon 1af48bd895 Merge branch 'master' of github.com:appwrite/appwrite into __stream
 Conflicts:
	.gitmodules
	app/config/errors.php
	app/config/specs/open-api3-latest-client.json
	app/config/specs/open-api3-latest-console.json
	app/config/specs/open-api3-latest-server.json
	app/config/specs/swagger2-latest-client.json
	app/config/specs/swagger2-latest-console.json
	app/config/specs/swagger2-latest-server.json
	composer.json
	composer.lock
	docker-compose.yml
	src/Appwrite/Extend/Exception.php
2023-01-11 16:31:26 +02:00
Damodar Lohani d2ca803753 add provider enabled check in the redirect 2023-01-10 04:52:21 +00:00
Damodar Lohani b06ce91297 fix formatting 2023-01-09 11:11:55 +00:00
Damodar Lohani 8d40220114 remove var dumps 2023-01-09 11:10:50 +00:00
Damodar Lohani 11b3739360 fix when either email or phone were empty 2023-01-09 11:10:02 +00:00
Damodar Lohani a2642ecc67 send phone invite only if email is empty 2023-01-09 10:59:28 +00:00
Damodar Lohani b238a1ef2d fix format 2023-01-09 10:44:28 +00:00
Damodar LohaniandGitHub 87c7e76a16 Oauth2 check if provider is enabled 2023-01-09 16:20:03 +05:45
Damodar Lohani 34b2280207 fix format 2023-01-09 09:18:13 +00:00
Damodar Lohani 8f351ad7b2 set email and phone attribute once user found 2023-01-09 09:17:39 +00:00
Damodar Lohani bc7b98821a fix error 2023-01-09 08:56:18 +00:00
Damodar Lohani 32b8a1edfe fix param order in action 2023-01-09 08:44:02 +00:00
Damodar Lohani 29ef377b60 refactor privileged/app user check 2023-01-09 08:29:33 +00:00
Damodar Lohani 63a981591d fix error and param order 2023-01-09 08:25:15 +00:00
Damodar Lohani a812bfb686 format fix 2023-01-09 05:55:07 +00:00
Damodar Lohani 2e154c06bc different test and messaging integration as well 2023-01-09 05:46:02 +00:00
Matej Bačo ccc9432219 Merge branch 'master' into fix-1.2.x-conflicts 2022-12-27 08:29:10 +01:00
Damodar Lohani a0a08b3588 fix make password optional 2022-12-27 07:13:39 +00:00
Damodar Lohani 8927c71b69 fix formatting 2022-12-26 10:34:41 +00:00
Damodar Lohani 0760ea90d6 use dictionary validator 2022-12-26 10:22:49 +00:00
Damodar Lohani a9078cded5 rename resource 2022-12-26 09:24:51 +00:00
Damodar Lohani abde948b43 fix typo 2022-12-26 06:03:43 +00:00