Commit Graph
100 Commits
Author SHA1 Message Date
André Peters 45dde2e730 Merge pull request #350 from bebehei/perms
change dockerfile exec perms
2017-06-12 09:21:28 +02:00
André Peters de9e398cc2 Enable IPv6 in Bind9 2017-05-28 11:15:06 +02:00
André Peters fb6893f664 Add IPv6 2017-05-28 11:14:43 +02:00
André Peters 6f39f1f4e5 Merge pull request #297 from stevesbrain/master
Turning autocomplete off for Yubi Tokens
2017-05-19 09:01:54 +02:00
André Peters 9a896f9828 Merge pull request #295 from mkuron/patch-1
Remove REMOTE_ADDR check
2017-05-18 19:44:16 +02:00
André Peters 111f65333c Merge pull request #290 from mailcow/dev
Dev
2017-05-18 10:18:53 +02:00
André Peters 03b20a4570 Create LICENSE 2017-05-18 09:08:04 +02:00
André Peters a6642bf0c8 Create LICENSE 2017-05-18 09:07:44 +02:00
André Peters fa9a058cf8 Merge pull request #287 from mailcow/dev
Dev
2017-05-17 21:20:19 +02:00
André Peters a72631fb15 Merge branch 'master' into dev 2017-05-17 21:20:12 +02:00
André Peters 73920fbbc0 Merge pull request #280 from Dennis14e/patch-2
Fix session bug, formatting, update bootstrap/bootswatch
2017-05-16 20:11:25 +02:00
André Peters a634774bb8 Merge pull request #279 from Dennis14e/patch-1
Updates language files, better language selection
2017-05-16 18:27:56 +02:00
André Peters ce29cf3220 Merge pull request #273 from mkuron/patch-1
ipv6nat: automatically load kernel modules if needed
2017-05-14 19:09:55 +02:00
André Peters a5da2f759f Merge pull request #269 from mailcow/dev
Disable error all
2017-05-13 23:08:32 +02:00
André Peters 0cfd0b55bd Merge pull request #268 from mailcow/dev
Dev
2017-05-13 23:06:19 +02:00
André Peters 5e537825e8 Merge pull request #267 from michael-k/dockerfiles
Follow best practices in Dockerfiles
2017-05-13 21:50:31 +02:00
André Peters 0950985894 Merge pull request #203 from mkuron/patch-2
IPv6 support
2017-05-13 09:10:32 +02:00
André Peters 42445bee52 Merge pull request #265 from michael-k/indentation
Used tabs for indentation in Dockerfiles
2017-05-13 09:04:46 +02:00
André Peters 6ebcac5bcb Merge pull request #259 from mkuron/patch-1
Consistent symbol names for forwarding hosts
2017-05-09 11:55:52 +02:00
André Peters 5861bec0c3 Merge pull request #256 from mkuron/forwardinghosts
Optionally enable spam filter for forwarding hosts
2017-05-08 19:00:42 +02:00
André Peters 8daee3656e Merge pull request #181 from vivernet/patch-1
Update lang.ru.php
2017-05-06 08:02:24 +02:00
André Peters 109de92278 Merge pull request #184 from skupfer/update_lang
Update lang_de and spelling for lang_en
2017-05-06 08:01:19 +02:00
André Peters 112c417ae4 Merge branch 'master' into update_lang 2017-05-06 08:00:37 +02:00
André Peters 70b0adb714 Merge pull request #238 from broedli/patch-3
Adjust 'save changes' button
2017-05-02 18:24:15 +02:00
André Peters 99fbe0a38d Merge pull request #224 from steigr/steigr-dovecot-entrypoint-1
Fix wrong use of DBNAME in docker-entrypoint.sh
2017-04-28 12:23:23 +02:00
André Peters 238c3d8928 Merge pull request #219 from mkuron/size
Remove rspamd size limit
2017-04-24 20:45:04 +02:00
André Peters 0f3202109d Merge pull request #212 from mkuron/reverseproxy
Fix CalDAV/CardDAV URLs displayed in SOGo web interface when used behind reverse proxy
2017-04-24 10:09:32 +02:00
André Peters 166c710ff3 Merge pull request #218 from MadMooAU/patch-1
Fixes and warnings added to "First Steps" step two and three
2017-04-23 19:41:07 +02:00
André Peters 06274e1a2d Merge branch 'dev' into patch-1 2017-04-23 19:40:55 +02:00
André Peters db2d0fa21b Merge pull request #210 from chaosbunker/setup-relayhost-script
port of mailcow-setup-relayhost from mailcow 0.14 to work with mailcow-dockerized
2017-04-23 18:20:46 +02:00
André Peters 29983dfe8d Merge pull request #205 from mkuron/forwardinghosts
Add a "Forwarding Hosts" feature so messages from certain servers are never rejected
2017-04-23 14:21:16 +02:00
André Peters c79a33e914 Merge pull request #215 from v60fan/patch-3
Include instructions for Portainer
2017-04-23 11:53:58 +02:00
André Peters 9633a34f9f Merge pull request #185 from andryyy/dev
Merge from master to dev
2017-04-11 11:26:23 +02:00
André Peters 1dac309bff Merge pull request #179 from unixfox/patch-1
Warn the user about installing mailcow on Debian 8
2017-04-06 20:05:10 +02:00
André Peters d55da875b1 Merge pull request #178 from andryyy/master
Merge changes
2017-04-05 22:24:26 +02:00
André Peters 662a33faf1 Merge pull request #169 from vivernet/patch-3
Update lang.de.php
2017-04-05 18:24:51 +02:00
André Peters d6ac36d608 Merge pull request #170 from vivernet/patch-4
Update lang.en.php
2017-04-05 18:24:45 +02:00
André Peters 318b059ae6 Merge pull request #171 from vivernet/patch-5
Update lang.es.php
2017-04-05 18:24:38 +02:00
André Peters 5e0224e290 Merge pull request #172 from vivernet/patch-6
Update lang.nl.php
2017-04-05 18:24:27 +02:00
André Peters d435ff182b Merge pull request #173 from vivernet/patch-7
Update lang.pt.php
2017-04-05 18:24:14 +02:00
André Peters 45bb032a5a Merge pull request #168 from vivernet/patch-2
Update add.php
2017-04-05 18:24:04 +02:00
André Peters e7513444dc Merge pull request #167 from vivernet/patch-1
Update lang.ru.php
2017-04-05 18:23:38 +02:00
André Peters 1ffc2490b2 Merge pull request #166 from andryyy/master
Correct push to master
2017-03-26 19:01:14 +02:00
André Peters f1e9eacf87 Merge pull request #161 from PhoenixPeca/patch-4
Prevent accidental text-highlighting
2017-03-26 18:56:23 +02:00
André Peters c95b89c151 Merge pull request #158 from PhoenixPeca/patch-2
Missed Translation
2017-03-26 15:57:14 +02:00
André Peters 34aba178ac Merge pull request #164 from andryyy/dev
Fall back to dkim.conf for signing
2017-03-26 11:12:09 +02:00
André Peters 4f4a60e21b Merge pull request #155 from andryyy/dev
Doc fixes, fix pagination for alias table
2017-03-24 20:40:05 +01:00
André Peters 6fd13c96d0 Merge pull request #145 from andryyy/dev
dev docs to master
2017-03-22 15:09:04 +01:00
André Peters 2113cc1925 Merge pull request #142 from andryyy/dev
Fix autoconfig
2017-03-22 13:36:06 +01:00
André Peters b693ea9bd5 Merge pull request #141 from andryyy/dev
Dev
2017-03-22 10:46:59 +01:00
André Peters bda1aa0966 Merge pull request #139 from andryyy/dev
Use Redis history in Rspamd
2017-03-21 23:50:17 +01:00
André Peters 9b2ef45109 Merge pull request #137 from andryyy/dev
Fix ajax errors on empty tables
2017-03-21 15:48:50 +01:00
André Peters 5539df1f33 Merge pull request #136 from andryyy/dev
Dev
2017-03-21 14:51:47 +01:00
André Peters 76b3a7a64b Merge pull request #135 from andryyy/dev
Merge dev branch
2017-03-21 11:37:55 +01:00
André Peters 69e765073f Merge pull request #134 from andryyy/footable
Footable
2017-03-21 10:39:45 +01:00
André Peters aa31769e92 Merge pull request #133 from andryyy/footable
Footable
2017-03-21 10:06:58 +01:00
André Peters 4f72ed4509 Merge branch 'dev' into footable 2017-03-21 10:06:46 +01:00
André Peters d82b26af4d Merge pull request #126 from tehXor/feat-friendly-web-gui
GUI improvements: collapsible tables & password manager compatible login form
2017-03-19 11:20:18 +01:00
André Peters 009f2e808f Merge pull request #125 from andryyy/dev
Dev to master
2017-03-17 19:23:39 +01:00
André Peters 99f631c729 Merge pull request #118 from andryyy/dev
Dev merge
2017-03-13 08:03:53 +01:00
André Peters 8efb1c933a Merge pull request #116 from andryyy/dev
Use Rspamds new tag symbol
2017-03-12 14:38:44 +01:00
André Peters 7f4defb302 Merge pull request #111 from andryyy/dev
Add Junk-E-Mail as special use junk
2017-03-10 15:34:39 +01:00
André Peters 5a7142810d Merge pull request #106 from broedli/patch-1
added HTTP_PORT
2017-03-08 17:12:40 +01:00
André Peters 91bc1d6986 Merge pull request #104 from michael-k/fixes
Fixes in docs and Dockerfiles
2017-03-07 16:07:49 +01:00
André Peters 986a3d1f26 Merge pull request #102 from fabreg/patch-2
Fix path
2017-03-06 17:39:22 +01:00
André Peters 953a4cf7bb Merge pull request #98 from andryyy/dev
Dev
2017-03-06 09:24:32 +01:00
André Peters aa81bf2959 Merge pull request #94 from andryyy/master
Merge master to dev
2017-03-05 14:09:03 +01:00
André Peters aa7d0083d7 Merge pull request #92 from andryyy/dev
Dev
2017-03-05 13:20:20 +01:00
André Peters dff2a726f9 Merge pull request #90 from andryyy/master
Merge
2017-03-04 23:26:42 +01:00
André Peters 700f4ac0db Merge pull request #87 from andryyy/dev
Dev to master
2017-03-04 14:46:55 +01:00
André Peters 17f2a59862 Merge branch 'master' into dev 2017-03-04 14:45:58 +01:00
André Peters b34c9bb64a Update index.md 2017-03-02 09:03:40 +01:00
André Peters 092d0e5355 Set theme jekyll-theme-cayman 2017-03-02 09:02:33 +01:00
André Peters bc3cb99fa8 Merge pull request #75 from PhoenixPeca/patch-3
Compliance #67
2017-02-26 13:39:49 +01:00
André Peters 07bcf13cee Merge pull request #67 from PhoenixPeca/patch-1
Fixed some PHP Errors and PHP Warnings
2017-02-26 11:54:09 +01:00
André Peters 42958703c5 Merge pull request #72 from PhoenixPeca/patch-2
Incorrect mysql statement
2017-02-26 11:53:21 +01:00
André Peters 9e9f70e43e Merge pull request #70 from PhoenixPeca/dev
HTML Improvement
2017-02-26 11:50:08 +01:00
André Peters d4c3d35cb6 Merge pull request #54 from carazzim0/master
X-Moo-Tag never set
2017-02-16 20:19:44 +01:00
André Peters 2ebdb4a54b Merge pull request #53 from carazzim0/master
fix broken autodiscover
2017-02-16 15:42:14 +01:00
André Peters bdba65686b Merge pull request #51 from andryyy/dev
Dev to master
2017-02-15 21:25:36 +01:00
André Peters ade004a40a Merge branch 'master' into dev 2017-02-15 21:25:14 +01:00
André Peters 7781e5f37d Update autodiscover.php 2017-02-14 12:46:48 +01:00
André Peters 635ee7c613 Update autodiscover.php 2017-02-14 11:45:52 +01:00
André Peters 7668f82566 Update autodiscover.php 2017-02-13 07:52:12 +01:00
André Peters 8c496534c4 Update autodiscover.php 2017-02-13 07:51:59 +01:00
André Peters 779e22b6b7 Merge pull request #47 from PhoenixPeca/patch-1
Fix #46
2017-02-13 07:50:04 +01:00
André Peters a6c6e34fe9 Update mysql_virtual_sender_acl.cf 2017-02-12 19:28:52 +01:00
André Peters ba0448cc26 Update mysql_virtual_sender_acl.cf
Missing '
2017-02-12 19:28:36 +01:00
André Peters fdcf739140 Merge pull request #45 from PhoenixPeca/master
Improved Autodiscover
2017-02-11 13:19:08 +01:00
André Peters cdcc0357ed Merge pull request #37 from carazzim0/master
admin user is not being created
2017-01-31 10:23:46 +01:00
André Peters d6e3a3e966 Merge pull request #36 from andryyy/dev
Merge pull request #35 from andryyy/master
2017-01-30 14:26:41 +01:00
André Peters 2b27d37ffb Merge pull request #35 from andryyy/master
Merge
2017-01-30 14:26:22 +01:00
André Peters b4eb72f1f3 Merge pull request #34 from andryyy/dev
Dev
2017-01-30 14:24:20 +01:00
André Peters 23c791d87f Merge pull request #32 from NTHINGs/patch-1
Spanish language
2017-01-30 12:15:53 +01:00
André Peters facebbddaa Merge pull request #31 from andryyy/dev
Merge dev to master
2017-01-29 22:27:06 +01:00
André Peters 432246b3ca Merge branch 'master' into dev 2017-01-29 22:26:06 +01:00
André Peters f392a0da81 Merge pull request #20 from psi-4ward/dovecot-volume-fix
Fixed: Dovecot depend on sogo volumes
2017-01-23 23:22:46 +01:00
André Peters c9d44a6d98 Merge pull request #25 from Klazomenai/master
Don't ask for mailcow hostname and time zone if already exported with…
2017-01-23 23:22:15 +01:00
André Peters d07cd846fd Merge pull request #27 from lgleim/patch-1
Update main.cf
2017-01-23 22:21:54 +01:00
André Peters 2b9944e6bf Merge pull request #18 from miclnl/add_dutch_translations
Updates Dutch language file
2017-01-10 15:46:07 +01:00