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

1157 Commits

Author SHA1 Message Date
downtownallday
939d6f04c3 Allow Trash to exceed quota by 100M "mostly to allow the clients’ move-to-Trash feature work while user is deleting messages to get under quota" 2024-09-11 15:58:34 -04:00
downtownallday
97080b1c2a run python unbuffered so output always appears in the correct order even when running shell scripts 2024-09-07 15:28:26 -04:00
downtownallday
8aa76dc5de don't include Drafts and Sent folders in quota 2024-09-07 10:49:24 -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
158c7f8921 Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox 2024-09-03 10:50:43 -04:00
Downtown Allday
ca123515aa
fix variable (#2439) 2024-09-02 21:30:01 -04:00
downtownallday
87174e5505 Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox 2024-08-31 06:17:43 -04:00
matidau
3b8f4a2fe8
Z-Push remove config lines no longer supported (#2433) 2024-08-30 14:27:44 -04:00
darren
f453c44d52
Update setup to handle multiple SSH ports (#2437)
This PR addresses an issue reported in the mailinabox
Slack channel where a system had sshd configured to listen
on two ports.

Co-authored-by: Darren Sanders <darren@dms00.com>
2024-08-30 14:26:05 -04:00
downtownallday
c85797f576 Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
# Conflicts:
#	setup/webmail.sh
2024-08-15 21:10:20 -04:00
Joshua Tauberer
41870d22b0 v70 2024-08-15 08:53:27 -04:00
matidau
b9c5cd248f
Update Roundcube to 1.6.8 (#2422) 2024-08-15 08:49:52 -04:00
downtownallday
f0168e2417 Merge remote-tracking branch 'matidau/roundcube168'
# Conflicts:
#	setup/webmail.sh
2024-08-13 09:01:41 -04:00
matidau
9064b34b86 Update Roundcube to 1.6.8 2024-08-08 09:41:26 +10:00
downtownallday
6c30cfba8b Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox 2024-07-23 07:20:16 -04:00
Joshua Tauberer
162e509b8b v69b 2024-07-23 06:20:34 -04:00
Joshua Tauberer
60a2b58e57 Revert "Fixed SC2091: Remove surrounding $() to avoid executing output." and fix it another way
This reverts commit 67bcaea71e. The sub-shell was required to prevent the updated umask from affecting later steps. It broke the permissions of the fetched assets for the control panel: https://discourse.mailinabox.email/t/admin-panel-broken-after-restore-upgrade/12112/24

Instead, the `$()` is replaced with just `()` to create a subshell without executing its output.
2024-07-23 06:16:24 -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
Joshua Tauberer
2ae8cd5713 v69a 2024-07-21 08:02:38 -04:00
Teal Dulcet
bc14e80b12
Fix no password prompt. Fixes #2408 (#2409) 2024-07-21 08:00:20 -04:00
Viktor Szépe
cd959bc522
Fix typos (#2406) 2024-07-21 07:01:25 -04:00
Joshua Tauberer
1b3e5e818c v69 2024-07-20 07:33:07 -04:00
Joshua Tauberer
2f5e736fa0 Clean up Nextcloud email settings for calendar invitations
I don't think anything is actually changed here but I think my box was missing some of these settings.
2024-07-20 07:27:46 -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
downtownallday
20f9cd0f8c Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox 2024-07-10 20:01:50 -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
1c66f69fd9 using migrations for alter table command 2024-07-08 20:25:46 -04:00
Chad Furman
8a1e803f48 removing duplicate conf 2024-07-08 20:14:47 -04:00
Chad Furman
3c6551b696 Merge remote-tracking branch 'upstrea/main' 2024-07-08 20:05:52 -04:00
Michael Heuberger
f118a6c0bf
Apply small Nextcloud upgrade to 26.0.13 (#2401) 2024-07-08 08:21:12 -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
jvolkenant
de0fc796d4
Fix chown during Nexcloud upgrades (#2377) 2024-06-18 08:37:01 -04:00
matidau
6321ce6ef0
Add php8.0-intl package to z-push setup (#2389) 2024-06-18 08:29:51 -04:00
matidau
30d78cd35a
Update zpush.sh to version 2.7.3 (#2390) 2024-06-18 08:29:22 -04:00
Chad Furman
0408ec36b8
Merge branch 'main' into master 2024-05-04 23:02:44 -04:00
Chad Furman
0cd8e4db62 fixing imap sed script 2024-05-04 22:22:47 -04:00
Chad Furman
51c483117d fixing parens 2024-05-04 21:15:05 -04:00
Chad Furman
173501e8b0 fixing imap sed script 2024-05-04 21:02:09 -04:00
Chad Furman
1795f8aefd bringing in quota changes 2024-04-27 18:41:35 -04:00
downtownallday
c9c0a51be2 Create temporary file in TMP not the current working directory 2024-04-03 12:51:22 -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
c7faccf1fa Fixed SC2244: Prefer explicit -n to check non-empty string. 2024-04-03 09:22:50 -04:00
Teal Dulcet
ec497efa69 Quote echo commands to preserve whitespace. 2024-04-03 09:22:50 -04:00
Teal Dulcet
55a8be4aa9 Removed unnecessary bc commands. 2024-04-03 09:22:50 -04:00
Teal Dulcet
3399b25084 Replaced the pwd command with Bash's $PWD variable. 2024-04-03 09:22:50 -04:00
Teal Dulcet
2afd0451c1 Fixed SC2007: Use $((..)) instead of deprecated $[..]. 2024-04-03 09:22:50 -04:00
Teal Dulcet
27cf11d8ec Fixed SC2005: Useless echo. 2024-04-03 09:22:50 -04:00