1
0
Fork 0
mirror of synced 2024-08-30 17:31:59 +12:00
Commit graph

11014 commits

Author SHA1 Message Date
shimon
c58d6ea418 sync against main 2024-01-31 20:31:16 +02:00
shimon
f477be7521 Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models
 Conflicts:
	composer.json
2024-01-31 20:28:03 +02:00
shimon
3f1850f4a7 Merge remote-tracking branch 'origin/1.5.x-response-request-models' into 1.5.x-response-request-models
# Conflicts:
#	Dockerfile
#	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
#	app/controllers/api/account.php
#	app/controllers/api/users.php
#	app/controllers/shared/api.php
#	composer.lock
#	src/Appwrite/Migration/Version/V20.php
#	src/Appwrite/Platform/Services/Tasks.php
#	src/Appwrite/Platform/Services/Workers.php
#	src/Appwrite/Platform/Workers/Builds.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Platform/Workers/Mails.php
2024-01-31 20:25:12 +02:00
shimon
102c86b2a6 Merge branch 'main' of github.com:appwrite/appwrite into 1.5.x-response-request-models
 Conflicts:
	Dockerfile
	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
	app/controllers/api/account.php
	app/controllers/api/users.php
	app/controllers/shared/api.php
	app/worker.php
	composer.json
	composer.lock
	src/Appwrite/Event/Mail.php
	src/Appwrite/Migration/Migration.php
	src/Appwrite/Migration/Version/V20.php
	src/Appwrite/Platform/Services/Tasks.php
	src/Appwrite/Platform/Services/Workers.php
	src/Appwrite/Platform/Workers/Builds.php
	src/Appwrite/Platform/Workers/Deletes.php
	src/Appwrite/Platform/Workers/Mails.php
2024-01-31 20:21:18 +02:00
Jake Barnby
9051c31a02
Update traefik, mariadb, redis containers 2024-02-01 02:36:35 +13:00
Jake Barnby
d275d36a0b
Fix param order 2024-02-01 02:33:14 +13:00
Jake Barnby
e4194c690f
Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-provider
# Conflicts:
#	composer.lock
2024-02-01 01:50:36 +13:00
Jake Barnby
49a753509b
Merge pull request #7067 from appwrite/feat-php-8-1
Upgrade to PHP 8.2
2024-02-01 01:47:57 +13:00
Jake Barnby
d9f53cacfa
Add SMTP provider 2024-02-01 01:30:09 +13:00
Jake Barnby
39312a83ef
Merge pull request #7518 from appwrite/feat-remove-description
Feat remove description
2024-02-01 00:33:49 +13:00
Jake Barnby
79c324527e
Merge pull request #7510 from appwrite/feat-delete-message
Add message delete route
2024-01-31 19:55:11 +13:00
Khushboo Verma
dadb94c499 Merge branch '1.5.x' into feat-block-countries 2024-01-31 12:24:21 +05:30
Khushboo Verma
1d2eadf7e0 Allow 451 error publicly 2024-01-31 12:23:45 +05:30
Torsten Dittmann
3f688a2aa7 fix: remove some leftovers 2024-01-30 16:09:58 +01:00
Jake Barnby
ee4b50ce51
Merge pull request #7504 from appwrite/labels-limit
Labels limit
2024-01-30 19:43:32 +13:00
Jake Barnby
ab0fae216d
Merge remote-tracking branch 'origin/1.5.x' into feat-php-8-1
# Conflicts:
#	composer.lock
2024-01-30 18:44:16 +13:00
Jake Barnby
d7c9f9df59
Merge remote-tracking branch 'origin/1.5.x' into feat-remove-description 2024-01-30 16:58:20 +13:00
Jake Barnby
14a279eb57
Merge remote-tracking branch 'origin/1.5.x' into feat-delete-message 2024-01-30 16:58:04 +13:00
Jake Barnby
afb32b49d5
Throw if status still scheduled and scheduled time before now 2024-01-30 16:33:18 +13:00
Khushboo Verma
2f88320d4f Add null check 2024-01-29 18:47:14 +05:30
Khushboo Verma
f4426d553c Throw 451 exception 2024-01-29 16:49:13 +05:30
Khushboo Verma
4cd5999bb3 Merge branch '1.5.x' into feat-block-countries 2024-01-29 16:25:31 +05:30
fogelito
53efc930c0 Remove Database::INDEX_ARRAY 2024-01-29 08:58:11 +02:00
fogelito
9c8c017618 Merge branch '1.5.x' of github.com:appwrite/appwrite into feat-php-8-1
 Conflicts:
	app/controllers/api/databases.php
	app/controllers/api/projects.php
	app/controllers/api/users.php
	composer.json
	composer.lock
