prateek banga
38d81c058b
lint fix
2023-09-05 23:10:33 +05:30
prateek banga
00498f0ae2
Merge branch 'feat-messages-event-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider
2023-09-05 22:58:14 +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
4d31cd44d5
Merge branch 'feat-add-messaging-providers' of https://github.com/appwrite/appwrite into feat-add-messaging-response-models
2023-09-05 22:57:04 +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
01d5984965
Merge branch 'feat-add-messaging-response-models' of https://github.com/appwrite/appwrite into feat-mailgun-provider
2023-09-05 13:34:10 +05:30
prateek banga
1a791f46e6
adds default in provider response model
2023-09-05 13:33:22 +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
f4eac9f41d
Merge branch 'feat-add-messaging-collections-in-config' into feat-mailgun-provider
2023-09-05 13:14:13 +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
0b7d290419
Merge branch '1.5.x' into feat-mailgun-provider
2023-08-31 19:54:22 +05:30
prateek banga
c263a7b130
Merge branch '1.5.x' into feat-messages-event-config
2023-08-31 19:53:35 +05:30
prateek banga
180493d642
Merge branch '1.5.x' into feat-add-messaging-response-models
2023-08-31 19:53:15 +05:30
prateek banga
0ed2729b86
Merge branch '1.5.x' into feat-add-messaging-providers
2023-08-31 19:50:58 +05:30
prateek banga
0c76cfcb00
Merge branch '1.5.x' into feat-add-messaging-collections-in-config
2023-08-31 19:50:20 +05:30
Eldad A. Fux
0a289bce43
Merge pull request #6092 from appwrite/sync-master-into-1.5.x
...
Sync master into 1.5.x
2023-08-31 16:31:49 +03:00
prateek banga
2e89837c13
Merge branch 'master' into sync-master-into-1.5.x
2023-08-31 18:41:32 +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
32b48a3c7c
removes user id from subscriber model
2023-08-31 18:22:36 +05:30
prateek banga
8d14dcb839
Merge branch 'feat-add-messaging-providers' into feat-add-messaging-response-models
2023-08-31 18:18:59 +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
aced75fd05
Merge pull request #6072 from appwrite/1.4.x
...
1.4 Fixes
2023-08-31 00:31:59 -04:00
Jake Barnby
458dd8c97d
Merge pull request #6084 from appwrite/chore-update-migrations
...
Chore update migrations
2023-08-31 00:21:57 -04:00
Jake Barnby
ebf942339a
Update migrations version
2023-08-31 00:14:34 -04:00
Christy Jacob
60df7af3f7
Merge pull request #6083 from appwrite/refactor-migration-connect-scope
...
Update firebase connect scope
2023-08-31 06:50:58 +04:00
Jake Barnby
fdb7218978
Update firebase connect scope
2023-08-30 22:48:51 -04:00
Jake Barnby
2fb7a1c862
Merge pull request #6081 from appwrite/fix-sender-name
...
Fix swapped from/to name
2023-08-30 20:55:59 -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
Jake Barnby
02c16040ff
Merge pull request #6079 from appwrite/fix-500-options-requests
...
Fix router error
2023-08-30 19:28:45 -04:00
Steven Nguyen
ac0b697d52
Add router fix to CHANGES.md
2023-08-30 16:08:17 -07: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
Jake Barnby
589e4f5c7d
Merge pull request #6077 from appwrite/fix-email-templates
...
fix: missing variable in email templates
2023-08-30 18:47:02 -04: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
fec3fc3597
Merge pull request #6078 from appwrite/fix-mock-headers
...
Fix mock headers
2023-08-30 18:05:09 -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
