Commit Graph

3692 Commits

Author SHA1 Message Date
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
andryyy
1580e4b2a5
[Nginx, SOGo] Adjustments for EAS 2019-10-06 10:12:46 +02:00
ntimo
8a87dd4254
[API] Removed unsets that are not needed 2019-10-05 18:14:36 +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
ntimo
2c7e9f49d5
[API] Added comments to defaults 2019-10-04 09:01:31 +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
6372df21fe
[API] Replaced die(); with exit(); due to code conventions 2019-10-04 08:37:30 +02:00
ntimo
08350d9a95
[API] Added missing route not found error for /get/logs/ 2019-10-03 20:58:56 +02:00
ntimo
2da55296b5
[API] Catch more cases where no api route exists 2019-10-03 20:52:09 +02:00
ntimo
b9c244b746
[API] Only allow POST method for edit apis 2019-10-03 18:14:27 +02:00
ntimo
5fa456770f
[API] Removed hard coded status code 200 2019-10-03 17:25:56 +02:00
ntimo
416d5a12f8
[API] Unset POST when only GET is allowed 2019-10-03 15:06:08 +02:00
ntimo
ab298741e3
[API] Added comments 2019-10-03 15:04:25 +02:00
ntimo
877c48db58
[API] Added missing die() 2019-10-03 14:42:30 +02:00
ntimo
c4c9d2a3b4
[API] Fixed broken if 2019-10-03 14:39:38 +02:00
ntimo
f393049273
[API] Make add and delete routes POST only 2019-10-03 14:36:10 +02:00
ntimo
948137b4b4
[API] Fixed only allow GET logic 2019-10-03 12:56:01 +02:00
ntimo
c67e86756f
[API] Better check for GET method 2019-10-03 12:54:06 +02:00
ntimo
796853cae5
[API] Replace exit with die(); 2019-10-03 12:50:58 +02:00
ntimo
72f8c0a5bd
[API] Added proper status codes to API 2019-10-03 12:48:19 +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