Matej Bačo
a2856f6acc
Update copy & AI translations
2024-01-11 10:23:25 +00:00
Matej Bačo
ed28bb9295
Merge remote-tracking branch 'origin/1.5.x' into feat-improve-logging
2024-01-11 10:22:50 +00:00
Matej Bačo
479c70d0aa
Fix after revert
2024-01-11 08:25:55 +00:00
Matej Bačo
e0db651240
Revert "Translated security phrase copy with AI"
...
This reverts commit b72dd35f45 .
2024-01-11 08:25:09 +00:00
Matej Bačo
04831a91c7
Update src/Appwrite/Platform/Tasks/DevGenerateTranslations.php
2024-01-11 09:20:00 +01:00
Jake Barnby
449e8cc06c
Fix function schedules
2024-01-11 19:32:24 +13:00
Jake Barnby
62304f817d
Fix maintenance worker
2024-01-11 16:15:11 +13:00
Jake Barnby
87a4d7db88
Update service refs
2024-01-11 16:08:40 +13:00
Jake Barnby
81f1eb3506
Abstract scheduling base
2024-01-11 16:06:59 +13:00
Jake Barnby
6904285560
Check provider enabled
2024-01-11 15:55:08 +13:00
Jake Barnby
513ed9de05
Merge remote-tracking branch 'origin/1.5.x' into scheduling-temp
...
# Conflicts:
# app/controllers/api/messaging.php
# tests/e2e/Services/Messaging/MessagingBase.php
2024-01-11 13:06:15 +13:00
Matej Bačo
2d204d593a
code formatting
2024-01-10 15:10:05 +00:00
Matej Bačo
bf14d1d97d
Add random security phrases
2024-01-10 15:09:39 +00:00
Matej Bačo
b72dd35f45
Translated security phrase copy with AI
2024-01-10 15:01:42 +00:00
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
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
德华 刘
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
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
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
loks0n
5c803f6eff
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr
2024-01-08 11:41:55 +00: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
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
Ben Humphries
fbd277f6aa
executor: pass build timeout to runtimes ( #7350 )
...
open-runtimes executor (v1/runtimes) supports passing a timeout parameter that defaults to 600 seconds.
->param('timeout', 600, new Integer(), 'Commands execution time in seconds.', true)
https://github.com/open-runtimes/executor/blob/main/app/http.php#L383
This change passes the _APP_FUNCTIONS_BUILD_TIMEOUT env var.
2024-01-04 11:46:08 +01:00
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
92c4c52a81
QA changes
2024-01-02 13:02:11 +00:00
Matej Bačo
0ba768125d
Merge remote-tracking branch 'origin/1.5.x' into feat-improve-logging
2024-01-02 11:08:47 +00:00
Matej Bačo
554e9f93b6
Implement max password length
2024-01-02 10:59:35 +00:00
shimon
f14250bf2a
sync with main
2024-01-02 12:24:57 +02:00
shimon
99f1543f1b
Merge branch 'main' of github.com:appwrite/appwrite into refactor-usage-sn
...
Conflicts:
.gitmodules
Dockerfile
app/console
app/init.php
composer.lock
src/Appwrite/Platform/Services/Workers.php
src/Appwrite/Platform/Tasks/Hamster.php
2024-01-02 11:49:23 +02: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
shimon
77d423e645
refactoring infinity metric calculation cli script, adding project id and after
...
options.
2023-12-26 18:23:07 +02:00
shimon
9382e4cec5
refactoring infinity metric calculation cli script, adding project id and after
...
options.
2023-12-26 18:21:01 +02:00
shimon
4a837907d1
usageHook tweaks
2023-12-25 11:32:40 +02:00
shimon
b398338876
small fix
2023-12-25 10:17:58 +02:00
shimon
ddb7a403db
refactor usage worker
2023-12-24 21:17:13 +02:00
shimon
80315a02dd
refactor usage worker
2023-12-24 21:00:53 +02:00
shimon
d1751565cf
refactor usage worker
2023-12-24 20:38:15 +02:00
shimon
f1e066d965
debuging usage
2023-12-24 17:06:12 +02:00
shimon
585b904b80
debuging usage
2023-12-24 16:50:20 +02:00
德华 刘
d3143b8ede
chore: update hamster script
2023-12-22 14:07:05 +00:00
德华 刘
394f28146a
chore: update hamster script
2023-12-22 14:03:46 +00:00
德华 刘
1857c0e04d
chore: update hamster script
2023-12-22 14:03:07 +00:00
德华 刘
1eb59daed1
chore: run linter
2023-12-22 09:23:56 +00:00
德华 刘
bf92ae6841
chore: update console
2023-12-22 09:19:27 +00:00
shimon
ba44e06af6
metrics adjustments
...
after and projectId additions
2023-12-21 15:04:29 +02:00
shimon
24d3aa499a
metrics adjustments
...
after and projectId additions
2023-12-21 14:32:10 +02:00
shimon
4e24e3cdc2
Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into refactor-hamster-usage
...
Conflicts:
src/Appwrite/Platform/Tasks/CalcTierStats.php
2023-12-21 14:25:06 +02:00
shimon
eff578bb36
metrics adjustments
...
after and projectId additions
2023-12-21 14:07:24 +02:00
shimon
9a2f97b613
metrics adjustments
...
after and projectId additions
2023-12-21 13:45:57 +02:00
Matej Bačo
ccfd856e8e
Merge branch 'refactor-usage-sn' of https://github.com/appwrite/appwrite into refactor-usage-sn
2023-12-20 12:31:56 +01:00
Matej Bačo
0529cffa4b
Improve logging
2023-12-20 12:31:35 +01:00
Damodar Lohani
bfbcecd069
fix deletes worker
2023-12-20 11:26:57 +00:00
Matej Bačo
05f8f8fb9d
Fix SMS issue
2023-12-20 12:13:22 +01: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
Damodar Lohani
caa5c4e744
making visibility private
2023-12-18 10:20:00 +00:00
Damodar Lohani
1f558442d9
linter fix
2023-12-18 10:18:40 +00:00
Damodar Lohani
5e59d73f78
rename stats collection
2023-12-18 10:11:10 +00:00
Prateek Banga
6de2659793
adds mock providers in project for benchmarking, fixes bug in scheduling
...
removes scheduling from array in schedulemessage task
2023-12-18 15:27:09 +05:30
shimon
9f1b356a79
combining network inbound
...
and network outbound on
hamster script
2023-12-18 11:37:54 +02:00
Steven Nguyen
e41194ee3c
Fix import to match class name
...
The class is SMS rather than Sms.
2023-12-16 17:42:29 +00:00
Matej Bačo
0aaab63b8c
Remove var dumps
2023-12-15 23:37:31 +01:00
Matej Bačo
8c1363529e
Add Hooks
2023-12-15 23:19:43 +01: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
Christy Jacob
b36c98af66
Merge pull request #7274 from appwrite/refactor-usage-execution-trigger
...
Refactor usage execution trigger
2023-12-14 06:16:01 +01:00
德华 刘
dc89501012
chore: linter
2023-12-14 04:51:36 +00:00
德华 刘
1307f73c31
chore: refactor code
2023-12-14 04:49:16 +00:00
Christy Jacob
39d91aecf1
Merge pull request #7273 from appwrite/damodar/pea-15-refactor-maintenance-deletes-worker
...
PEA-15 Refactor Deletes and maintenance worker
2023-12-14 05:08:11 +01: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
Matej Bačo
cc67bcba28
Add group for cloud limit check
2023-12-12 21:33:02 +01:00
shimon
41ae96ea77
change execution usage trigger
2023-12-12 21:55:01 +02:00
shimon
bdf9a64771
change execution usage trigger
2023-12-12 21:21:47 +02:00
Torsten Dittmann
cf87cfab3a
Merge branch 'refactor-usage-sn' of https://github.com/appwrite/appwrite into refactor-usage-sn
2023-12-12 18:48:26 +01:00
Torsten Dittmann
063db1e2bf
feat: add execution aggregation to project usage
2023-12-12 18:48:21 +01:00
loks0n
b2f118d23b
fix: specs
2023-12-12 15:42:22 +00:00
loks0n
fe0001350d
feat: use x-appwrite-session header
2023-12-12 15:39:24 +00:00
loks0n
2560681555
chore: fmt
2023-12-12 11:54:12 +00:00
loks0n
db324ba0aa
chore: fmt
2023-12-12 11:54:05 +00:00
Matej Bačo
fc504e3a68
Change collections priority for pricing override
2023-12-12 12:27:04 +01:00
Damodar Lohani
7891f9e74c
refactor deletes worker
2023-12-12 11:26:44 +00:00
Damodar Lohani
5512123e04
loop through projects
2023-12-12 11:26:28 +00:00
loks0n
fda9df069a
feat: enable array sdk.method
2023-12-12 11:24:50 +00:00
Damodar Lohani
9ac57e2e7a
remove unused retention
2023-12-12 08:11:01 +00:00
Damodar Lohani
104b8bb366
provide retention time as queue server resource
2023-12-12 08:07:24 +00:00
Steven Nguyen
6d357d617d
Add a flag to install and upgrade commands to not start Appwrite
...
This can be useful for cases where the developer only wants the files
to be generated and doesn't want to start Appwrite.
2023-12-11 23:37:32 +00:00
Torsten Dittmann
3d081e1aa5
fix: allow billingPlan query on teams
2023-12-11 19:48:52 +01:00
Khushboo Verma
ff7cfc6602
Merge branch '1.5.x' into fix-limit-failed-webhook-attempts
2023-12-12 00:17:21 +05:30
loks0n
f0d7312bd3
feat: create session method
2023-12-11 16:24:24 +00:00
Torsten Dittmann
ba75f69969
feat: usage breakdown by project
2023-12-11 16:19:08 +01:00
Torsten Dittmann
6925122791
Merge pull request #7266 from appwrite/feat-project-usage-custom-daterange
...
feat: project usage custom date range
2023-12-10 12:35:58 +01:00
Torsten Dittmann
95425832ae
fix: tests and response models
2023-12-10 11:03:01 +01:00
Damodar Lohani
ffdc662022
fix formatting
2023-12-09 06:41:24 +00:00
Damodar Lohani
e4467521f8
Merge branch 'refactor-usage-sn' into feat-mail-template-override-ur
2023-12-09 07:36:11 +01:00
Damodar Lohani
e3bab623f1
fix redis issue by encoding content
2023-12-08 21:34:39 +00:00
Damodar Lohani
f553576d0e
fix linter
2023-12-08 20:06:37 +00:00
Damodar Lohani
386cee5137
mail support string as attachment
2023-12-08 19:57:15 +00:00
Prateek Banga
b8aa2faa7b
adds scheduling commit, still need to resolve pools error
2023-12-07 11:25:19 +01:00
Damodar Lohani
5c9199f332
fix empty body template
2023-12-06 16:16:31 +01:00
Damodar Lohani
83d4de9f73
support maile template override
2023-12-06 14:52:13 +01:00
Prateek Banga
194bbbb350
review changes
2023-12-05 19:24:55 +01:00
Prateek Banga
e7dca6b2d5
adds uniform logic for worker and extra params for email
2023-12-05 15:01:32 +01:00
loks0n
0df3ff9e8b
Merge branches 'feat-ssr' and '1.4.x' of https://github.com/appwrite/appwrite into feat-ssr
2023-12-03 13:35:23 +00:00
prateek banga
6ead6f8094
misc changes
...
allow filtering by providerType, userId in subscribers. Adds cancelled status for message status. Validate targets when creating message. delete all targets when user is deleted. fix twilio bug. add db env vars in messaging worker compose.phtml
2023-12-01 03:39:43 +05:30
德华 刘
b6fabf80ef
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-refactor-hamster
2023-11-30 21:20:59 +00:00
德华 刘
49bb3444bf
chore: add logs
2023-11-30 21:11:31 +00:00
德华 刘
d4ff696173
chore: fix linter issues
2023-11-30 20:35:18 +00:00
德华 刘
0382b2250a
chore: address review comments
2023-11-30 19:22:35 +00:00