Commit Graph

3719 Commits

Author SHA1 Message Date
Jake Barnby baf807d389 Merge remote-tracking branch 'origin/1.5.x' into json-parsing
# Conflicts:
#	composer.lock
2024-01-09 14:08:39 +13:00
Jake Barnby 51b2019ab6 Merge remote-tracking branch 'origin/1.5.x' into json-parsing
# Conflicts:
#	composer.lock
2024-01-09 13:56:01 +13:00
Jake Barnby 745f49541e Merge branch '1.5.x' into messaging-uniform-logic 2024-01-09 13:53:19 +13:00
Jake Barnby e7c33dbf01 Merge branch '1.5.x' into fix-topics-query-total 2024-01-09 13:49:20 +13:00
Jake Barnby 219f091925 Merge branch '1.5.x' into messaging-uniform-logic 2024-01-09 12:40:07 +13:00
Utkarsh Ahuja 2bc4795d8e Merge branch '1.5.x' into feat-zoho-oauth 2024-01-05 11:16:00 +05:30
Steven Nguyen 01df91aee9 Replace backticks with double quotes 2024-01-04 23:58:48 +00:00
Steven Nguyen 10dfadbbc7 Create an enum for Message status 2024-01-04 18:58:01 +01:00
Steven Nguyen 4cfd977bd7 Add support for querying topic total 2024-01-04 00:59:44 +00:00
Utkarsh Ahuja a74e5cc2c6 Merge branch '1.5.x' into feat-zoho-oauth 2024-01-03 11:24:24 +05:30
Damodar Lohani 640ab7bf87 Merge branch 'main' into to-sync-with-main 2024-01-03 00:11:42 +00:00
Matej Bačo 554e9f93b6 Implement max password length 2024-01-02 10:59:35 +00:00
Utkarsh Ahuja c4ab4ca16a fix: lint errors 2024-01-02 13:15:07 +05:30
Utkarsh Ahuja 70916ad1aa fix: removed authEndpoint 2024-01-02 10:13:46 +05:30
Utkarsh Ahuja ef2a943f49 Merge branch 'main' into feat-zoho-oauth 2023-12-31 19:27:57 +05:30
Utkarsh Ahuja acebe54e5e fix: email verified false on null 2023-12-31 19:27:12 +05:30
Damodar Lohani a2ad870084 use compression constant from utopia/storage 2023-12-31 11:46:45 +00:00
Utkarsh Ahuja 09cec17285 added Zoho OAuth class 2023-12-29 17:43:07 +00:00
prateek banga 5d7eca7c99 lint fix and tests fix 2023-12-19 23:45:20 +05:30
Prateek Banga 1957bc57c2 makes messaging worker compatible with new messaging lib version 2023-12-19 18:28:25 +05:30
Steven Nguyen e41194ee3c Fix import to match class name
The class is SMS rather than Sms.
2023-12-16 17:42:29 +00:00
Jake Barnby 121521d7c5 Merge remote-tracking branch 'origin/1.5.x' into json-parsing
# Conflicts:
#	composer.lock
#	src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php
#	src/Appwrite/Platform/Tasks/Hamster.php
2023-12-15 18:22:08 +13:00
Jake Barnby 7b99fab512 Use targets for cc/bcc 2023-12-15 03:19:24 +13:00
Jake Barnby 2eace5a627 Merge remote-tracking branch 'origin/1.5.x' into messaging-uniform-logic
# Conflicts:
#	app/controllers/api/messaging.php
#	composer.lock
2023-12-15 02:47:59 +13:00
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
fogelito cc5ae73f57 purgeCached changes 2023-12-14 15:32:06 +02:00
Prateek Banga 194bbbb350 review changes 2023-12-05 19:24:55 +01:00
Prateek Banga e7dca6b2d5 adds uniform logic for worker and extra params for email 2023-12-05 15:01:32 +01:00
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
德华 刘 b6fabf80ef Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-refactor-hamster 2023-11-30 21:20:59 +00:00
德华 刘 49bb3444bf chore: add logs 2023-11-30 21:11:31 +00:00
德华 刘 d4ff696173 chore: fix linter issues 2023-11-30 20:35:18 +00:00
德华 刘 0382b2250a chore: address review comments 2023-11-30 19:22:35 +00:00
德华 刘 f3544485e5 chore: address review comments 2023-11-30 17:41:23 +00:00
德华 刘 4b7676158e chore: address review comments 2023-11-30 16:24:11 +00:00
德华 刘 5cb818066f Merge branch 'feat-refactor-hamster' of https://github.com/appwrite/appwrite into feat-refactor-hamster 2023-11-30 16:23:05 +00:00
德华 刘 d34050a5df chore: address review comments 2023-11-30 16:22:26 +00:00
Bradley Schofield 8bec64b2a2 Update Hamster.php 2023-11-30 11:05:15 +00:00
prateek banga fa8dc133b4 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-add-message-provider-type 2023-11-29 15:01:47 +05:30
Jake Barnby 042c1a725f Message extends Model instead of Any so rules are applied since data is not hoisted 2023-11-29 17:10:53 +13:00
Jake Barnby 4b58d08fd8 Add providerType to Message 2023-11-29 17:09:44 +13:00
Jake Barnby 4bc23afc65 Add constants for message types 2023-11-29 17:05:37 +13:00
prateek banga ee4c2d0e0d adds target when creating user via server endpoint 2023-11-28 18:42:34 +05:30
Bradley Schofield dea3e74b6a Implement Job based hamster 2023-11-28 10:19:55 +00:00
Jake Barnby 1a496bbf71 Merge pull request #7180 from appwrite/chore-update-sdks
Chore update sdks
2023-11-27 15:04:48 +13:00
prateek banga e3f60f4c78 fix tests 2023-11-23 23:14:02 +05:30
prateek banga 858175fe00 adds target object in subscriber model 2023-11-23 14:35:16 +05:30
Prateek Banga d9826cdce8 makes provider creation fields optional and adds target info in subscriber model 2023-11-23 00:39:55 +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