summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Sam X. Chen2019-08-29100-539/+6452
|\
| * v3.35v3.35Lauri Ojansivu2019-08-297-8/+16
| * Try to fix snap.Lauri Ojansivu2019-08-291-10/+9
| * v3.34v3.34Lauri Ojansivu2019-08-297-8/+17
| * Snap: Delete all .swp files.Lauri Ojansivu2019-08-291-5/+12
| * v3.33v3.33Lauri Ojansivu2019-08-297-9/+9
| * Update ChangeLog.Lauri Ojansivu2019-08-291-0/+10
| * Merge pull request #2664 from grmpfhmbl/feature-colored-calendar-cardsLauri Ojansivu2019-08-292-0/+79
| |\
| | * add card color to calendar event (#2651)Steffen2019-08-292-0/+79
| * | v3.32v3.32Lauri Ojansivu2019-08-297-8/+17
| * | Fix Snap adopt-info.Lauri Ojansivu2019-08-291-7/+4
| * | Try to fix adopt-info.Lauri Ojansivu2019-08-291-5/+6
| * | v3.31v3.31Lauri Ojansivu2019-08-297-8/+18
| * | Try to fix adopt-info.Lauri Ojansivu2019-08-291-1/+6
| * | Try to fix adopt-info.Lauri Ojansivu2019-08-291-2/+2
| * | v3.30v3.30Lauri Ojansivu2019-08-297-8/+20
| * | Update translations.Lauri Ojansivu2019-08-291-129/+129
| * | Snap: Change version-script to adopt-info to fix dirty.Lauri Ojansivu2019-08-291-2/+1
| * | Delete another phantomjs binary from Snap.Lauri Ojansivu2019-08-291-0/+1
| * | Revert fix dirty, because it caused Snap build to fail.Lauri Ojansivu2019-08-291-1/+1
| |/
| * Fix dirty snap release.Lauri Ojansivu2019-08-291-1/+1
| * v3.29v3.29Lauri Ojansivu2019-08-295-5/+14
| * Fix Snap.Lauri Ojansivu2019-08-293-11/+2
| * v2.38Lauri Ojansivu2019-08-297-8/+17
| * v3.27v3.27Lauri Ojansivu2019-08-297-8/+17
| * Update translations.Lauri Ojansivu2019-08-290-0/+0
| * Upgrade node, mongo and fibers.Lauri Ojansivu2019-08-299-128/+26
| * v3.26v3.26Lauri Ojansivu2019-08-287-9/+9
| * Update translations.Lauri Ojansivu2019-08-281-15/+15
| * Update ChangeLog.Lauri Ojansivu2019-08-281-1/+6
| * Merge pull request #2660 from Scherdel/masterLauri Ojansivu2019-08-285-7/+48
| |\
| | * Fixed endless compilation devcontainer, debuggingChristoph Jahn2019-08-285-7/+48
| * | Merge pull request #2659 from Scherdel/masterLauri Ojansivu2019-08-285-0/+232
| |\|
| | * Merge branch 'master' of https://github.com/scherdel/wekanChristoph Jahn2019-08-280-0/+0
| | |\
| | | * Devcontainer node-gyp fixChristoph Jahn2019-08-281-1/+3
| | | * Merge branch 'master' of https://github.com/scherdel/wekanChristoph Jahn2019-08-080-0/+0
| | | |\
| | | | * Add debugging in containers for vscodeChristoph Jahn2019-08-075-0/+230
| | | * | Add debugging in containers for vscodeChristoph Jahn2019-08-085-0/+230
| | * | | Devcontainer node-gyp fixChristoph Jahn2019-08-281-1/+3
| | * | | Add debugging in containers for vscodeChristoph Jahn2019-08-285-0/+230
| |/ / /
| * | | Try to fix lint, and make board loading fix Sandstorm-only whereLauri Ojansivu2019-08-261-2/+17
| * | | Update ChangeLog.Lauri Ojansivu2019-08-261-0/+2
| * | | Merge branch 'PDIS-master'Lauri Ojansivu2019-08-261-6/+10
| |\ \ \
| | * | | Fix app hang when Meteor.user() is null and list spinner is loaded bugRomulus Urakagi Tsai2019-08-261-6/+10
| * | | | Update ChangeLog.Lauri Ojansivu2019-08-261-0/+2
| * | | | Default to BIGEVENTS_PATTERN=NONE so that Wekan sends less emailLauri Ojansivu2019-08-268-15/+76
| * | | | Update ChangeLog.Lauri Ojansivu2019-08-261-0/+13
| * | | | Merge pull request #2657 from justinr1234/patch-6Lauri Ojansivu2019-08-261-1/+1
| |\ \ \ \
| | * | | | Fix last label undefinedjustinr12342019-08-261-1/+1
| |/ / / /
| * | | | Update translations.Lauri Ojansivu2019-08-260-0/+0