1405 Commits (491f6b24bb8fd65953c50e847fa7be6a65632e25)
 

Author SHA1 Message Date
mergify-bot 491f6b24bb Merge branch 'master' into 'feat-subnet2' 6 years ago
Tim Möhlmann 7f46876b0c
Merge pull request #731 from usrpro/attachment-size
Dynamic attachment size limit
6 years ago
Tim Möhlmann 28daa22842
Merge pull request #726 from usrpro/update-mergify
review/need2 in mergify
6 years ago
Tim Möhlmann 8e5ccf2754
Don't merge when WIP or Blocked 6 years ago
Tim Möhlmann 626559f99b
Mergify dismiss reviews 6 years ago
Ionut Filip 94edb48f08 Dynamic attachment size 6 years ago
Tim Möhlmann a2a9512afa
Enable mergify strict mode
In the past we had strict mode in branch protection. This didn't really work as it broke mergify. Now mergify supports this options and takes care of the merging automatically. Let's see how it goes ;)

Reason is the recent build failures we had on master, during a busy merge day. This could have been prevented if sequential PR's where re-merging with master.

More info: https://doc.mergify.io/strict-workflow.html
6 years ago
Tim Möhlmann f0906073e3
Merge remote-tracking branch 'upstream/master' into feat-subnet2 6 years ago
mergify[bot] a634c7b72d
Merge pull request #725 from usrpro/fix-outlook2019-smtp
Add login method to smtp_auth under ssl
6 years ago
Tim Möhlmann 38eb266c25
Merge pull request #728 from usrpro/fix-autobuild
Fix autobuild
6 years ago
Tim Möhlmann c0972face6
Correct subnetting functionality for the tests and setup 6 years ago
Ionut Filip 35be1710a6
Changed user creation command 6 years ago
Ionut Filip 8acf9451fa
Changed admin and user creation command 6 years ago
Tim Möhlmann 8172f3eab8
Move the Mailu Docker network to a fixed subnet.
This will make network configuration and host based authentication
more robust, across different deployment platforms.
The options `RELAYNETS` and`POD_ADDRESS_RANGE` are kept for compatibility.
However, their usage have become optional.
6 years ago
kaiyou 3d98124bcd
Merge pull request #670 from kaiyou/refactor-config
Refactor the admin architecture and configuration management
6 years ago
Tim Möhlmann fee52e87ed
Don't allow for 1 review when review/need2 label is set 6 years ago
kaiyou b6aaf57be1 Merge branch 'refactor-config' of github.com:kaiyou/mailu into refactor-config 6 years ago
kaiyou d0f07984b0 Merge remote-tracking branch 'upstream/master' into refactor-config 6 years ago
kaiyou 07b1e8d765
Merge pull request #722 from usrpro/update-mergify
Update .mergify.yml
6 years ago
Tim Möhlmann 9dd447e23b
Add login method to smtp_auth under ssl
Fixes #704
6 years ago
mergify[bot] c25c646909
Merge pull request #702 from dani909/feat-image-prefix
Add docker image prefix
6 years ago
hoellen 02367d1447
Merge branch 'master' into feat-image-prefix 6 years ago
mergify[bot] 2d4bac03ad
Merge pull request #723 from usrpro/clean-healthcheck-logs
Admin: Prevent redirects during health checking
6 years ago
mergify[bot] a382f74680
Merge pull request #705 from usrpro/fix-recaptcha
Fix recaptcha
6 years ago
mergify[bot] ca86090011
Merge pull request #682 from usrpro/feat-setup
Further improve setup and neccesary re-write of the test suite
6 years ago
mergify[bot] 37027cfce7
Merge pull request #633 from kaiyou/fix-sender-checks
Improve sender checks
6 years ago
Tim Möhlmann d18cf7cb25
Prevent redirects during health checking 6 years ago
Tim Möhlmann d84254ccd8
Update user creation to python3 6 years ago
mergify[bot] 161b27a204
Merge pull request #719 from davidrothera/master
Query alternative table for domain matches
6 years ago
Tim Möhlmann b564b879aa
Update .mergify.yml
- New syntax for mergify engine v. 2
- Relax review rules for trusted users
6 years ago
Tim Möhlmann c9df311a0d
Set forward_destination to an empty list
The value of `None` resulted in an error, since a list was expected.
6 years ago
Tim Möhlmann eff6c34632
Catch asterisk before resolve_domain
Asterisk results in IDNA error and a 500 return code.
6 years ago
David Rothera 88c174fb7a Query alternative table for domain matches
At present postfix checks this view for matches in the domain table and is used to accept/deny messages sent into it however it never checks for matches in the alternative table.

