Commit graph

4013 commits

Author SHA1 Message Date
Khushboo Verma
0ea7b28a6b Resolve merge conflicts 2024-02-02 12:53:25 +05:30
Eldad A. Fux
321a998947
Merge pull request #7533 from appwrite/feat-rename-security-phrases
Feat: Rename security phrases
2024-02-01 15:45:15 +01:00
Matej Bačo
ef3f7878dc PR review changes 2024-02-01 14:13:30 +00:00
Torsten Dittmann
9c0bd9fc6e
Merge pull request #7489 from appwrite/update-webhook-abuse-limit
Add webhook max failed attempts as env variable
2024-02-01 13:34:57 +01:00
Khushboo Verma
d3b002a48e Merge branch '1.5.x' into feat-block-countries 2024-02-01 17:49:14 +05:30
Matej Bačo
a47a4240ed Rename security phrases 2024-02-01 10:41:01 +00:00
Jake Barnby
836ae8a607
Fix adapter instantiation 2024-02-01 17:51:28 +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
d9f53cacfa
Add SMTP provider 2024-02-01 01:30:09 +13:00
Khushboo Verma
dadb94c499 Merge branch '1.5.x' into feat-block-countries 2024-01-31 12:24:21 +05:30
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
Khushboo Verma
f4426d553c Throw 451 exception 2024-01-29 16:49:13 +05:30
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
Khushboo Verma
221b0eed38 Add intVal check 2024-01-26 22:18:17 +05:30
Khushboo Verma
2fca86584f Merge branch '1.5.x' into update-webhook-abuse-limit 2024-01-26 22:06:46 +05:30
Khushboo Verma
e4b3f652e7 Add webhook abuse as env variable 2024-01-26 21:25:35 +05:30
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
d405106aaa Throw on enable if provider credentials are missing instead of ignoring 2024-01-25 17:59:26 +01: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
Jake Barnby
89343704f7
Rename deleteTargetSubscribers method to make actions clearer 2024-01-26 00:41:05 +13:00
Jake Barnby
34973b8413
Directly delete message schedule instead of deferring to worker 2024-01-26 00:35:37 +13:00
Jake Barnby
e81ab1d1e0
Remove redundant document pass through 2024-01-26 00:35:04 +13:00
Jake Barnby
7106131545
Merge branch '1.5.x' into feat-maintenance-delete-expired-targets 2024-01-26 00:26:29 +13:00
Khushboo Verma
5f5a7801b0 Update max_failed_attempts to 100 2024-01-25 11:44:16 +05:30
Torsten Dittmann
62e459c581 fix: workers 2024-01-24 12:29:36 +01:00
Torsten Dittmann
e148617d3e fix: builds worker 2024-01-24 12:20:13 +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
Torsten Dittmann
d13023f23c fix: deletes worker 2024-01-24 11:42:04 +01:00
Torsten Dittmann
9f5a0312cf Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 11:24:59 +01: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
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
Christy Jacob
cfc25288b5
Merge pull request #7422 from appwrite/feat-email-otp
Feat: Email OTP
2024-01-22 19:18:39 +04:00
Christy Jacob
3656be3da5
Merge pull request #7452 from appwrite/feat-session-renewal
Feat: session renewal
2024-01-22 18:28:55 +04:00
shimon
d220c2bdd7 Added marked_for_deletion and billing_plan_downgrade
to hamster export
2024-01-22 14:48:25 +02:00
Matej Bačo
554103687e linter fix 2024-01-22 11:15:55 +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
shimon
2b865bdf97 Added marked_for_deletion and billing_plan_downgrade
to hamster export
2024-01-22 11:29:11 +02:00
shimon
19b1de283b Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into hamster-additions 2024-01-22 11:25:37 +02:00
Khushboo Verma
5e3212bbff Rename redirect to path 2024-01-22 14:26:40 +05:30
德华 刘
d04f9f41c3 chore: refactor code 2024-01-22 08:30:48 +00:00
德华 刘
ff7523d6db chore: refactor code 2024-01-22 08:26:38 +00:00
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
shimon
9fc1b0b71b Added marked_for_deletion and billing_plan_downgrade
to hamster export
2024-01-22 10:09:13 +02:00
shimon
0e30f6533e Added marked_for_deletion and billing_plan_downgrade
to hamster export
2024-01-22 09:54:09 +02:00
shimon
c116de29e1 Added marked_for_deletion and billing_plan_downgrade
to hamster export
2024-01-22 09:28:45 +02:00