2024-01-29 08:50:53 +02:00
Jake Barnby
61dd4a123c
Remove descriptions 2024-01-29 19:29:58 +13:00
Jake Barnby
d94962f086
Add message delete route 2024-01-29 17:20:45 +13:00
fogelito
974783f54a Increase labels max value 2024-01-28 12:51:05 +02:00
fogelito
789e19d26a Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing 2024-01-25 19:06:18 +02:00
Jake Barnby
fc41b08940 Fix email credential checks 2024-01-25 17:59:26 +01:00
Jake Barnby
b3a4722758 Fix validators 2024-01-25 17:59:26 +01:00
Jake Barnby
7a5c226110 Fix tests 2024-01-25 17:59:26 +01:00
Jake Barnby
d405106aaa Throw on enable if provider credentials are missing instead of ignoring 2024-01-25 17:59:26 +01:00
Jake Barnby
dc1dad9f5f
Merge pull request #7490 from appwrite/fix-target-deletes-not-triggered
Trigger deletes worker when target is deleted
2024-01-26 05:59:04 +13:00
fogelito
998c4d282d Fix failing tests 2024-01-25 18:53:51 +02:00
fogelito
a782e20315 Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing
 Conflicts:
	app/controllers/api/account.php
	composer.json
	composer.lock
	src/Appwrite/Platform/Tasks/CalcTierStats.php
	tests/e2e/Services/Account/AccountBase.php
