summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'devel'Lauri Ojansivu2018-08-124-446/+525
|\
| * v1.29v1.29Lauri Ojansivu2018-08-123-3/+19
| * Revert eslint changes, because they caused breakage.Lauri Ojansivu2018-08-121-443/+506
| * Fix lint errors.Lauri Ojansivu2018-08-121-124/+124
* | Merge branch 'devel'Lauri Ojansivu2018-08-1272-322/+1295
|\|
| * v1.27v1.27Lauri Ojansivu2018-08-123-4/+4
| * Merge branch 'andresmanelli-devel' into develLauri Ojansivu2018-08-1270-319/+1292
| |\
| | * - Linked Cards and Linked Boards.Lauri Ojansivu2018-08-121-0/+8
| | * Update translations.Lauri Ojansivu2018-08-1244-0/+308
| | * Fix lint errorsAndrés Manelli2018-08-113-134/+127
| | * Fix rebase errorsAndrés Manelli2018-08-114-25/+6
| | * Fix lint warningAndrés Manelli2018-08-111-1/+1
| | * Refactor imported -> linked in server and i18nAndrés Manelli2018-08-113-8/+9
| | * Refactor imported -> linked in componentsAndrés Manelli2018-08-1111-53/+52
| | * Refactor imported -> linked in modelsAndrés Manelli2018-08-113-102/+102
| | * Add imported card locationAndrés Manelli2018-08-113-0/+24
| | * Indicate board or card through icons. Indicate if archivedAndrés Manelli2018-08-116-4/+40
| | * Remove imported cards and boards colorsAndrés Manelli2018-08-111-27/+0
| | * Fix lint errorsAndrés Manelli2018-08-113-13/+10
| | * Add title bindingAndrés Manelli2018-08-113-80/+35
| | * Avoid reimport imported cardAndrés Manelli2018-08-111-1/+2
| | * Add two way binding of activities, comments, and attachmentsAndrés Manelli2018-08-114-10/+46
| | * Add two way binding of checklistsAndrés Manelli2018-08-114-13/+37
| | * Avoid exporting imported cardsAndrés Manelli2018-08-111-1/+2
| | * Add two way binding of card/board timesAndrés Manelli2018-08-117-52/+250
| | * Allow description and member two way bindingAndrés Manelli2018-08-106-14/+82
| | * Avoid importing imported cards or boardsAndrés Manelli2018-08-102-7/+8
| | * Link descriptionAndrés Manelli2018-08-107-19/+50
| | * Import card-as-card, board-as-card. Add styling. Missing details and linksAndrés Manelli2018-08-105-25/+159
| | * Avoid showing current boardAndrés Manelli2018-08-101-3/+9
| | * Add UI for importing card-as-card and board-as-cardAndrés Manelli2018-08-108-1/+199
| |/
* | Merge branch 'devel'Lauri Ojansivu2018-08-093-3/+17
|\|
| * v1.26v1.26Lauri Ojansivu2018-08-093-4/+5
| * - Set Matomo blank settings on Sandstorm.Lauri Ojansivu2018-08-092-0/+12
| * - Set WITH_API=true on Sandstorm, so that export works.Lauri Ojansivu2018-08-091-0/+1
* | Merge branch 'devel'Lauri Ojansivu2018-08-094-3/+12
|\|
| * v1.25v1.25Lauri Ojansivu2018-08-093-3/+11
| * Merge pull request #1822 from Yanonix/develLauri Ojansivu2018-08-091-0/+1
| |\
| | * Fix showing only the cards of the current board in calendar viewYanonix2018-08-091-0/+1
* | | Merge branch 'devel'Lauri Ojansivu2018-08-0914-139/+185
|\| |
| * | v1.24v1.24Lauri Ojansivu2018-08-093-7/+14
| * | - Use new WITH_API and Matomo env variables at Dockerfile.Lauri Ojansivu2018-08-091-1/+1
| * | Use new WITH_API and Matomo env variables at Dockerfile.Lauri Ojansivu2018-08-091-1/+2
| * | - Use new WITH_API and Matomo env variables at Dockerfile.Lauri Ojansivu2018-08-091-0/+11
| |/
| * Update translations.Lauri Ojansivu2018-08-083-76/+76
| * Update node to v8.12.0 prerelease build.Lauri Ojansivu2018-08-042-5/+5
| * Revert snap changes.Lauri Ojansivu2018-08-041-7/+8
| * Try to fix snap.Lauri Ojansivu2018-08-041-8/+7
| * Fix port order, hopefully correctly.Lauri Ojansivu2018-08-021-1/+1
| * Merge pull request #1816 from Worteks/develLauri Ojansivu2018-08-022-2/+3
| |\