Khushboo Verma
d443602cbc
resolve merge conflicts
2024-01-12 01:55:32 +05:30
Matej Bačo
34bac3dc5c
Merge branch '1.5.x' into feat-security-phrases
2024-01-11 11:54:16 +01:00
Matej Bačo
70d57b17a0
Fix copies
2024-01-11 10:36:31 +00:00
Matej Bačo
a2856f6acc
Update copy & AI translations
2024-01-11 10:23:25 +00:00
Matej Bačo
fe88829bf1
Update specs files
2024-01-11 10:10:00 +00:00
Matej Bačo
e485953da6
AI translations
2024-01-11 08:49:52 +00:00
Matej Bačo
e0db651240
Revert "Translated security phrase copy with AI"
...
This reverts commit b72dd35f45
2024-01-11 08:25:09 +00:00
Jake Barnby
320919fef2
Merge remote-tracking branch 'origin/1.4.x' into 1.5.x
2024-01-11 19:59:59 +13:00
Matej Bačo
b72dd35f45
Translated security phrase copy with AI
2024-01-10 15:01:42 +00:00
Matej Bačo
931efe24a9
Added security phrase to magic URL
2024-01-10 14:52:32 +00:00
Khushboo Verma
f6830f4e85
Resolve merge conflict
2024-01-10 19:38:55 +05:30
Khushboo Verma
7393bfc244
Use phtml instead of translation files for webhook email
2024-01-10 19:35:25 +05:30
Khushboo Verma
ef88ad6514
Updated the email
2024-01-10 15:03:36 +05:30
Khushboo Verma
b3e87d7de8
Formatted email as per design
2024-01-10 01:55:36 +05:30
Matej Bačo
c8b544da03
Improve button design
2024-01-09 16:06:24 +00:00
Matej Bačo
beeb643c66
Add all translations
2024-01-09 15:39:38 +00:00
Matej Bačo
86158838a1
Magic URL improvements
2024-01-09 12:23:13 +00:00
Khushboo Verma
5588dfca8b
WIP: Send email to user when webhook is stopped
2024-01-09 01:25:24 +05:30
Khushboo Verma
842045874e
Merge branch '1.5.x' into fix-limit-failed-webhook-attempts
2024-01-07 00:27:06 +05:30
Khushboo Verma
fb9e393c97
Merge branch '1.5.x' into fix-limit-failed-webhook-attempts
2024-01-04 16:42:47 +05:30
Steven Nguyen
06e385b346
Add changes from previous console platforms variable PR
...
See https://github.com/appwrite/appwrite/pull/4581
2024-01-03 19:30:42 +00:00
Utkarsh Ahuja
a74e5cc2c6
Merge branch '1.5.x' into feat-zoho-oauth
2024-01-03 11:24:24 +05:30
Utkarsh Ahuja
d18d187a07
fix: base changed
2024-01-03 11:20:59 +05:30
Damodar Lohani
640ab7bf87
Merge branch 'main' into to-sync-with-main
2024-01-03 00:11:42 +00:00
Utkarsh Ahuja
3e0f63e499
Merge branch 'main' into feat-zoho-oauth
2023-12-31 17:11:26 +05:30
Eldad A. Fux
4f7b1748f4
Merge pull request #7276 from fanksin/patch-1
...
Update tr.json
2023-12-31 00:24:30 +01:00
Torsten Dittmann
9b2fbc5c52
feat: console hostname env variable
2023-12-29 21:52:50 +01:00
Utkarsh Ahuja
d9319aa888
feat: added zoho oauth metadata
2023-12-23 17:42:34 +05:30
Khushboo Verma
557565b949
Merge branch '1.5.x' into fix-limit-failed-webhook-attempts
2023-12-15 01:46:47 +05:30
Jake Barnby
5135262b79
Merge remote-tracking branch 'origin/1.4.x' into 1.5.x
...
# Conflicts:
# app/config/errors.php
# composer.lock
2023-12-15 02:41:46 +13:00
Serhat Aksakal
e56b30e6a6
Update tr.json
2023-12-13 12:10:44 +03:00
Khushboo Verma
ff7cfc6602
Merge branch '1.5.x' into fix-limit-failed-webhook-attempts
2023-12-12 00:17:21 +05:30
Prateek Banga
54f574906c
review changes
2023-12-05 12:22:32 +01:00
prateek banga
81ec4ff9bc
fix typo in userId index in targets
2023-12-01 03:51:03 +05:30
prateek banga
6ead6f8094
misc changes
...
allow filtering by providerType, userId in subscribers. Adds cancelled status for message status. Validate targets when creating message. delete all targets when user is deleted. fix twilio bug. add db env vars in messaging worker compose.phtml
2023-12-01 03:39:43 +05:30
Jake Barnby
4b58d08fd8
Add providerType to Message
2023-11-29 17:09:44 +13:00
Jake Barnby
82c86c0ae2
deliveryTime -> scheduledAt
2023-11-29 17:08:25 +13:00
prateek banga
858175fe00
adds target object in subscriber model
2023-11-23 14:35:16 +05:30
prateek banga
3394218cb0
adds validation for phone and email identifier
2023-11-21 15:00:02 +05:30
prateek banga
520d19e335
changes TextMagic to Textmagic in all places and uses email validator
2023-11-21 12:35:36 +05:30
Khushboo Verma
2c04c98801
Renamed webhook variables
2023-11-20 19:49:15 +05:30
Khushboo Verma
2bcb6c18fb
Merge branch '1.5.x' into fix-limit-failed-webhook-attempts
2023-11-20 17:40:32 +05:30
Jake Barnby
0b01f7140f
Merge remote-tracking branch 'origin/main' into 1.5.x
...
# Conflicts:
# app/config/errors.php
# composer.lock
# src/Appwrite/Extend/Exception.php
2023-11-21 00:19:17 +13:00
Jake Barnby
8b14d96151
Merge remote-tracking branch 'origin/1.4.x' into chore-update-sdks
2023-11-21 00:17:36 +13:00
Jake Barnby
6ad4566b6b
Update CLI
2023-11-21 00:15:50 +13:00
prateek banga
5c1cf3a526
adds user name in subscriber response model
2023-11-20 12:34:50 +05:30
Khushboo Verma
695d6f4065
Renamed variables
2023-11-18 00:04:57 +05:30
Khushboo Verma
7902defe69
Addressed PR comments
2023-11-17 19:29:57 +05:30
Khushboo Verma
c34dc4dae0
Add flag to send logs to logger
2023-11-16 23:51:09 +05:30
Prateek Banga
f0247930da
Update app/config/collections.php
...
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2023-11-16 17:15:08 +05:30
