Commit Graph

8501 Commits

Author SHA1 Message Date
Matej Bačo 931efe24a9 Added security phrase to magic URL 2024-01-10 14:52:32 +00:00
Khushboo Verma f6830f4e85 Resolve merge conflict 2024-01-10 19:38:55 +05:30
Khushboo Verma 7393bfc244 Use phtml instead of translation files for webhook email 2024-01-10 19:35:25 +05:30
loks0n 94e45da5c7 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-10 10:15:29 +00:00
Khushboo Verma ef88ad6514 Updated the email 2024-01-10 15:03:36 +05:30
Khushboo Verma b74c7671e8 Resolve merge conflicts 2024-01-10 13:13:09 +05:30
Steven Nguyen c7a637e4c9 Allow filtering targets by provider type 2024-01-09 14:52:35 -08:00
Steven Nguyen e7d3797234 Remove the endpoint param for APNS providers
The endpoint was removed from utopia-php/messaging.
2024-01-09 21:30:56 +00:00
Khushboo Verma b3e87d7de8 Formatted email as per design 2024-01-10 01:55:36 +05:30
loks0n 9a34c92fac Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-09 16:42:00 +00:00
Matej Bačo bdfb930097 Linter fix 2024-01-09 16:22:10 +00:00
Torsten Dittmann bc384cac8d fix: response model 2024-01-09 16:47:43 +01:00
Matej Bačo beeb643c66 Add all translations 2024-01-09 15:39:38 +00:00
Torsten Dittmann cb25d5209e fix: di 2024-01-09 16:30:18 +01:00
Matej Bačo e59bdbbb8f Implement translation generator 2024-01-09 14:44:58 +00:00
Matej Bačo 301401914a Add generate translations command 2024-01-09 13:58:45 +00:00
shimon 4b23440c2d remove cloud related scripts 2024-01-09 15:44:56 +02:00
shimon 85950868f2 remove cloud related scripts 2024-01-09 15:30:43 +02:00
shimon eb70990bf0 remove cloud related scripts 2024-01-09 15:22:02 +02:00
德华 刘 65c90c9475 chore: update collection name in hamster 2024-01-09 12:41:58 +00:00
Matej Bačo 86158838a1 Magic URL improvements 2024-01-09 12:23:13 +00:00
shimon 880526d6d3 Merge branch 'main' of github.com:appwrite/appwrite into remove-cloud-scripts 2024-01-09 12:11:32 +02:00
shimon 1da476e5ac remove cloud related scripts 2024-01-09 11:13:58 +02:00
Jake Barnby af019369e9 Merge branch 'main' into 1.5.x 2024-01-09 22:03:35 +13:00
Jake Barnby baf807d389 Merge remote-tracking branch 'origin/1.5.x' into json-parsing
# Conflicts:
#	composer.lock
2024-01-09 14:08:39 +13:00
Jake Barnby 51b2019ab6 Merge remote-tracking branch 'origin/1.5.x' into json-parsing
# Conflicts:
#	composer.lock
2024-01-09 13:56:01 +13:00
Jake Barnby 745f49541e Merge branch '1.5.x' into messaging-uniform-logic 2024-01-09 13:53:19 +13:00
Jake Barnby e7c33dbf01 Merge branch '1.5.x' into fix-topics-query-total 2024-01-09 13:49:20 +13:00
Jake Barnby 219f091925 Merge branch '1.5.x' into messaging-uniform-logic 2024-01-09 12:40:07 +13:00
Eldad A. Fux ef72e08386 Merge pull request #7271 from appwrite/feat-7223-install-without-start
Add a flag to install and upgrade commands to not start Appwrite
2024-01-08 22:09:22 +01:00
Steven Nguyen 864703fb4e Update the install/upgrade arguments to be kebab instead of camel case
Kebab case like --http-port is much more common in CLIs than --httpPort.
2024-01-08 20:56:51 +00:00
Khushboo Verma 6b018d2f16 Add const for max file size 2024-01-09 01:41:48 +05:30
Khushboo Verma 5588dfca8b WIP: Send email to user when webhook is stopped 2024-01-09 01:25:24 +05:30
shimon 8163eefe4d Merge branch 'main' of github.com:appwrite/appwrite into refactor-usage-sn 2024-01-08 19:16:10 +02:00
Torsten Dittmann 9ba2eafa83 fix: escape html in email params (#7409)
* fix: escape html in email params

* revert: phpunit stop on failure

* chore: fix linter
2024-01-08 18:08:17 +01:00
Torsten Dittmann 7c66481406 fix: collections for mfa 2024-01-08 13:22:33 +01:00
Torsten Dittmann e4439b2ee2 chore: fix linter issues 2024-01-08 12:54:39 +01:00
loks0n 5c803f6eff Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-08 11:41:55 +00: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
shimon 03f2041913 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc 2024-01-07 18:09:48 +02:00
Matej Bačo 745f657c0d PR review changes 2024-01-06 19:25:41 +00:00
Khushboo Verma 842045874e Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-07 00:27:06 +05:30
Khushboo Verma 8138fb33e5 Better logging for errors 2024-01-07 00:22:28 +05:30
Bradley Schofield d9c04f4fc0 Update src/Appwrite/Platform/Tasks/Retry.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2024-01-05 12:37:03 +00:00
Khushboo Verma bbd551cf0d Reset attempts to 0 on successful request 2024-01-05 17:54:20 +05:30
Khushboo Verma 68ccaf17b1 Revert max failed attempts to 1- 2024-01-05 15:29:07 +05:30
Khushboo Verma 64d8b27536 Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-05 15:14:44 +05:30
Khushboo Verma 6d8443d5cd Addressed PR comments 2024-01-05 15:13:54 +05:30
Utkarsh Ahuja 2bc4795d8e Merge branch '1.5.x' into feat-zoho-oauth 2024-01-05 11:16:00 +05:30
Steven Nguyen 01df91aee9 Replace backticks with double quotes 2024-01-04 23:58:48 +00:00