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
shimon
1869852985
Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
...
Conflicts:
app/controllers/shared/api.php
composer.lock
src/Appwrite/Platform/Workers/Deletes.php
2023-11-26 16:29:18 +02:00
prateek banga
858175fe00
adds target object in subscriber model
2023-11-23 14:35:16 +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
prateek banga
5c1cf3a526
adds user name in subscriber response model
2023-11-20 12:34:50 +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
prateek banga
7536d8eb0f
review changes
2023-11-16 17:09:08 +05:30
prateek banga
a282ab38a6
adds target endpoint in account controller for push tokensl
2023-11-16 02:12:06 +05:30
prateek banga
c24664f5d9
removes internal provider
2023-11-16 01:30:47 +05:30
prateek banga
fdca55b0de
fix test cases
2023-11-15 01:24:55 +05:30
prateek banga
adc76c5797
adds target when account is created or email or phone is updated
2023-11-14 22:46:20 +05:30
prateek banga
7ae614fe13
adds provider type in target
2023-11-14 18:14:07 +05:30
Khushboo Verma
3f584b85be
Limit webhook failure attempts to 10
2023-11-14 14:20:26 +05:30
prateek banga
f84a00dded
adds search attribute filter
2023-11-14 14:07:52 +05:30
prateek banga
a01d361886
review changes
2023-10-31 01:12:31 +05:30
prateek banga
06daa544e8
review changes
2023-10-30 23:37:57 +05:30
Prateek Banga
5a9b1f0c24
removes provider from topics
2023-10-26 19:44:06 +05:30
Prateek Banga
34b3ed68ee
adds total count for subscribers in topics model
2023-10-26 12:37:39 +05:30
prateek banga
fd4a81c4fc
made review changes
2023-10-25 23:03:23 +05:30
shimon
9fad9dca88
usage sync
2023-10-25 10:39:59 +03:00
Prateek Banga
a92390dda2
review changes
2023-10-06 19:23:46 +05:30
Prateek Banga
48b91e39a8
review changes
2023-10-04 16:15:59 +05:30
Prateek Banga
234f7f003b
updated test cases for msg91 provider, moves worker to use provider from settings
2023-09-27 18:58:00 +05:30
Prateek Banga
a0858ccc4e
adds message description, options to mailgun provider
2023-09-26 13:12:44 +05:30
Prateek Banga
f9030132a5
messaging worker logic to send message to providers batch limit
2023-09-20 17:38:29 +05:30
Prateek Banga
350549db7d
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-add-messaging-response-models
2023-09-14 02:17:34 +05:30
Prateek Banga
dbd227ed50
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x
2023-09-14 02:13:27 +05:30
prateek banga
9b6fc440d9
Review changes and adds enabled in providers collection
2023-09-13 16:57:59 +05:30
Jake Barnby
1f9872b398
Merge remote-tracking branch 'origin/1.5.x' into feat-add-messaging-response-models
2023-09-12 15:40:25 -04:00
Prateek Banga
d14fbde9e7
removes provider sub query
2023-09-13 00:40:51 +05:30
Prateek Banga
9fbad72b08
Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-add-messaging-response-models
2023-09-12 22:03:34 +05:30
Prateek Banga
5136724a29
fix default,type index
2023-09-12 22:02:19 +05:30
Prateek Banga
d14a4c2506
Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-add-messaging-response-models
2023-09-12 21:23:18 +05:30
Prateek Banga
2f2875e3c0
lint fix
2023-09-12 21:19:21 +05:30
Prateek Banga
b7119a2718
review changes
2023-09-12 21:03:44 +05:30
Prateek Banga
cbea4264ea
merge master
2023-09-12 20:53:16 +05:30
Prateek Banga
899c962061
Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-add-messaging-response-models
2023-09-11 20:30:30 +05:30
Prateek Banga
f4f1aa4b5b
review changes and adds missing subqueries
2023-09-11 19:27:45 +05:30
Prateek Banga
ee0f789e37
udpates deliveryError to be an array type
2023-09-09 01:18:26 +05:30
shimon
45f16e560c
sync against master
2023-09-05 21:17:54 +03:00
prateek banga
45ab78caa7
Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-add-messaging-providers
2023-09-05 22:56:37 +05:30
shimon
ec93239630
Merge branch 'master' of github.com:appwrite/appwrite into refactor-cache-poc
...
Conflicts:
app/config/collections.php
app/controllers/api/storage.php
app/controllers/shared/api.php
app/init.php
app/workers/deletes.php
2023-09-05 19:19:59 +03:00
Matej Bačo
1a6530fb57
Fix project variables
2023-09-05 10:21:36 +02:00
prateek banga
3f95d6abd5
Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-add-messaging-collections-in-config
2023-09-05 01:34:02 +05:30
prateek banga
ea324262e7
updated messaging collectin
2023-09-05 01:33:50 +05:30
prateek banga
e104e6d0f2
Merge branch 'feat-add-messaging-collections-in-config' into feat-add-messaging-providers
2023-08-31 18:16:48 +05:30
prateek banga
7fd124705c
merge master
2023-08-31 18:11:56 +05:30
shimon
e86286e7e3
Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-usage-rollback
...
Conflicts:
composer.lock
2023-08-20 18:07:57 +03:00
shimon
8147f3ee7d
rolling back usage flow
2023-08-20 15:29:43 +03:00
Matej Bačo
efe3793679
PR review changes, fix node test
2023-08-19 20:26:47 +02:00
prateek banga
40f419663c
removes id attribute from collections config
2023-08-16 20:28:40 +05:30
prateek banga
9fc75e5535
moves messaging collection to common, adds subqueryTargets
2023-08-16 18:48:38 +05:30
prateek banga
37e5cecfb1
resolve merge conflicts
2023-08-16 18:35:15 +05:30
prateek banga
92e587769a
resolve merge conflicts
2023-08-16 15:16:45 +05:30
Matej Bačo
899bc38069
Merge branch 'cl-1.4.x' into feat-git-integration
2023-08-10 01:12:09 +02:00
Matej Bačo
75e66e675b
Move oauth secret to identity
2023-08-10 01:02:13 +02:00
Bradley Schofield
d001f14249
Add Service Account Role Assignment
2023-08-09 23:46:23 +01:00
Khushboo Verma
ced6eed6fa
Add urls in deployment details
2023-08-09 23:05:23 +05:30
Bradley Schofield
fead8eb47a
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-implement-migrations
2023-08-09 18:08:40 +01:00
Steven Nguyen
c7c546bfe7
Add a secrets attribute to the identities collection
...
These secrets can be used to store data from the provider that may or
may not be sensitive.
For example, this will be used by the migration API when connecting to
Firebase to store the service account used for the migration.
This data will only be used internally inside Appwrite and not exposed
to an end user or developer.
2023-08-09 09:01:51 -07:00
Bradley Schofield
1135060681
Start work on identities implementation
2023-08-09 16:18:17 +01:00
Steven Nguyen
14b84ed9e6
Add a secrets attribute to the identities collection
...
These secrets can be used to store data from the provider that may or
may not be sensitive.
For example, this will be used by the migration API when connecting to
Firebase to store the service account used for the migration.
This data will only be used internally inside Appwrite and not exposed
to an end user or developer.
2023-08-09 08:15:44 -07:00
Khushboo Verma
e267349a88
Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration
2023-08-09 16:33:49 +05:30
Khushboo Verma
056b7120a6
Add additional information to deployments
2023-08-09 16:24:46 +05:30
Matej Bačo
a60b54f434
Use identities table
2023-08-09 11:52:34 +02:00
Bradley Schofield
47ebf77ff0
Continue work on OAuth Firebase last stage
2023-08-08 20:28:38 +01:00
Steven Nguyen
f3fa7922d4
Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x
2023-08-08 08:34:01 -07:00
Bradley Schofield
f0477a7f2b
Move collections and update redirect sig
2023-08-08 14:36:44 +01:00
Bradley Schofield
f4cbcb1383
Re-Add collections
2023-08-08 13:45:33 +01:00
Steven Nguyen
073b9963d2
Merge branch 'feat-git-integration' into feat-user-identities-git-integration
2023-08-07 14:46:00 -07:00
Bradley Schofield
91c82f0d7d
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-implement-migrations
2023-08-07 16:09:28 +01:00
prateek banga
9057a50a10
rename provider param in config
2023-08-07 15:54:00 +05:30
Matej Bačo
345df3f2ca
More QA fixes
2023-08-06 12:30:38 +02:00
Matej Bačo
e60456cfda
QA after merge with 1.4
2023-08-06 10:51:53 +02:00
Matej Bačo
906f86fbb8
Merge branch 'cloud-1.4.x' into feat-git-integration
2023-08-06 09:31:32 +02:00
Matej Bačo
8a9f3f1b54
Update build to use 1 logs attribute
2023-08-05 16:50:28 +02:00
Steven Nguyen
d960f85da6
Merge branch '1.4.x' into cloud-1.4.x
2023-08-04 18:07:33 -07:00
Steven Nguyen
cb7abdb906
Remove identity status
...
Until we have a clearer picture of why we need it, it would be best to
remove it since it's easier to add it later than to remove it after it's
released.
2023-08-04 15:07:36 -07:00
Steven Nguyen
27e212553d
Separate OAuth2 info from Sessions into Identities
...
This allows us to retain the OAuth2 info even if the session is
deleted. This also provides a foundation for allowing multiple emails,
phone numbers, etc, not from an OAuth2 provider.
2023-08-04 15:07:36 -07:00
Steven Nguyen
aa3c2faed9
Merge tag '1.3.8' into cloud-1.3.x-2
2023-08-04 13:55:07 -07:00
Bradley Schofield
8f5d79e668
Move to new branch
2023-08-04 17:21:41 +01:00
Steven Nguyen
b8e22151f6
Remove identity status
...
Until we have a clearer picture of why we need it, it would be best to
remove it since it's easier to add it later than to remove it after it's
released.
2023-08-02 15:37:22 -07:00
Steven Nguyen
a235024268
Separate OAuth2 info from Sessions into Identities
...
This allows us to retain the OAuth2 info even if the session is
deleted. This also provides a foundation for allowing multiple emails,
phone numbers, etc, not from an OAuth2 provider.
2023-08-02 15:36:06 -07:00
prateek banga
2d33681a0b
add collections to config file
2023-08-02 20:28:30 +05:30