shimon
dcf0107a79
sync with master
2023-09-27 20:10:21 +03:00
shimon
c4bd6e008e
Merge branch 'master' of github.com:appwrite/appwrite into refactor-workers
...
Conflicts:
.env
app/cli.php
app/config/collections.php
app/console
app/controllers/api/account.php
app/controllers/api/databases.php
app/controllers/api/functions.php
app/controllers/api/projects.php
app/controllers/api/storage.php
app/controllers/api/teams.php
app/controllers/api/users.php
app/controllers/general.php
app/controllers/shared/api.php
app/init.php
app/worker.php
app/workers/audits.php
app/workers/builds.php
app/workers/certificates.php
app/workers/databases.php
app/workers/deletes.php
app/workers/functions.php
app/workers/mails.php
bin/worker-usage
composer.json
composer.lock
docker-compose.yml
src/Appwrite/Event/Delete.php
src/Appwrite/Event/Mail.php
src/Appwrite/Platform/Tasks/Maintenance.php
2023-09-27 18:51:17 +03:00
Vincent (Wen Yu) Ge
86f0e6008c
Merge branch 'master' into sentence-case
2023-09-27 11:11:58 -04:00
Prateek Banga
90352c57ac
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-27 18:58:18 +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
63bd4d6daf
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-27 16:57:07 +05:30
Prateek Banga
a0858ccc4e
adds message description, options to mailgun provider
2023-09-26 13:12:44 +05:30
Steven Nguyen
4a0c77a8df
Update avatar font and default colors
2023-09-25 15:55:15 -07:00
Christy Jacob
2273cb50b4
Merge branch '1.4.x' of github.com:appwrite/appwrite into cl-1.4.x
2023-09-26 00:02:19 +04:00
Matej Bačo
c35f05f495
Increase max body size
2023-09-25 11:12:41 +02:00
Matej Bačo
725897c896
Rename audits back to logs
2023-09-24 14:36:20 +02:00
Matej Bačo
24204bce54
Add all worker health endpoints
2023-09-24 14:07:37 +02:00
Yatharth Verma
6b47999120
fix conflicts
2023-09-22 22:56:07 +05:30
Yatharth Verma
f07f246f8d
fix conflicts
2023-09-22 22:53:41 +05:30
Christy Jacob
9dde039adf
Merge pull request #6290 from appwrite/fix-deployment-delete
...
Fix deployment delete
2023-09-22 11:37:50 -04:00
Prateek Banga
e00b273577
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-21 22:19:30 +05:30
Prateek Banga
e2acb608fa
fix tests with real sms providers
2023-09-21 22:16:02 +05:30
Prateek Banga
d63eaf3ef0
fixes get message endpoint
2023-09-21 21:49:40 +05:30
Prateek Banga
06a05a3358
adds param messageId in send an email endpoint, tokenId as messageId in create phone session, membershipId as messageId in create team membership
2023-09-21 21:17:15 +05:30
Prateek Banga
3ebcfe548d
Adds get message endpoint
2023-09-21 16:26:53 +05:30
Prateek Banga
342f122365
adds key auth to providers endpoint
2023-09-21 16:18:20 +05:30
Prateek Banga
b4de44c905
fix small bug in worker and send email endpoint
2023-09-21 16:12:56 +05:30
Christy Jacob
c7e6efc050
chore: update backups schedule
2023-09-21 10:23:55 +00:00
Steven Nguyen
9ca82b7662
Fix missing resourceInternalId on deployments
2023-09-20 19:26:23 -07:00
Prateek Banga
39854239fb
skip authorization in adding subscriber on targets
2023-09-21 02:29:57 +05:30
Prateek Banga
0510de5eab
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-20 23:37:35 +05:30
Prateek Banga
35d842171c
review changes
2023-09-20 23:37:10 +05:30
Prateek Banga
87011af914
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-20 23:00:48 +05:30
Prateek Banga
975b444761
fix test cases and bug fix in messaging worker
2023-09-20 20:51:03 +05:30
Prateek Banga
8d9e0ae7d0
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-20 17:53:08 +05:30
Prateek Banga
3456ad4e8c
fixes merge conflict issue
2023-09-20 17:52:25 +05:30
Prateek Banga
afef225339
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-20 17:39:36 +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
a2e34b5b64
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider
2023-09-20 16:59:07 +05:30
Prateek Banga
67397cd763
fix tests and code changes
2023-09-20 15:55:22 +05:30
Prateek Banga
bd36a09473
adds search in messaging controllers, updated mailgun endpoint with isEu param
2023-09-19 15:36:40 +05:30
Matej Bačo
007d6953bf
PR review changes
2023-09-19 09:21:11 +02:00
Jake Barnby
9ba609c46e
Merge pull request #6238 from appwrite/1.4.x
...
1.4.x
2023-09-15 18:49:55 -04:00
Christy Jacob
2ea8dbff29
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-bun-support
2023-09-14 15:21:31 +00:00
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
15dd6863dd
removes comments
2023-09-14 01:07:30 +05:30
Prateek Banga
f8c9c2f39b
fixes manual internal id insertion
2023-09-14 00:48:50 +05:30
Matej Bačo
0690b00c30
Add Bun auto detection
2023-09-13 21:08:49 +02:00
prateek banga
4bb611efc4
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-13 17:48:18 +05:30
prateek banga
0066216bef
adds enabled param for provider endpoints and review changes
2023-09-13 17:47:38 +05:30
Prateek Banga
fbd4712a72
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-13 00:54:02 +05:30
Prateek Banga
d742b0c0a9
removes provider type from create user target
2023-09-13 00:53:25 +05:30
Steven Nguyen
6b0c24a9d6
Update user creation from teams and users services to not set accessedAt
...
accessedAt should only be updated when a user performs some sort of
action. Creating a user via the users API or by adding them to a team
is an action done by someone else, not the user themselves. As such,
the accessedAt timestamp shouldn't update.
2023-09-12 12:05:11 -07:00
Prateek Banga
420eb8857a
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-09-13 00:07:32 +05:30
Prateek Banga
6affa6b5a0
Merge branch 'feat-messages-event-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider
2023-09-13 00:07:09 +05:30