summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'devel' into meteor-1.8Lauri Ojansivu2019-02-2510-7/+36
|\
| * v2.26v2.26Lauri Ojansivu2019-02-254-6/+7
| * - [Fix OAuth2 requestPermissions](https://github.com/wekan/wekan/commit/5e238...Lauri Ojansivu2019-02-251-0/+6
| * - Fix OAuth2 requestPermissions.Lauri Ojansivu2019-02-251-1/+1
| * - Add setting [EMAIL_NOTIFICATION_TIMEOUT](https://github.com/wekan/wekan/iss...Lauri Ojansivu2019-02-251-0/+7
| * - Add setting EMAIL_NOTIFICATION_TIMEOUT. Defaut 30000 ms (30s).Lauri Ojansivu2019-02-255-2/+17
* | Merge branch 'edge' into meteor-1.8Lauri Ojansivu2019-02-239-4/+13
|\|
| * v2.25v2.25Lauri Ojansivu2019-02-234-4/+13
| * - Revert file permission changes from v2.24 LDAP changes thatLauri Ojansivu2019-02-235-0/+0
* | Merge branch 'edge' into meteor-1.8Lauri Ojansivu2019-02-2315-130/+238
|\|
| * v2.24v2.24Lauri Ojansivu2019-02-234-5/+7
| * - [Add LDAP email] matching support](https://github.com/wekan/wekan-ldap/pull...Lauri Ojansivu2019-02-231-1/+7
| * Merge pull request #2198 from stevenpwaters/develLauri Ojansivu2019-02-237-1/+94
| |\
| | * Added LDAP email environment variablesSteven Waters2019-02-217-1/+94
| * | - Add missing text .env to wekan/server/authentication.js.Lauri Ojansivu2019-02-231-0/+7
| * | - Add missing text .envLauri Ojansivu2019-02-231-1/+1
| * | Update translations.Lauri Ojansivu2019-02-233-124/+124
| |/
* | 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
|\| | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-09-19 17:25:15 +0000