Commit Graph

2087 Commits

Author SHA1 Message Date
shimon 48320d40ab Merge remote-tracking branch 'origin/__stream' into __stream
# Conflicts:
#	app/config/collections.php
#	app/controllers/api/video.php
#	app/init.php
#	app/workers/transcoding.php
#	composer.lock
#	src/Appwrite/Event/Transcoding.php
#	src/Appwrite/Utopia/Response.php
#	tests/e2e/Services/Video/VideoCustomServerTest.php
2022-06-27 16:08:17 +03:00
shimon c89b028797 refactor worker flow 2022-06-27 16:06:46 +03:00
shimon c7534760a0 refactor worker flow 2022-06-22 17:44:03 +03:00
shimon d6007b24ec refactor worker flow 2022-06-22 08:56:57 +03:00
shimon c8c282afb2 restore 2022-06-21 11:45:49 +03:00
shimon 6491cea581 restore 2022-06-21 11:45:49 +03:00
shimon 100fb73323 view template 2022-06-21 11:45:49 +03:00
shimon aa6ff513a6 restore 2022-06-20 14:44:04 +03:00
shimon 56545a7344 restore 2022-06-19 11:52:56 +03:00
shimon 329c43f860 view template 2022-06-16 23:01:42 +03:00
shimon 40016f48c1 linter fix 2022-06-08 12:21:20 +03:00
shimon 64ba33f3aa Small fix 2022-06-08 10:19:50 +03:00
shimon 54f6556204 sign webhook flow 2022-06-07 18:11:07 +03: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
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
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
Torsten Dittmann ff3292041f Merge branch 'master' into refactor-database 2022-05-31 10:33:46 +02:00
Everly Precia Suresh 1fd7359fbb fix linter issues in app directory 2022-05-30 17:41:25 +00:00
Everly Precia Suresh d1e829f49a change type to array 2022-05-26 12:41:19 +00:00
Everly Precia Suresh a2d243664b remove cname tests 2022-05-26 11:21:04 +00:00
Everly Precia Suresh 6ceef6a573 update refactor 2022-05-25 16:53:10 +00:00
Everly Precia Suresh 425d81256b rename audit to EventAudit 2022-05-25 13:49:32 +00:00
Everly Precia Suresh 8f624e115b refactor users.php 2022-05-25 13:36:25 +00:00
Everly Precia Suresh fc6c546c88 refactor database 2022-05-25 12:10:10 +00:00
Everly Precia Suresh eb6b8d408a update refactor 2022-05-24 15:04:28 +00:00
Everly Precia Suresh 07bf57b161 update refactor 2022-05-24 14:57:12 +00:00
Everly Precia Suresh e2bd17d253 update refactor 2022-05-24 14:28:27 +00:00
Everly Precia Suresh 35e762453b pull latest 2022-05-24 14:04:55 +00:00
Everly Precia Suresh 107513c4c8 refactor func 2022-05-24 13:56:57 +00:00
Everly Precia Suresh 60a73c74a5 fix multi-line params in controllers 2022-05-23 16:42:27 +00:00
Everly Precia Suresh 7316e1c1ae fix multi-line params in account.php 2022-05-23 16:34:03 +00:00
Everly Precia Suresh 19300ccdd7 format files in app, src, tests 2022-05-23 14:54:50 +00:00
Everly Precia Suresh 722822dc31 refactor account.php 2022-05-18 16:14:21 +00:00
Christy Jacob 5463e62a6e feat: remove redundant order attributes validation 2022-05-18 04:36:24 +04:00
Torsten Dittmann ec1bfa0209 Merge branch 'feat-account-update-status' of https://github.com/appwrite/appwrite into feat-account-update-status 2022-05-16 12:34:20 +02:00
Torsten Dittmann 0aa8aad2a9 fix: remove wrongly placed remove 2022-05-16 12:34:14 +02:00