Jake Barnby
942847cf3a
Merge remote-tracking branch 'origin/main' into 1.5.x
...
# Conflicts:
# app/config/collections.php
# app/config/errors.php
# 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/teams.php
# app/controllers/api/users.php
# app/controllers/shared/api.php
# app/init.php
# app/worker.php
# composer.json
# composer.lock
# docker-compose.yml
# src/Appwrite/Extend/Exception.php
# src/Appwrite/Platform/Services/Tasks.php
# src/Appwrite/Platform/Tasks/Maintenance.php
# src/Appwrite/Platform/Workers/Certificates.php
# src/Appwrite/Platform/Workers/Deletes.php
# src/Appwrite/Platform/Workers/Messaging.php
# src/Appwrite/Platform/Workers/Usage.php
# src/Appwrite/Platform/Workers/UsageHook.php
# src/Appwrite/Specification/Format/OpenAPI3.php
# src/Appwrite/Specification/Format/Swagger2.php
# tests/e2e/Services/Account/AccountConsoleClientTest.php
2024-02-22 01:29:28 +13:00
Jake Barnby
52d4b649e4
Add missing unique index
2024-02-21 13:09:14 +13:00
Jake Barnby
400b28de8a
Replace resourceCollection with switch
2024-02-21 03:25:01 +13:00
Jake Barnby
14a243cc37
Merge pull request #7457 from appwrite/1.5.x-response-request-models
...
Update Response and Request filters aswell as Migrations for 1.5.x
2024-02-16 20:58:08 +13:00
Jake Barnby
e462e916f0
Add email, sms and push totals to topic
2024-02-15 17:22:43 +13:00
Jake Barnby
1f470aecd2
Add subscribe permission to topics
2024-02-13 17:24:31 +13:00
shimon
e7ace61273
Sync against main
2024-02-12 11:10:52 +02:00
shimon
6b6f04d2d3
Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
...
Conflicts:
app/config/collections.php
app/controllers/shared/api.php
2024-02-12 10:55:53 +02:00
Bradley Schofield
559fa924c0
Merge branch '1.5.x' into 1.5.x-response-request-models
2024-02-06 17:10:43 +00:00
Jake Barnby
987b02083c
Array instead of JSON
2024-02-06 02:22:25 +13:00
Jake Barnby
0a72b37b3e
Fix session response model
2024-02-06 02:17:04 +13:00
shimon
af2b640948
updates
2024-02-04 10:33:04 +02:00
shimon
a63977455f
Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models
...
Conflicts:
.gitmodules
2024-02-04 09:27:08 +02:00
Jake Barnby
38f93a3e89
Add session ID + internal ID to targets
2024-02-03 03:06:23 +13:00
Torsten Dittmann
ceb868c9d7
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa
2024-02-01 11:57:32 +01:00
shimon
350d72eb1f
updates
2024-02-01 12:21:50 +02:00
Torsten Dittmann
3f688a2aa7
fix: remove some leftovers
2024-01-30 16:09:58 +01:00
Jake Barnby
61dd4a123c
Remove descriptions
2024-01-29 19:29:58 +13: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
9070dce6ac
Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x
2024-01-24 16:32:12 +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
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
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
32cc186ea6
Merge remote-tracking branch 'origin/1.5.x' into feat-session-renewal
2024-01-22 08:17:52 +00:00
shimon
370704fafd
moved cache collection to $commonCollections collection config
2024-01-21 10:47:00 +02:00
Khushboo Verma
a134ca7efd
Merge branch '1.5.x' into fix-limit-failed-webhook-attempts
2024-01-19 17:12:14 +05:30
Jake Barnby
4c10e78e42
Merge remote-tracking branch 'origin/1.5.x' into feat-maintenance-delete-expired-targets
...
# Conflicts:
# app/init.php
2024-01-19 16:56:51 +13:00
Jake Barnby
59c4f5b9e4
Merge pull request #7431 from appwrite/feat-message-scheduling
...
Feat message scheduling
2024-01-19 16:55:49 +13:00
shimon
554bc89cb5
sync config::collections against main
2024-01-18 14:14:24 +02:00
shimon
b08e3d4e7b
sync config::collections against main
2024-01-18 14:12:00 +02:00
shimon
90cf28389c
sync config::collections against main
2024-01-18 14:10:57 +02:00
Matej Bačo
4f5755e7d0
Implement session renewal
2024-01-15 13:43:21 +00:00
Jake Barnby
772617f231
Mark invalid targets on message send then delete on maintenance sweep
2024-01-15 19:52:40 +13:00
Jake Barnby
e21e2c70ea
Remove redundant index
2024-01-15 18:18:09 +13:00
Jake Barnby
a40c6fce64
Add resource collection to schedules
2024-01-11 16:00:48 +13:00
Jake Barnby
513ed9de05
Merge remote-tracking branch 'origin/1.5.x' into scheduling-temp
...
# Conflicts:
# app/controllers/api/messaging.php
# tests/e2e/Services/Messaging/MessagingBase.php
2024-01-11 13:06:15 +13:00
Torsten Dittmann
5a97c9104c
fix: collections merge conflict
2024-01-09 16:36:49 +01:00
Torsten Dittmann
7c66481406
fix: collections for mfa
2024-01-08 13:22:33 +01:00
Torsten Dittmann
bbf6480c15
fix: merge conflicts
2024-01-08 12:31:46 +01:00
Torsten Dittmann
208abe17e7
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa
2024-01-08 12:20:08 +01:00
Steven Nguyen
50aab32f0f
Add search param for list subscribers endpoint
2024-01-02 23:39:46 +00:00
Matej Bačo
b3729507de
Add cache to console collection
2023-12-19 18:05:39 +01:00
Damodar Lohani
5e59d73f78
rename stats collection
2023-12-18 10:11:10 +00: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
b8aa2faa7b
adds scheduling commit, still need to resolve pools error
2023-12-07 11:25:19 +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
shimon
9960912bb1
sync against main
2023-11-26 18:52:02 +02:00
