Commit Graph

402 Commits (040e1edb6a854f963e2e23c5c07f097c82c6dc16)

Author SHA1 Message Date
Michael Käufl 040e1edb6a [docs] Removed left over from merge conflict
Ref 5c40d84e78
2017-03-07 15:48:17 +01:00
andryyy 5c40d84e78 Merge branch 'master' of https://github.com/andryyy/mailcow-dockerized
Conflicts:
	docs/u_and_e.md
2017-03-07 09:30:49 +01:00
andryyy 3eae8345c4 Change in docs 2017-03-07 09:19:07 +01:00
André Peters 986a3d1f26 Merge pull request #102 from fabreg/patch-2
Fix path
2017-03-06 17:39:22 +01:00
fabreg 8ab76ce661 Fix path 2017-03-06 16:22:17 +01:00
andryyy 71886834ab Add composer install hint with dynamic version include 2017-03-06 15:43:13 +01:00
andryyy 95937b8bad Change default plain port to 80 2017-03-06 15:42:45 +01:00
andryyy 4d9b4966f5 Add clean-up and some more info for update 2017-03-06 10:54:09 +01:00
andryyy 897849a019 Clone with ssl cert but ignore updates 2017-03-06 10:39:41 +01:00
andryyy c283c85d51 Update Postfix and Dovecot, add ignore 2017-03-06 10:33:44 +01:00
André Peters 953a4cf7bb Merge pull request #98 from andryyy/dev
Dev
2017-03-06 09:24:32 +01:00
andryyy b15c6f7d96 Change repository names 2017-03-06 09:10:06 +01:00
André Peters aa81bf2959 Merge pull request #94 from andryyy/master
Merge master to dev
2017-03-05 14:09:03 +01:00
andryyy 6d7b6a92ee Fix docker-compose 2017-03-05 14:04:00 +01:00
andryyy 252150016f Add comments to update 2017-03-05 13:51:56 +01:00
andryyy 2bbbb13b0e Change install and update description 2017-03-05 13:41:41 +01:00
André Peters aa7d0083d7 Merge pull request #92 from andryyy/dev
Dev
2017-03-05 13:20:20 +01:00
andryyy be8031d8ff Move sleep to docker-compose 2017-03-05 12:25:46 +01:00
andryyy 67bb037b36 Use regexp instead of like in goto query 2017-03-05 12:24:28 +01:00
André Peters dff2a726f9 Merge pull request #90 from andryyy/master
Merge
2017-03-04 23:26:42 +01:00
andryyy 2e467ab802 Add sender/receiver model 2017-03-04 23:16:23 +01:00
andryyy d1decbd31e Fix goto in sender acl query, show alias by alias domain in fixed addresses within sender acl 2017-03-04 23:16:08 +01:00
andryyy 3fbbece857 Minor intval fix 2017-03-04 15:56:24 +01:00
andryyy 047e73e5df Minor intval fix 2017-03-04 15:55:51 +01:00
andryyy 3e91d06d73 Change maintainer 2017-03-04 15:07:07 +01:00
andryyy cbc22a2cf3 Change maintainer 2017-03-04 15:05:27 +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
andryyy 2d086424fa Fix settings for aliases, alias domains 2017-03-04 14:05:06 +01:00
andryyy a88d884458 Fix line break 2017-03-04 12:27:19 +01:00
andryyy e332579a40 Sleep 30 seconds to wait for Nginx restart 2017-03-04 10:41:36 +01:00
andryyy 285e295d91 Fix for settings 2017-03-04 00:27:57 +01:00
andryyy 8c2416b711 Never return empty map 2017-03-04 00:23:38 +01:00
andryyy 211e4158a2 Always return settings 2017-03-04 00:19:10 +01:00
andryyy c303ef35ae Fix Rspamd 2017-03-04 00:06:58 +01:00
andryyy 714490ad5e Fix Rspamd 2017-03-04 00:02:42 +01:00
andryyy 24f3bf009c Fix Rspamd 2017-03-03 23:45:26 +01:00
andryyy f6c383431e Fix Rspamd 2017-03-03 23:42:49 +01:00
andryyy 66cbc479d7 Fix Rspamd Dockerfiles 2017-03-03 23:31:32 +01:00
andryyy 614da27c03 Add permission 2017-03-03 22:50:04 +01:00
andryyy a96d05c4d0 Add word 2017-03-03 22:27:56 +01:00
andryyy d187280b1f Add usage to user.php 2017-03-03 22:26:59 +01:00
andryyy b656fedca6 Rspamd: Wait for maps and settings 2017-03-03 22:26:50 +01:00
andryyy ef7a77ef47 Fix user details when goto has multiple values, fix wording 2017-03-03 19:12:27 +01:00
andryyy cad084598d Remove old files, fix tagging 2017-03-03 19:01:33 +01:00
andryyy 579b5483ab Do not return empty map 2017-03-03 17:31:50 +01:00
andryyy 83e02cbe4a Init container first 2017-03-03 15:46:43 +01:00
andryyy 92b5a8e6dd Change map variable 2017-03-03 15:39:12 +01:00
andryyy 60ba5d2ce5 Changes in depends_on 2017-03-03 15:24:04 +01:00
andryyy 0931a153c1 Use local mirrors 2017-03-03 10:54:25 +01:00