summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | v1.33Lauri Ojansivu2018-08-163-4/+4
| * | - Change default value of label ids.Lauri Ojansivu2018-08-161-0/+8
| * | Merge pull request #1837 from omarsy/develLauri Ojansivu2018-08-161-1/+1
| |\ \
| | * | Change of the default value of labelIdsOmar Sy2018-08-161-1/+1
| |/ /
* | | Merge branch 'devel'Lauri Ojansivu2018-08-1617-52/+127
|\| |
| * | v1.32v1.32Lauri Ojansivu2018-08-163-4/+4
| * | - Use only framing policy, not all of content policy.Lauri Ojansivu2018-08-161-2/+4
| * | - Use only framing policy, not all of content policy.Lauri Ojansivu2018-08-163-13/+11
| * | - Content Policy: Allow inline scripts, otherwise there is errors in browserLauri Ojansivu2018-08-151-0/+13
| * | Merge branch 'devel' of github.com:wekan/wekan into develLauri Ojansivu2018-08-153-7/+18
| |\ \
| | * \ Merge pull request #1832 from andresmanelli/develLauri Ojansivu2018-08-153-7/+18
| | |\ \
| | | * | Fix hiddenSystemMessagesAndrés Manelli2018-08-153-7/+18
| * | | | - Content Policy: Allow inline scripts, otherwise there is errors in browser/...Lauri Ojansivu2018-08-155-12/+18
| |/ / /
| * | | Merge pull request #1831 from andresmanelli/develLauri Ojansivu2018-08-152-11/+56
| |\| |
| | * | Fix removed setters and gettersAndrés Manelli2018-08-152-11/+56
| |/ /
| * | Remove Trello.Lauri Ojansivu2018-08-145-6/+6
* | | Merge branch 'devel'Lauri Ojansivu2018-08-145-24/+32
|\| |
| * | v1.31v1.31Lauri Ojansivu2018-08-143-3/+11
| * | Fix quotes.Lauri Ojansivu2018-08-141-6/+6
| * | Try to fix Dockerfile.Lauri Ojansivu2018-08-141-16/+16
| * | Try to fix Docker env variables.Lauri Ojansivu2018-08-141-15/+15
| * | Fix typo.Lauri Ojansivu2018-08-141-2/+2
| * | Fix trusted url on docker-compose.yml.Lauri Ojansivu2018-08-141-1/+1
* | | Merge branch 'devel'Lauri Ojansivu2018-08-1413-526/+626
|\| |
| * | v1.30v1.30Lauri Ojansivu2018-08-143-4/+4
| * | Fix lint errors.Lauri Ojansivu2018-08-142-3/+3
| * | - Fix Import from Trello error 400.Lauri Ojansivu2018-08-141-0/+4
| * | - Fix Import from Trello error 400.Lauri Ojansivu2018-08-142-0/+26
| * | Update translations.Lauri Ojansivu2018-08-132-14/+14
| * | Fix lint errors.Lauri Ojansivu2018-08-131-507/+507
| * | - When Content Policy is enabled, allow one URL to have iframe that embeds WekanLauri Ojansivu2018-08-131-0/+10
| * | - When Content Policy is enabled, allow one URL to have iframe that embeds WekanLauri Ojansivu2018-08-136-2/+62
* | | 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