downtownallday
271a04333d
Merge branch 'master' into quota
2025-02-16 16:29:01 -05:00
downtownallday
683668c66c
Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
2025-01-06 08:06:12 -05:00
Joshua Tauberer
e6c354c312
v71a
2025-01-06 07:08:06 -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
d58dd0c91d
v71
2025-01-04 14:39:25 -05: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
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
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
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
Joshua Tauberer
1b3e5e818c
v69
2024-07-20 07:33:07 -04:00
Chad Furman
1795f8aefd
bringing in quota changes
2024-04-27 18:41:35 -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
ec497efa69
Quote echo commands to preserve whitespace.
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
bdf4155bed
Fixed SC2046: Quote to prevent word splitting.
2024-04-03 09:21:34 -04:00
Teal Dulcet
33559bb844
Fixed SC2164: Use 'cd ... || exit' in case cd fails.
2024-04-03 09:21:34 -04:00
Teal Dulcet
30c4681e80
Fixed SC2086: Double quote to prevent globbing and word splitting.
2024-04-03 09:20:20 -04:00
downtownallday
1be8257b20
Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
...
# Conflicts:
# CHANGELOG.md
# README.md
2024-04-01 17:57:03 -04:00
Joshua Tauberer
830c83daa1
v68
2024-04-01 10:55:52 -04:00
downtownallday
96b315c368
Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
...
# Conflicts:
# README.md
2023-12-22 18:59:26 -05:00
Joshua Tauberer
7646095b94
v67
2023-12-22 08:56:43 -05:00
downtownallday
b88845190f
Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
...
# Conflicts:
# README.md
2023-12-18 13:47:57 -05:00
Joshua Tauberer
8e4e9add78
Version 66
2023-12-17 16:31:18 -05:00
downtownallday
ed963fa65c
Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
...
# Conflicts:
# setup/bootstrap.sh
# setup/webmail.sh
2023-12-05 09:08:32 -05:00
bilogic
6d6ce25e03
Allow specifying another repo to install from in bootstrap.sh ( #2334 )
2023-12-04 09:22:54 -05:00
downtownallday
4b71b0f5b4
Merge remote-tracking branch 'upstream/main'
...
# Conflicts:
# README.md
# setup/webmail.sh
2023-10-29 13:19:38 -04:00
Joshua Tauberer
0314554207
Version 65
2023-10-27 06:02:22 -04:00
downtownallday
b11309b624
Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
...
# Conflicts:
# README.md
2023-09-02 19:58:38 -04:00
Joshua Tauberer
e419b62034
Version 64
2023-09-02 19:46:24 -04:00
downtownallday
5fc9edb3d7
Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
2023-09-02 07:19:32 -04:00
Michael Heuberger
81866de229
Amend --always option to all git describe commands ( #2275 )
2023-09-02 06:59:39 -04:00
downtownallday
af3357cd46
Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
...
# Conflicts:
# README.md
2023-08-02 08:30:08 -04:00
Joshua Tauberer
cd45d08409
Version 63
2023-07-29 12:11:29 -04:00
downtownallday
d956166164
Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
...
# Conflicts:
# README.md
2023-05-21 07:23:55 -04:00
Joshua Tauberer
8b19d15735
Version 62
2023-05-20 08:57:32 -04:00
downtownallday
da0506a1d7
Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
...
# Conflicts:
# README.md
2023-01-29 10:41:53 -05:00
Joshua Tauberer
6f94412204
v61.1
2023-01-28 11:25:21 -05:00
downtownallday
9f5ddc284a
Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
...
# Conflicts:
# README.md
2023-01-25 08:49:12 -05:00
Joshua Tauberer
5e3e4a2161
v61
2023-01-21 08:20:48 -05:00
downtownallday
4d845a3618
Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
...
# Conflicts:
# README.md
2022-10-30 08:21:51 -04:00
Joshua Tauberer
3314c4f7de
v60.1
2022-10-30 08:18:13 -04:00
downtownallday
e636e63862
Setup fixes
...
1. Autodetect encryption-at-rest and run the correct setup in boostrap and /usr/local/bin/mailinabox
2. Fix bug where directories in the local mod folder are improperly executed causing setup to fail
3. Add a remote_nextcloud.sh setup mod cleanup function for cleaner removal of the mod
2022-10-14 09:27:24 -04:00
downtownallday
9e5ce3e681
Enable "bootstrap" installs
2022-10-13 18:58:44 -04:00
downtownallday
ec2c878360
Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox into jammyjellyfish2204
2022-10-12 06:57:37 -04:00
Joshua Tauberer
286a4bd9e7
Remove stray quote in bootstrap.sh
...
Reported at https://discourse.mailinabox.email/t/version-60-for-ubuntu-22-04-is-released/9558/4 .
2022-10-12 06:11:02 -04:00
downtownallday
bf63ca827e
Add copyright to source files
2022-09-19 14:45:11 -04:00
downtownallday
cac187756d
Merge branch 'jammyjellyfish2204' of https://github.com/mail-in-a-box/mailinabox into jammyjellyfish2204
...
# Conflicts:
# CHANGELOG.md
# README.md
# management/ssl_certificates.py
# setup/bootstrap.sh
# setup/dns.sh
# setup/management.sh
# setup/nextcloud.sh
# setup/preflight.sh
# setup/start.sh
# setup/webmail.sh
# tests/test_mail.py
# tools/editconf.py
2022-07-28 17:20:57 -04:00
