Commit graph

3508 commits

Author SHA1 Message Date
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
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
Khushboo Verma
b3e87d7de8 Formatted email as per design 2024-01-10 01:55:36 +05:30
Matej Bačo
bdfb930097 Linter fix 2024-01-09 16:22:10 +00:00
Matej Bačo
beeb643c66 Add all translations 2024-01-09 15:39:38 +00: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
Matej Bačo
86158838a1 Magic URL improvements 2024-01-09 12:23:13 +00:00
Jake Barnby
af019369e9
Merge branch 'main' into 1.5.x 2024-01-09 22:03:35 +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
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
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
Steven Nguyen
10dfadbbc7 Create an enum for Message status 2024-01-04 18:58:01 +01:00
Khushboo Verma
fb9e393c97 Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-04 16:42:47 +05:30
Steven Nguyen
4cfd977bd7
Add support for querying topic total 2024-01-04 00:59:44 +00:00
Utkarsh Ahuja
a74e5cc2c6
Merge branch '1.5.x' into feat-zoho-oauth 2024-01-03 11:24:24 +05:30
Damodar Lohani
640ab7bf87 Merge branch 'main' into to-sync-with-main 2024-01-03 00:11:42 +00:00
Khushboo Verma
cfca9f232c Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-02 21:57:58 +05:30
Matej Bačo
554e9f93b6 Implement max password length 2024-01-02 10:59:35 +00:00
Utkarsh Ahuja
c4ab4ca16a
fix: lint errors 2024-01-02 13:15:07 +05:30
Utkarsh Ahuja
70916ad1aa fix: removed authEndpoint 2024-01-02 10:13:46 +05:30
Utkarsh Ahuja
ef2a943f49
Merge branch 'main' into feat-zoho-oauth 2023-12-31 19:27:57 +05:30
Utkarsh Ahuja
acebe54e5e fix: email verified false on null 2023-12-31 19:27:12 +05:30
Damodar Lohani
a2ad870084 use compression constant from utopia/storage 2023-12-31 11:46:45 +00:00
Utkarsh Ahuja
09cec17285 added Zoho OAuth class 2023-12-29 17:43:07 +00:00
prateek banga
5d7eca7c99 lint fix and tests fix 2023-12-19 23:45:20 +05:30
Prateek Banga
1957bc57c2 makes messaging worker compatible with new messaging lib version 2023-12-19 18:28:25 +05:30
Steven Nguyen
e41194ee3c
Fix import to match class name
The class is SMS rather than Sms.
2023-12-16 17:42:29 +00:00
Khushboo Verma
557565b949 Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2023-12-15 01:46:47 +05:30
Khushboo Verma
d5cc9d9eea Addressed PR Comments 2023-12-15 01:45:17 +05:30
Jake Barnby
7b99fab512
Use targets for cc/bcc 2023-12-15 03:19:24 +13:00
Jake Barnby
2eace5a627
Merge remote-tracking branch 'origin/1.5.x' into messaging-uniform-logic
# Conflicts:
#	app/controllers/api/messaging.php
#	composer.lock
2023-12-15 02:47:59 +13:00
Jake Barnby
5135262b79
Merge remote-tracking branch 'origin/1.4.x' into 1.5.x
# Conflicts:
#	app/config/errors.php
#	composer.lock
2023-12-15 02:41:46 +13:00
Khushboo Verma
fb0cd95b0a Class constant should be uppercase 2023-12-13 03:02:21 +05:30
Khushboo Verma
16addeba10 Fixed some errors 2023-12-13 03:00:16 +05:30