2024-01-25 17:44:05 +02:00
Bradley Schofield
c8d75fadf9 Merge branch '1.5.x' into 1.5.x-response-request-models 2024-01-25 12:27:00 +00:00
Jake Barnby
7106131545
Merge branch '1.5.x' into feat-maintenance-delete-expired-targets 2024-01-26 00:26:29 +13:00
Torsten Dittmann
a62b3f562e sync: console 2024-01-25 10:57:58 +01:00
Jake Barnby
52a9b31521
Trigger deletes worker when target is deleted 2024-01-25 20:01:15 +13:00
Torsten Dittmann
eda568acff chore: bump console 2024-01-24 18:54:03 +01:00
Torsten Dittmann
672b2d3cf7 chore: bump console version 2024-01-24 18:52:53 +01:00
Torsten Dittmann
b6d85b5a24 fix: email factor for otp 2024-01-24 17:50:16 +01:00
Torsten Dittmann
9070dce6ac Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 16:32:12 +01:00
Torsten Dittmann
88cf7ea9e8 fix: race condition with creating a user with targets 2024-01-24 15:31:58 +01:00
Khushboo Verma
5165c252f7 Merge branch '1.5.x' into feat-block-countries 2024-01-24 18:28:50 +05:30
Khushboo Verma
51d1a38f0f Added test case 2024-01-24 18:24:48 +05:30
Torsten Dittmann
62e459c581 fix: workers 2024-01-24 12:29:36 +01:00
Torsten Dittmann
d087a76329
Merge branch '1.5.x' into sync-main-with-1.5.x 2024-01-24 12:06:22 +01:00
Christy Jacob
6f52b5f7a1
Merge pull request #7475 from appwrite/fix-certificate-mail-branding
Fix: Certificate email style
2024-01-24 14:47:21 +04:00
Khushboo Verma
e2cf8c696a Add restrict group to some APIs 2024-01-24 16:08:51 +05:30
Torsten Dittmann
9f5a0312cf Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 11:24:59 +01:00
Khushboo Verma
c07a3889e6 WIP: Add new group to api.php 2024-01-24 14:41:35 +05:30
fogelito
55c72521e9 Upgrade base:0.7.2 2024-01-24 10:37:28 +02:00
Bradley Schofield
4ce5256c1e Merge branch '1.5.x' into 1.5.x-response-request-models 2024-01-23 16:17:56 +00:00
fogelito
8dd387cfbe Parsing and Throw Error 2024-01-23 17:14:14 +02:00
Matej Bačo
52786b8273 PR review changes 2024-01-23 10:35:47 +00:00
Matej Bačo
89f778014a Fix invalid specs 2024-01-23 09:27:25 +00:00
Matej Bačo
187165f397 Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-23 09:12:22 +00:00
Matej Bačo
84a0b30b99 Revert console changes 2024-01-23 09:09:22 +00:00
Matej Bačo
8a05b634fe Merge remote-tracking branch 'origin/1.5.x' into fix-certificate-mail-branding 2024-01-23 09:04:20 +00:00
Matej Bačo
e26a9d17cb PR review changes 2024-01-23 09:03:18 +00:00
Christy Jacob
3c3c34add9
Merge pull request #7474 from appwrite/fix-email-image-endpoint
Fix: Email image endpoints
2024-01-23 00:05:01 +04:00
Torsten Dittmann
f1293d2636 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-01-22 18:32:22 +01:00
Torsten Dittmann
a9f1e4d78d
feat: delete account (#7392)
* feat: delete account

* fix: new endpoint only for console sdk

* fix: hide endpoint from public sdks

* fix: account delete scope
2024-01-22 18:29:10 +01:00
fogelito
37bdb17cc6 Deprecated changes 2024-01-22 19:24:12 +02:00
Matej Bačo
0c7a69e665 Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-22 16:05:38 +00:00
Matej Bačo
871c29d1a5 PR review changes 2024-01-22 15:53:11 +00:00
Christy Jacob
cfc25288b5
Merge pull request #7422 from appwrite/feat-email-otp
Feat: Email OTP
2024-01-22 19:18:39 +04:00
Matej Bačo
05a83d6d1b Merge branch 'feat-email-otp' of https://github.com/appwrite/appwrite into feat-email-otp 2024-01-22 15:02:51 +00:00
Matej Bačo
fc3fa8f1d7 PR review changes 2024-01-22 15:02:33 +00:00
Matej Bačo
f7e9d8fc19
Update app/config/locale/translations/en.json
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-01-22 15:57:06 +01:00
Matej Bačo
cba974805d PR review changes 2024-01-22 14:30:11 +00:00
Christy Jacob
3656be3da5
Merge pull request #7452 from appwrite/feat-session-renewal
Feat: session renewal
2024-01-22 18:28:55 +04:00
Torsten Dittmann
02d91dc7f5 feat: console update 2024-01-22 14:57:55 +01:00
Torsten Dittmann
185e4258df Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-01-22 14:45:07 +01:00
Matej Bačo
3bf89a931d PR review changes 2024-01-22 13:20:48 +00:00
Matej Bačo
33e1d61bd9 Fix missing languages 2024-01-22 13:18:19 +00:00
Bradley Schofield
9edf73fa3c Merge branch '1.5.x' into 1.5.x-response-request-models 2024-01-22 11:23:39 +00:00
Matej Bačo
9ad5aa79d0 Fix failing tests 2024-01-22 11:20:33 +00:00
Bradley Schofield
5faf7899f8 Add Webhooks and schedules DB migrations 2024-01-22 11:18:43 +00:00
Matej Bačo
58fa2efad2 Translate new keys 2024-01-22 11:15:24 +00:00
Matej Bačo
724b8c8098 Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-22 10:13:28 +00:00
Matej Bačo
4366f8e5d8 Remove incorrect translations, improve script 2024-01-22 10:01:02 +00:00
Khushboo Verma
5e3212bbff Rename redirect to path 2024-01-22 14:26:40 +05:30
Khushboo Verma
506e8c658d Refactored url construction 2024-01-22 13:48:19 +05:30
Matej Bačo
32cc186ea6 Merge remote-tracking branch 'origin/1.5.x' into feat-session-renewal 2024-01-22 08:17:52 +00:00
Matej Bačo
fc186c69a1 PR review changes 2024-01-22 08:13:46 +00:00
fogelito
667abce8f5 Create indexes & query contains 2024-01-21 18:22:02 +02:00
fogelito
3689435176 Arrays tests 2024-01-21 10:10:18 +02:00
Matej Bačo
eb597b2bd2 Try to fix targets bug 2024-01-20 13:07:53 +00:00
Matej Bačo
933b64001c Improve design 2024-01-20 12:49:23 +00:00
Matej Bačo
5e0c3c509d WIP: Certificate branded mail 2024-01-20 12:06:52 +00:00
Matej Bačo
284c1746eb Add proper endpoint to email images 2024-01-20 11:05:44 +00:00
Matej Bačo
42eb051368 QA bug fixes 2024-01-20 10:06:30 +00:00
Matej Bačo
311e9a75dd Allow empty values in PATH user service 2024-01-20 09:43:31 +00:00
Matej Bačo
df9bc6df56 Implement OTP email endpoint + tests 2024-01-19 13:42:26 +00:00
Bradley Schofield
18f3f35cad Merge branch '1.5.x' into 1.5.x-response-request-models 2024-01-19 13:29:04 +00:00
Matej Bačo
31a67a7667 Merge remote-tracking branch 'origin/1.5.x' into feat-email-otp 2024-01-19 12:12:07 +00:00
Matej Bačo
f2291f1686 Add OTP translations 2024-01-19 12:11:20 +00:00
Khushboo Verma
a134ca7efd Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-19 17:12:14 +05:30