1
0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-04 00:17:06 +00:00
Commit Graph

936 Commits

Author SHA1 Message Date
downtownallday
44eaef1155 Merge remote-tracking branch 'chadfurman/master' into quota
# Conflicts:
#	management/cli.py
#	management/daemon.py
#	management/mailconfig.py
#	management/templates/users.html
#	setup/bootstrap.sh
#	setup/mail-dovecot.sh
#	setup/mail-postfix.sh
#	setup/mail-users.sh
2024-10-02 21:50:47 -04:00
Chad Furman
a9d31f7925 removing 'quota' from user output 2024-10-02 12:26:22 -04:00
Chad Furman
0ff96f70d4 cli.py user now prints '0' rather than 'unlimited' for quota 2024-10-02 12:25:28 -04:00
Chad Furman
1bff0a458f cli script fixes were broken 2024-10-02 11:54:58 -04:00
Chad Furman
826ef372b8 Revert "fixing cli commands"
This reverts commit a4a08980f84360abcd009de9dc7ef8c6fcb529c4.
2024-10-02 11:54:55 -04:00
Chad Furman
12c95122b7 fixed missing column heading 2024-10-02 11:45:55 -04:00
Chad Furman
febb5c3234 removing box count / message count feature 2024-10-02 11:45:48 -04:00
Chad Furman
ceaf5338be removing the ability to configure the default quota -- default quota is always unlimited. 2024-10-02 11:45:48 -04:00
Chad Furman
c01a1d5493 fixing cli commands 2024-10-02 11:45:48 -04:00
Chad Furman
1cbf06c42a fixing subprocess import 2024-10-02 11:45:48 -04:00
Chad Furman
6f3bf9151b bringing in quota changes 2024-10-02 11:45:47 -04:00
downtownallday
daca497679 remove method argument use, it breaks other commands 2024-09-07 10:48:05 -04:00
downtownallday
77c6a53f81 fix syntax errors 2024-09-07 10:47:31 -04:00
downtownallday
a6f69f297b Merge remote-tracking branch 'chadfurman/master' into chads-quota
# Conflicts:
#	management/daemon.py
#	management/mailconfig.py
#	management/templates/users.html
#	setup/bootstrap.sh
#	setup/mail-postfix.sh
#	setup/mail-users.sh
#	setup/migrate.py
2024-09-06 12:03:08 -04:00
downtownallday
446f144821 Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
# Conflicts:
#	README.md
#	management/mailconfig.py
#	setup/mail-users.sh
2024-07-21 17:29:08 -04:00
Viktor Szépe
cd959bc522
Fix typos (#2406) 2024-07-21 07:01:25 -04:00
Chad Furman
4bb4d2a796 Merge branch 'v68a-testing' 2024-07-12 15:39:10 -04:00
Chad Furman
4b5f4b0b9e fixed missing column heading 2024-07-12 15:28:47 -04:00
Chad Furman
4cafe680a0 removing box count / message count feature 2024-07-12 14:03:04 -04:00
Chad Furman
c91db7bc4f removing box count / message count feature 2024-07-12 14:01:12 -04:00
Chad Furman
c1bf722f82 Merge branch 'v68a-testing' 2024-07-12 13:55:00 -04:00
Chad Furman
7c7b744605 removing the ability to configure the default quota -- default quota is always unlimited. 2024-07-12 13:54:49 -04:00
Chad Furman
bc4ff0f1e8 Merge branch 'v68a-testing' 2024-07-08 20:44:14 -04:00
Chad Furman
4e9c564c5d fixing cli commands 2024-07-08 20:37:42 -04:00
Chad Furman
3c6551b696 Merge remote-tracking branch 'upstrea/main' 2024-07-08 20:05:52 -04:00
downtownallday
771895a243 Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
# Conflicts:
#	management/mail_log.py
2024-06-18 12:20:35 -04:00
Matt
4dd1e75ee7
Allow for Union[None, List[datetime.datetime]] values when printing user table in weekly mail logs (#2378)
* Fix - Allow for `Union[None, List[datetime.datetime]]` when printing user
tables for the weekly mail logs.

* Add - ruff suppressions.
2024-06-18 08:35:54 -04:00
John James Jacoby
8b9f0489c8
Add custom.yaml support for WebSockets (#2385)
Fixes #1956.
2024-06-18 08:32:11 -04:00
Chad Furman
0408ec36b8
Merge branch 'main' into master 2024-05-04 23:02:44 -04:00
Chad Furman
39700387af fixing subprocess import 2024-05-04 14:27:11 -04:00
Chad Furman
1795f8aefd bringing in quota changes 2024-04-27 18:41:35 -04:00
Matt
53a6cc1501 Fix - Allow for Union[None, List[datetime.datetime]] when printing user
tables for the weekly mail logs.
2024-04-15 17:54:45 -04:00
downtownallday
11e69f53a0 Merge remote-tracking branch 'upstream/main' into merge-upstream
# Conflicts:
#	setup/firstuser.sh
#	setup/functions.sh
#	setup/mail-users.sh
#	setup/management.sh
#	setup/network-checks.sh
#	setup/nextcloud.sh
#	setup/questions.sh
#	setup/ssl.sh
#	setup/start.sh
#	setup/system.sh
#	setup/webmail.sh
#	tools/archive_conf_files.sh
#	tools/web_update
2024-04-03 12:45:10 -04:00
Teal Dulcet
bdf4155bed Fixed SC2046: Quote to prevent word splitting. 2024-04-03 09:21:34 -04:00
Teal Dulcet
133bae1300 Fixed SC2006: Use $(...) notation instead of legacy backticks .... 2024-04-03 05:17:25 -07:00
downtownallday
7e03b651d7 Merge remote-tracking branch 'upstream/main' into merge-upstream
# Conflicts:
#	management/status_checks.py
2024-03-23 17:48:50 -04:00
KiekerJan
1a239c55bb
More robust reading of sshd configuration (#2330)
Use sshd -T instead of directly reading the configuration files
2024-03-23 11:16:40 -04:00
downtownallday
4be2d1b844 Merge remote-tracking branch 'upstream/main' into merge-upstream
# Conflicts:
#	setup/webmail.sh
2024-03-23 10:32:25 -04:00
Gio
9b450469eb
Mail guide: OS X -> macOS (#2306) 2024-03-23 09:04:43 -04:00
downtownallday
88558f81e3 Return the result, not None to avoid crashing the management daemon 2024-03-12 10:22:49 -04:00
downtownallday
d349150dd0 Merge remote-tracking branch 'upstream/main' into merge-upstream
# Conflicts:
#	.gitignore
#	management/auth.py
#	management/daemon.py
#	management/mail_log.py
#	management/mailconfig.py
#	management/mfa.py
#	management/ssl_certificates.py
#	management/status_checks.py
#	management/utils.py
#	management/web_update.py
#	setup/mail-postfix.sh
#	setup/migrate.py
#	setup/preflight.sh
#	setup/webmail.sh
#	tests/test_mail.py
#	tools/editconf.py
2024-03-12 07:41:14 -04:00
KiekerJan
0b1d92388a
Take spamhaus return codes into account in status check and postfix config (#2332) 2024-03-10 08:09:36 -04:00
Teal Dulcet
618c466b84 Fixed SIM114 (if-with-same-arms): Combine if branches using logical or operator 2024-03-10 07:56:49 -04:00
Teal Dulcet
a32354fd91 Fixed PLR5501 (collapsible-else-if): Use elif instead of else then if, to reduce indentation 2024-03-10 07:56:49 -04:00
Teal Dulcet
1d79f9bb2b Fixed PERF401 (manual-list-comprehension): Use a list comprehension to create a transformed list 2024-03-10 07:56:49 -04:00
Teal Dulcet
cacf6d2006 Fixed E721 (type-comparison): Use is and is not for type comparisons, or isinstance() for isinstance checks 2024-03-10 07:56:49 -04:00
Teal Dulcet
f0377dd59e Fixed SIM105 (suppressible-exception) 2024-03-10 07:56:49 -04:00
Teal Dulcet
6a47133e3f Fixed F811 (redefined-while-unused): Redefinition of unused sys from line 10 2024-03-10 07:56:49 -04:00
Teal Dulcet
7f456d8e8b Fixed ISC002 (multi-line-implicit-string-concatenation): Implicitly concatenated string literals over multiple lines 2024-03-10 07:56:49 -04:00
Teal Dulcet
e466b9bb53 Fixed RUF005 (collection-literal-concatenation) 2024-03-10 07:56:49 -04:00