summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2665 from whowillcare/masterLauri Ojansivu2019-09-0410-72/+220
|\ | | | | Add Feature: complete the original author's webhook functions and add two-way webhook type
| * Add Feature: enable two-way webhooks - add comments need useridSam X. Chen2019-08-301-5/+9
| |
| * Add Feature: enable two-way webhooks - fixing lint errorSam X. Chen2019-08-291-1/+2
| |
| * Merge remote-tracking branch 'upstream/master'Sam X. Chen2019-08-29100-539/+6452
| |\
| * | Add Feature: enable two-way webhooks - stage twoSam X. Chen2019-08-294-25/+102
| | |
| * | Add Feature: enable two-way webhooks - stage oneSam X. Chen2019-08-179-49/+115
| | |
* | | Merge pull request #2667 from Akuket/masterLauri Ojansivu2019-09-042-8/+8
|\ \ \ | | | | | | | | Patch admin search feature
| * \ \ Merge branch 'master' of https://github.com/wekan/wekanguillaume2019-08-3024-286/+626
| |\ \ \ | | | |/ | | |/|
| * | | Patch admin search featureguillaume2019-08-302-8/+8
| | | |
* | | | Merge pull request #2672 from Scherdel/masterLauri Ojansivu2019-09-044-7/+7
|\ \ \ \ | | | | | | | | | | Devcontainer: Removed MAIL-Vars, Add PATH with meteor to Envionment
| * | | | DevContainer: use docker extend file, fix PATHChristoph Jahn2019-09-033-3/+4
| | | | |
| * | | | Merge branch 'master' of https://github.com/scherdel/wekanChristoph Jahn2019-09-0218-286/+353
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of https://github.com/scherdel/wekanChristoph Jahn2019-09-022-3/+2
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | DevContainer: Updated node and mongodbChristoph Jahn2019-09-022-2/+2
| | |/ / / | |/| | |
| * | | | Removed MAIL-Vars for DEV, Add PATH to ENVChristoph Jahn2019-09-022-3/+2
| | | | |
* | | | | Try to fix snap.Lauri Ojansivu2019-09-041-1/+4
| |/ / / |/| | |
* | | | 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
| | | | | | | | | | | | | | | | Thanks to xet7 !
* | | | 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)
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://forum.snapcraft.io/t/dirty-snap-release/12975/12?u=xet7 Thanks to popey at Snapcraft forum.
* | | | | Try to fix adopt-info.Lauri Ojansivu2019-08-291-5/+6
| | | | | | | | | | | | | | | | | | | | Thanks to xet7.
* | | | | v3.31v3.31Lauri Ojansivu2019-08-297-8/+18
| | | | |
* | | | | Try to fix adopt-info.Lauri Ojansivu2019-08-291-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://forum.snapcraft.io/t/dirty-snap-release/12975/8 Thanks to ogra at Snapcraft forum.
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://forum.snapcraft.io/t/dirty-snap-release/12975/4 Thanks to popey and daniel at Snapcraft forum.
* | | | | Delete another phantomjs binary from Snap.Lauri Ojansivu2019-08-291-0/+1
| | | | | | | | | | | | | | | | | | | | Thanks to xet7 !
* | | | | Revert fix dirty, because it caused Snap build to fail.Lauri Ojansivu2019-08-291-1/+1
|/ / / / | | | | | | | | | | | | Thanks to xet7 !
* | | | Fix dirty snap release.Lauri Ojansivu2019-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://stackoverflow.com/questions/16035240/why-is-git-describe-dirty-adding-a-dirty-suffix-when-describing-a-clean-ch https://forum.snapcraft.io/t/dirty-snap-release/12975 Thanks to xet7.
* | | | v3.29v3.29Lauri Ojansivu2019-08-295-5/+14
| | | |
* | | | Fix Snap.Lauri Ojansivu2019-08-293-11/+2
| | | | | | | | | | | | | | | | Thanks to xet7 !
* | | | 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
| | | | | | | | | | | | | | | | Thanks to xet7 !
* | | | 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 and added debugging launch.conf
| * | | Fixed endless compilation devcontainer, debuggingChristoph Jahn2019-08-285-7/+48
| | | |
* | | | Merge pull request #2659 from Scherdel/masterLauri Ojansivu2019-08-285-0/+232
|\| | | | |/ / |/| | Adds .devcontainer feature to debug and compile with vscode
| * | Merge branch 'master' of https://github.com/scherdel/wekanChristoph Jahn2019-08-280-0/+0
| |\ \
| | * | Devcontainer node-gyp fixChristoph Jahn2019-08-281-1/+3
| | | |