Prateek Banga
996de004fb
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-11 20:41:52 +05:30
Prateek Banga
ddbee0a55b
Merge branch 'feat-messages-event-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider
2023-09-11 20:41:12 +05:30
Prateek Banga
8957640d27
Merge branch 'feat-add-messaging-response-models' of https://github.com/appwrite/appwrite into feat-messages-event-config
2023-09-11 20:40:32 +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
a59cfb6461
review changes
2023-09-11 20:30:21 +05:30
Prateek Banga
32970ba8a0
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-11 19:54:24 +05:30
Prateek Banga
2ecf9ee98a
udpates send email endpoint according to collection changes
2023-09-11 19:53:48 +05:30
Prateek Banga
27741644e8
Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider
2023-09-11 19:52:48 +05:30
Prateek Banga
f4f1aa4b5b
review changes and adds missing subqueries
2023-09-11 19:27:45 +05:30
Prateek Banga
cf7b63fd2f
Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider
2023-09-09 01:19:42 +05:30
Prateek Banga
ee0f789e37
udpates deliveryError to be an array type
2023-09-09 01:18:26 +05:30
prateek banga
a81006e961
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-06 16:31:07 +05:30
prateek banga
15773a3561
sets the correct response for send email
2023-09-06 16:30:46 +05:30
prateek banga
06361828a9
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-06 15:41:19 +05:30
prateek banga
039e717d72
fixes in send email endpoint
2023-09-06 15:40:56 +05:30
prateek banga
3d286a2171
Merge branch 'feat-mailgun-provider' into feat-topics-controller
2023-09-05 23:10:59 +05:30
prateek banga
38d81c058b
lint fix
2023-09-05 23:10:33 +05:30
prateek banga
6aa443454b
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-05 22:58:43 +05:30
prateek banga
597fd965f7
Merge branch 'feat-add-messaging-response-models' of https://github.com/appwrite/appwrite into feat-messages-event-config
2023-09-05 22:57:48 +05:30
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
prateek banga
78a53aee37
adds messaging event and updates messaging worker
2023-09-05 22:40:48 +05:30
prateek banga
337839103f
Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider
2023-09-05 13:15:12 +05:30
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
82e165c4c3
Merge branch 'feat-mailgun-provider' into feat-topics-controller
2023-08-31 18:33:02 +05:30
prateek banga
1762c81b8d
Merge branch 'feat-messages-event-config' into feat-mailgun-provider
2023-08-31 18:32:26 +05:30
prateek banga
0534b11b32
Merge branch 'feat-add-messaging-response-models' into feat-messages-event-config
2023-08-31 18:26:32 +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
Jake Barnby
fdb7218978
Update firebase connect scope
2023-08-30 22:48:51 -04:00
Jake Barnby
781aa8025a
Fix style typo
2023-08-30 20:39:40 -04:00
Jake Barnby
922332042e
Fix template strings
2023-08-30 20:31:11 -04:00
Jake Barnby
7e2e7ce3cb
Fix swapped from/to name
2023-08-30 20:20:20 -04:00
Steven Nguyen
24efa0de82
Fix router error
...
It's possible for the route to be null (no match) which leads to an
error like:
```
appwrite | [Error] Timestamp: 2023-08-30T21:39:58+00:00
appwrite | [Error] Type: Error
appwrite | [Error] Message: Call to a member function label() on null
appwrite | [Error] File: /usr/src/code/app/controllers/general.php
appwrite | [Error] Line: 50
```
This adds a null check to prevent the error.
2023-08-30 16:07:11 -07:00
Christy Jacob
61e1c3014a
fix: incorrect key reference
2023-08-30 18:44:29 -04:00
Christy Jacob
5dbec3d406
chore: remove redundant attribute
2023-08-30 18:43:09 -04:00
Christy Jacob
997cb01142
chore: revert console
2023-08-30 18:42:31 -04:00
Christy Jacob
4e19c94d08
Merge branch '1.4.x' of github.com:appwrite/appwrite into fix-email-templates
2023-08-30 18:40:39 -04:00
Christy Jacob
21dc3b16b0
chore: update changelog
2023-08-30 18:36:40 -04:00
Christy Jacob
861921526e
fix: remove redundant name property
2023-08-30 18:34:20 -04:00
Jake Barnby
b2f9506130
Update app/controllers/mock.php
2023-08-30 17:57:38 -04:00
Jake Barnby
b77d83d246
Add back headers route
2023-08-30 17:55:27 -04:00
Christy Jacob
74012158b3
fix: variable names
2023-08-30 17:54:26 -04:00
Christy Jacob
05615d1449
fix: missing variable in email templates
2023-08-30 17:52:55 -04:00
Christy Jacob
75e957ed4a
fix: missing variable in email templates
2023-08-30 17:48:25 -04:00
Jake Barnby
f10698aebe
Merge pull request #6073 from appwrite/chore-update-version
...
Chore update version
2023-08-30 16:25:06 -04:00
Jake Barnby
513d913298
Merge remote-tracking branch 'origin/1.4.x' into chore-sync-master
...
# Conflicts:
# app/config/specs/open-api3-1.4.x-console.json
# app/config/specs/open-api3-latest-console.json
# app/config/specs/swagger2-1.4.x-console.json
# app/config/specs/swagger2-latest-console.json
2023-08-30 16:11:48 -04:00
Jake Barnby
e018c29b71
Bump .NET SDK version
2023-08-30 15:48:01 -04:00
Jake Barnby
afbc39b34b
Update version
2023-08-30 15:45:38 -04:00
Jake Barnby
a93123e3ac
Remove cloud specific config
2023-08-30 14:45:22 -04:00