Fixes #718
6 years ago
Tim Möhlmann 2b6f5ea3d0
Update setup's own docker-compose.yml file 6 years ago
Tim Möhlmann eccadeca16
Merge pull request #8 from usrpro/feat-email-test
Feat email test
6 years ago
Ionut Filip fed7146873 Captcha check on signup form 6 years ago
Tim Möhlmann 4783e61693
Fix password context
Fixes the following error:
```
admin_1      | [2018-11-09 09:44:10,533] ERROR in app: Exception on /internal/auth/email [GET]
admin_1      | Traceback (most recent call last):
admin_1      |   File "/usr/lib/python3.6/site-packages/flask/app.py", line 2292, in wsgi_app
admin_1      |     response = self.full_dispatch_request()
admin_1      |   File "/usr/lib/python3.6/site-packages/flask/app.py", line 1815, in full_dispatch_request
admin_1      |     rv = self.handle_user_exception(e)
admin_1      |   File "/usr/lib/python3.6/site-packages/flask/app.py", line 1718, in handle_user_exception
admin_1      |     reraise(exc_type, exc_value, tb)
admin_1      |   File "/usr/lib/python3.6/site-packages/flask/_compat.py", line 35, in reraise
admin_1      |     raise value
admin_1      |   File "/usr/lib/python3.6/site-packages/flask/app.py", line 1813, in full_dispatch_request
admin_1      |     rv = self.dispatch_request()
admin_1      |   File "/usr/lib/python3.6/site-packages/flask/app.py", line 1799, in dispatch_request
admin_1      |     return self.view_functions[rule.endpoint](**req.view_args)
admin_1      |   File "/usr/lib/python3.6/site-packages/flask_limiter/extension.py", line 544, in __inner
admin_1      |     return obj(*a, **k)
admin_1      |   File "/app/mailu/internal/views/auth.py", line 18, in nginx_authentication
admin_1      |     headers = nginx.handle_authentication(flask.request.headers)
admin_1      |   File "/app/mailu/internal/nginx.py", line 48, in handle_authentication
admin_1      |     if user.check_password(password):
admin_1      |   File "/app/mailu/models.py", line 333, in check_password
admin_1      |     context = User.pw_context
admin_1      | AttributeError: type object 'User' has no attribute 'pw_context'
```
6 years ago
kaiyou 72e1b444ca Merge alembic migrations 6 years ago
kaiyou 5b769e23da Merge branch 'master' into refactor-config 6 years ago
kaiyou 30716b8bdf Update docs with the new flask command 6 years ago
kaiyou 02995f0a15 Add a mailu command line to flask 6 years ago
kaiyou f9e30bd87c Update the dockerfile and upgrade dependencies 6 years ago
kaiyou 4a7eb1eb6c Explicitely declare flask migrate 6 years ago
kaiyou 2a8808bdec Add the configuration table migration 6 years ago
kaiyou f57d4859f3 Provide an in-context wrapper for getting users 6 years ago
kaiyou f6013aa29f Fix an old migration that was reading configuration before migrating 6 years ago
kaiyou 206cce0b47 Finish the configuration bits 6 years ago
mergify[bot] 5c24390114
Merge pull request #697 from HorayNarea/fix-missing-dkim
allow DKIM-signing if From-Header and Auth-User mismatch - fix #462
6 years ago
Ionut Filip 2a76451a98 Moved scripts to an external js file 6 years ago
Ionut Filip 1bbf3f235d Using a new class when captcha is enabled 6 years ago