paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,484 Commits
1 Branch
0 Tags
32 MiB
Commit Graph

4484 Commits (3234550a5bfc7ab8dd8cea04492053f15fe113c8)

Author SHA1 Message Date
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
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