summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | 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
| * | | Add commit link to changelog.Lauri Ojansivu2019-02-081-1/+1
| * | | Update changelog.Lauri Ojansivu2019-02-081-1/+0
| * | | Update changelog.Lauri Ojansivu2019-02-081-0/+35
| * | | Merge pull request #2174 from bentiss/fix-sw-reorderingLauri Ojansivu2019-02-082-4/+75
| |\ \ \
| | * | | Fix swimlanes sortingBenjamin Tissoires2019-02-082-4/+75
| * | | | Update translations.Lauri Ojansivu2019-02-084-14/+14
| * | | | - Add oplog to snap mongodb.Lauri Ojansivu2019-02-081-1/+1
| |/ / /
| * | | Update translations.Lauri Ojansivu2019-02-0848-48/+144
| * | | Translate also Admin Panel/Layout/Display Authentication Method and Default A...Lauri Ojansivu2019-02-081-1/+3
| * | | Lint also async. Thanks to Akuket !Lauri Ojansivu2019-02-081-1/+1
| * | | Merge remote-tracking branch 'upstream/feature-improve-authentication' into f...Lauri Ojansivu2019-02-087-71/+173
| |\ \ \ | | |/ / | |/| / | | |/
| | * Fix lintsguillaume2019-02-071-6/+11
| | * - Fix lint errors.Lauri Ojansivu2019-02-015-20/+15
| | * Improve authenticationguillaume2019-02-017-68/+170
* | | Merge branch 'edge' into meteor-1.8Lauri Ojansivu2019-02-046-42/+50
|\| |
| * | v2.17v2.17Lauri Ojansivu2019-02-044-7/+15
| * | Update translations (sv).Lauri Ojansivu2019-02-041-34/+34
| * | Merge pull request #2164 from gil0109/edgeLauri Ojansivu2019-02-041-1/+1
| |\ \
| | * | Fix trailing spacesKarim Gillani2019-02-041-1/+1
| * | | Merge pull request #2162 from gil0109/edgeLauri Ojansivu2019-02-041-1/+1
| |\| |
| | * | OIDC BoardView FixKarim Gillani2019-02-041-1/+1
| |/ /
* | | Merge branch 'edge' into meteor-1.8Lauri Ojansivu2019-02-031-1/+1
|\| |