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
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
andryyy
8c26371d6d
[SQL upgrade] Catch more errors
2019-09-25 12:53:14 +02:00
andryyy
8b453ab803
[Web] Allow to set sogo_visible when adding an alias, fixes #2975
2019-09-24 19:12:45 +02:00
andryyy
14a2a266a1
[Web] Improve U2F process and fix Win 1903 hassle
2019-09-24 18:34:08 +02:00
andryyy
3c133ad02a
[ClamAV] Cleanup garbage when starting container (tmp files may fill up disk, when container runs oom)
2019-09-24 16:39:39 +02:00
andryyy
7cf2c0ad69
[Web] Changes to 502 status page
2019-09-24 07:06:33 +02:00
andryyy
9b7668d912
[Nginx] Custom 502
2019-09-24 06:53:13 +02:00