self-hosted/mailcow-dockerized
1
0
Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2024-12-14 10:52:49 +02:00
Code Issues Releases Activity
3,274 Commits 24 Branches 66 Tags 69 MiB
11503fd316
Commit Graph

3274 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
heavygale
11503fd316 Change ACL description 2019-10-09 22:30:20 +02:00
heavygale
a049a1ffac Undo automatic whitespace cleanup 2 2019-10-06 18:59:54 +02:00
heavygale
a997a2e462 Undo automatic whitespace cleanup 2019-10-06 18:56:24 +02:00
heavygale
48838d9fd7 Don't update sogo_access when editing without acl 
Disabled checkboxes send 0 even if checked -> don't change sogo_access at all, if mailbox gets edited by domain admin without sogo_access acl.
 2019-10-05 18:07:46 +02:00
heavygale
292923a1cc Fix mistake in mailbox-edit 2019-10-05 17:34:25 +02:00
heavygale
2e42cfbd5f Added sogo_access acl for domain admin 
- new sogo_access acl is added for domain admins
- changing sogo_acces on a mailbox is only allowed if attempted by admin or by an domain admin with sogo_access acl.
- new Mailboxes are created with SOGo access if "$MAILBOX_DEFAULT_ATTRIBUTES['sogo_access'] = true;" AND if created by admin or domain admin with sogo_access acl. Otherwise sogo_access is forbidden for the new mailbox.
 2019-10-05 17:29:16 +02:00
André Peters
a008855991
Merge pull request #2999 from ntimo/task/api-docs 
[Nginx] Fix nginx config for API docs
 2019-10-04 08:51:26 +02:00
André Peters
0c2dcef916
Merge pull request #3003 from ntimo/task/replace-die-with-exit 
[Web] Replaced die(); with exit(); due to code conventions
 2019-10-04 08:45:08 +02:00
andryyy
4c952dda3b
[Web] Remove old transport-map from mailbox.js 2019-10-04 08:44:31 +02:00
andryyy
8f7693ccdb
[Postfix] Update postscreen_access 2019-10-04 08:43:59 +02:00
André Peters
37f6ddac2e
Merge pull request #2950 from friedPotat0/postwhite 
update postscreen whitelist by using postwhite
 2019-10-04 08:41:29 +02:00
ntimo
cb9ab928b3
[Web] Replaced die(); with exit(); due to code conventions 2019-10-04 08:40:24 +02:00
ntimo
27ee8c3277
[API Docs] Added new oAuth endpoints 2019-10-03 12:47:07 +02:00
ntimo
6ab1304579
[Nginx] Make api docs browsable using /api and /api/ uri 2019-10-03 11:27:44 +02:00
ntimo
52b75aef89
Merge branch 'master' into task/api-docs 
# Conflicts:
#	data/conf/nginx/site.conf
 2019-10-03 11:21:56 +02:00
ntimo
7c43e2e120
[Nginx] Fix nginx config for API docs 2019-10-03 11:19:17 +02:00
andryyy
0f5c930e48
Fix site 2019-10-03 11:15:53 +02:00
André Peters
8d1c6e5f49
Merge pull request #2998 from ntimo/task/api-docs 
[Web] Added API docs
 2019-10-03 11:12:47 +02:00
ntimo
aa7d2037a1
[Web] Removed output.html 2019-10-03 11:08:28 +02:00
ntimo
6e07de8d4f
Merge branch 'master' into task/api-docs 2019-10-03 11:07:58 +02:00
ntimo
ea55b2a2a7
[Web] Updated API docs 2019-10-03 11:06:26 +02:00
andryyy
65ce73f973
[Web] Remove mail address from examples of tls policy maps 2019-10-03 10:39:47 +02:00
ntimo
5cf74f6b85
[NGINX] Make API docs accessible using /api/ 2019-10-02 22:13:47 +02:00
ntimo
73772275c9
[Web] Added API docs html render 2019-10-02 22:13:12 +02:00
andryyy
b5ac86f86d Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized 2019-10-02 19:40:37 +02:00
André Peters
0b0ab00a31
Merge pull request #2996 from mailcow/revert-2989-patch-5 
Revert "extend debug page to show assigned domain quota"
 2019-10-02 19:40:26 +02:00
