summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'edge' into meteor-1.8Lauri Ojansivu2019-02-178-26/+41
|\
| * v2.23v2.23Lauri Ojansivu2019-02-174-5/+5
| * Update translations (sv).Lauri Ojansivu2019-02-151-19/+19
| * - [Fix authentication dropdown](https://github.com/wekan/wekan/pull/2191).Lauri Ojansivu2019-02-151-0/+9
| * Merge pull request #2191 from Akuket/feature-improve-authenticationLauri Ojansivu2019-02-153-3/+9
| |\
| | * Fix authentication dropdownguillaume2019-02-153-3/+9
* | | Merge branch 'edge' into meteor-1.8Lauri Ojansivu2019-02-1316-20/+87
|\| |
| * | v2.22v2.22Lauri Ojansivu2019-02-134-5/+5
| * | - Add [configurable](https://github.com/wekan/wekan/issues/1874#issuecomment-...Lauri Ojansivu2019-02-131-0/+4
| * | - Add configurable settings OAUTH2_ID_TOKEN_WHITELIST_FIELDSLauri Ojansivu2019-02-138-12/+53
| * | - Add Kadira integration. Thanks to GavinLilly.Lauri Ojansivu2019-02-131-0/+13
| * | Merge branch 'edge' into develLauri Ojansivu2019-02-133-2/+6
| |\ \
| | * | - Fix2: Remove overlap of side bar button with card/list menu button on mobil...Lauri Ojansivu2019-02-132-1/+5
| | * | - Fix: Remove overlap of side bar button with card/list menu button on mobile...Lauri Ojansivu2019-02-131-1/+1
| | * | - Fix indenting textline.Lauri Ojansivu2019-02-121-1/+1
| | * | Update translations.Lauri Ojansivu2019-02-121-1/+1
| * | | Merge pull request #2187 from GavinLilly/kadira-integrationLauri Ojansivu2019-02-133-2/+7
| |\ \ \ | | |/ / | |/| |
| | * | Adding wekan-ldap back in to build in the DockerfileGavin Lilly2019-02-131-1/+1
| | * | Cleaning up docker-compose for mergeGavin Lilly2019-02-131-56/+22
| | * | Added back wekan-ldap after it's fixed in a separate changeGavin Lilly2019-02-122-0/+3
| | * | Moved to meteor-apm-agent and removed Wekan LDAP to test if workingGavin Lilly2019-02-112-4/+1
| | * | Pulled Wekan-LDAP locally for debugGavin Lilly2019-02-111-1/+1
| | * | Merge branch 'devel' of github.com:wekan/wekan into develGavin Lilly2019-02-1172-204/+553
| | |\ \
| | * | | Replaced Kadira by meteor-apm-agentGavin Lilly2019-02-113-11/+6
| | * | | Added Kadira using meteor add methodGavin Lilly2019-02-091-0/+1
| | * | | Added Kadira packages and env settings in Docker ComposeGavin Lilly2019-02-093-18/+61
* | | | | Merge branch 'edge' into meteor-1.8Lauri Ojansivu2019-02-1212-213/+389
|\| | | |
| * | | | v2.21v2.21Lauri Ojansivu2019-02-124-4/+17
| * | | | - Add OIDC claim mapping parameters to docker-compose.yml/Snap/Source.Lauri Ojansivu2019-02-126-208/+363
| * | | | Merge pull request #2182 from danpatdav/oidcLauri Ojansivu2019-02-112-1/+9
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Added parameters for OIDC claim mappingDaniel Davis2019-02-111-0/+8
| | * | | Bump salleman-oidc to 1.0.12Daniel Davis2019-02-111-1/+1
| |/ / /
* | | | Merge branch 'edge' into meteor-1.8Lauri Ojansivu2019-02-1117-81/+117
|\| | |
| * | | v2.20v2.20Lauri Ojansivu2019-02-114-5/+5
| * | | Update changelog.Lauri Ojansivu2019-02-111-0/+11
| * | | - Add option DEBUG=true for docker-compose.yml/Snap/Source.Lauri Ojansivu2019-02-116-3/+26
| * | | Merge pull request #2181 from danpatdav/debug-oidcLauri Ojansivu2019-02-112-1/+3
| |\ \ \
| | * | | SyntaxDaniel Davis2019-02-111-1/+1
| | * | | Bumped salleman packages to 1.0.11Daniel Davis2019-02-061-2/+2
| | * | | Add a debug argumentDaniel Davis2019-02-061-0/+2
| | |/ /
| * | | Update translations.Lauri Ojansivu2019-02-114-67/+67
| * | | Update translations.Lauri Ojansivu2019-02-092-10/+10
* | | | Merge branch 'edge' into meteor-1.8Lauri Ojansivu2019-02-096-7/+15
|\| | |
| * | | Update translations (es).v2.19Lauri Ojansivu2019-02-091-2/+2
| * | | v2.19Lauri Ojansivu2019-02-094-4/+12
| * | | - Remove oplog. Need to think how to do it properly.Lauri Ojansivu2019-02-081-1/+1
* | | | Merge branch 'edge' into meteor-1.8Lauri Ojansivu2019-02-0864-136/+441
|\| | |
| * | | v2.18v2.18Lauri Ojansivu2019-02-084-5/+5
| * | | Add commit link to changelog.Lauri Ojansivu2019-02-081-2/+2
| * | | Add issue link to changelog.Lauri Ojansivu2019-02-081-1/+1