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

964 Commits

Author SHA1 Message Date
downtownallday
416257893f Merge remote-tracking branch 'upstream/main' into sync-upstream 2025-02-16 20:49:14 -05:00
downtownallday
43705acd08 Remove duplicate functions 2025-02-16 20:00:40 -05:00
downtownallday
40d0d06a35 Merge remote-tracking branch 'upstream/main' into quota
# Conflicts:
#	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
2025-02-16 19:36:12 -05:00
Victor
a81c18666f
Clear credentials and reset menu after receiving 403 (#2477) 2025-02-16 17:01:51 -05:00
Michael Meidlinger
01996141ad
Allow boto to get S3 credentials for backups from environment variables if access key is blank (#2260)
In case that no static AWS credentials are specified, we try to create the boto3 client without explicitly passing static credentials. This way, we can benedit from dynamic credentials in AWS environments (e.g. using EC2 instance roles)
2025-02-16 16:51:48 -05:00
downtownallday
271a04333d Merge branch 'master' into quota 2025-02-16 16:29:01 -05:00
Joshua Tauberer
c0103045be
Add configurable mailbox quotas (#2387) 2025-02-16 15:18:32 -05:00
downtownallday
dd2c8ff879 Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox 2025-01-04 15:06:39 -05:00
Joshua Tauberer
f73da3db60 Fix likely merge mistake in 564ed59bb4
Fixes #2466
2025-01-04 14:28:36 -05:00
Chad Furman
7f9a348d64 removing 'quota' from user output 2024-12-28 17:10:50 -05:00
Chad Furman
ac383ced4d cli.py user now prints '0' rather than 'unlimited' for quota 2024-12-28 17:10:50 -05:00
Chad Furman
450c1924d8 cli script fixes were broken 2024-12-28 17:10:50 -05:00
Chad Furman
c9d37be530 Revert "fixing cli commands"
This reverts commit a4a08980f84360abcd009de9dc7ef8c6fcb529c4.
2024-12-28 17:10:50 -05:00
Chad Furman
08e69ca459 fixed missing column heading 2024-12-28 17:10:50 -05:00
Chad Furman
bd5ba78a99 removing box count / message count feature 2024-12-28 17:10:50 -05:00
Chad Furman
654f5614af removing the ability to configure the default quota -- default quota is always unlimited. 2024-12-28 17:10:50 -05:00
Chad Furman
8bb68d60a5 fixing cli commands 2024-12-28 17:10:50 -05:00
Chad Furman
d8ab444d59 fixing subprocess import 2024-12-28 17:10:50 -05:00
Chad Furman
ce45217ab8 bringing in quota changes 2024-12-28 17:10:49 -05:00
downtownallday
0aa7050221 Merge remote-tracking branch 'upstream/main' into merge-upstream
# Conflicts:
#	management/status_checks.py
#	setup/webmail.sh
2024-12-22 10:22:53 -05:00
KiekerJan
2e0482e181
Exclude the owncloud-backup folder from the nightly backup (#2413) 2024-12-22 08:01:02 -05:00
Tomasz Stanczak
0d7388899c
Allow DSA end EllipticCurve private keys to be used additionally to RSA for HTTPS certificates (#2416)
Co-authored-by: Tomasz Stanczak <tomasz@cocoturtle.com>
2024-12-22 07:59:58 -05:00
zoof
4f094f7859
Change hour of daily tasks to run at 1am and only run full backups on weekends (#2424)
* Change hour of daily tasks to run at 1am
* Change to only do full backup on weekends
2024-12-22 07:57:59 -05:00
KiekerJan
564ed59bb4
Add check on ipv6 for spamhaus (#2428) 2024-12-22 07:48:36 -05:00
KiekerJan
9f87b36ba1
add check on SOA record to determine up to date synchronization of secondary nameserver (#2429) 2024-12-22 07:45:45 -05:00
downtownallday
f98d1811c9 Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox 2024-11-27 10:18:59 -05:00
Downtown Allday
a8d13b84b4
fix: NameError: name 'subprocess' is not defined (#2425) 2024-11-27 08:22:45 -05:00
downtownallday
196f5588cc eliminate the use of deprecated utcnow() 2024-10-07 09:51:56 -04:00
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