André Peters
bd52d04523
Merge pull request #2995 from mailcow/revert-2994-patch-5 
Revert "fix for "available ≠ total" error in #2989"
 2019-10-02 19:39:52 +02:00
André Peters
35420f48f2
Revert "fix for "available ≠ total" error in #2989" 2019-10-02 19:39:43 +02:00
andryyy
6f92988914 Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized 2019-10-02 19:28:34 +02:00
andryyy
323f98d317
[Compose] Update Dockerapi 2019-10-02 19:28:27 +02:00
André Peters
ac566460c5
Merge pull request #2994 from heavygale/patch-5 
fix for "available ≠ total" error in #2989
 2019-10-02 19:27:54 +02:00
heavygale
17f96fe36b fix available ≠ total 
I had mistakenly kept the available disk space for the total disk space.
 2019-10-02 19:26:32 +02:00
André Peters
4f6d407fdd
Revert "extend debug page to show assigned domain quota" 2019-10-02 19:23:09 +02:00
andryyy
23dcb68f50 Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized 2019-10-02 19:01:12 +02:00
andryyy
1c35002505
[Web] Do not allow to add domain admin for non existing domain 
[Web] oAuth2 implementation (wip)
 2019-10-02 19:00:36 +02:00
André Peters
b727d240c2
Merge pull request #2989 from heavygale/patch-5 
extend debug page to show assigned domain quota
 2019-10-02 18:57:46 +02:00
André Peters
7e44256f70
Merge pull request #2993 from ntimo/task/api-unauth-status-code 
[Web] Return 401 status code when API authorization fails
 2019-10-02 17:07:55 +02:00
ntimo
8b5be0b56d
[Web] Return 401 status code when API authentication fails 2019-10-02 13:05:12 +02:00
heavygale
ecda554e53 finalizing disk usage rework 
- changed dockerapi to not return human readable values for df
- all caluclations now in KiB
- moved code from domain_admin to mailbox functions
- using actual occupied bytes as used quota
- all outputs now in *iB using formatBytes()
 2019-10-01 20:27:06 +02:00
heavygale
7c2a5ba37e uniform spelling for quota 2019-09-29 19:19:06 +02:00
heavygale
f01e3e59c5 don't count assigned domain quota for inactive domains 
now only summing up the assigned domain quota for active domains, and not subtracting disc base occupied by mailboxes of inactive domains (inactive_bytes)
 2019-09-29 19:04:00 +02:00
heavygale
471ab05423 Merge remote-tracking branch 'upstream/master' into patch-5 2019-09-29 17:58:09 +02:00
heavygale
1e6a032d1e displaying assigned domain quota 
adding the amount of assigned domain quota to the disk usage display as potentially used disk space
 2019-09-29 17:45:36 +02:00
André Peters
9f66b83a34
Merge pull request #2965 from phenomax/postfix-no-renegotiation 
[Postfix] Add NO_RENEGOTIATION to tls_ssl_options
 2019-09-28 22:17:32 +02:00
André Peters
1586f7942f
Merge pull request #2984 from Geitenijs/patch-5 
Update lang.nl.php
 2019-09-28 21:29:27 +02:00
Geitenijs
8893b8502c
Update lang.nl.php 2019-09-28 20:55:41 +02:00
andryyy
7a85abdb42
[Web] Prepare for oauth2 
[Web] Some lib updates
[Web] Allow to add a footer
 2019-09-28 20:00:04 +02:00
andryyy
3811866ea0
[PHP-FPM] Add composer 2019-09-28 19:58:40 +02:00
andryyy
3c1532fe17
[Compose] Update PHP image 2019-09-28 19:43:52 +02:00
Geitenijs
c3e313796e
Update lang.nl.php 2019-09-27 23:33:41 +02:00