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
c9243164bf
v70
2024-08-15 21:11:43 -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
d2497f4847
v69b
2024-07-23 07:21:34 -04: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 67bcaea71ehttps://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
3b9d587099
v69a
2024-07-21 17:31:52 -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
KiekerJan
2803d88894
increase timeout for the nginx proxy that provides access to the Mailinabox management daemon ( #2407 )
2024-07-20 16:44:24 -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
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
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
25439e2bf7
QA: update to Actions upload-artifact v4
2024-06-18 13:24:01 -04:00
downtownallday
a685955f29
QA: attempt fixing logout click intercepted exception on github actions #2
2024-06-18 13:23:29 -04:00
downtownallday
626e2290e7
QA: attempt fixing logout click intercepted exception on github actions
2024-06-18 12:57:48 -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
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
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
