Merge branch 'master' into feature-ostrio-files

This commit is contained in:
David Arnold 2020-10-20 11:43:12 -05:00
commit 620cc0dedc
No known key found for this signature in database
GPG key ID: 6D6A936E69C59D08
95 changed files with 1070 additions and 488 deletions

View file

@ -132,7 +132,7 @@ services:
' 1>/dev/null 2>&1 &
mongod --replSet rs1
wekan:
image: quay.io/wekan/wekan
image: wekanteam/wekan
container_name: wekan-app
restart: always
networks:
@ -305,6 +305,9 @@ services:
# example: WEBHOOKS_ATTRIBUTES=cardId,listId,oldListId,boardId,comment,user,card,commentId
#- WEBHOOKS_ATTRIBUTES=
#-----------------------------------------------------------------
# ==== OAUTH2 ORACLE on premise identity manager OIM ====
#- ORACLE_OIM_ENABLED=true
#-----------------------------------------------------------------
# ==== OAUTH2 ONLY WITH OIDC AND DOORKEEPER AS INDENTITY PROVIDER
# https://github.com/wekan/wekan/issues/1874
# https://github.com/wekan/wekan/wiki/OAuth2