summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'devel'Lauri Ojansivu2017-11-238-41/+49
|\
| * v0.58v0.58Lauri Ojansivu2017-11-233-2/+10
| |
| * Update translations.Lauri Ojansivu2017-11-235-39/+39
| |
* | Merge branch 'devel'Lauri Ojansivu2017-11-234-14/+23
|\|
| * v0.57v0.57Lauri Ojansivu2017-11-233-4/+4
| |
| * Fix Winston logger. Thanks to pierreozoux !Lauri Ojansivu2017-11-231-2/+8
| |
| * Merge branch 'pierreozoux-fix-logger' into develLauri Ojansivu2017-11-231-9/+6
| |\ | | | | | | | | | Fix logger. Thanks to pierreozoux !
| | * Merge branch 'fix-logger' of https://github.com/pierreozoux/wekan into ↵Lauri Ojansivu2017-11-231-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | pierreozoux-fix-logger Conflicts: server/logger.js
| | | * Try to fix buildpierreozoux2017-11-231-6/+1
| | | |
| | * | Merge branch 'fix-logger' of https://github.com/pierreozoux/wekan into ↵Lauri Ojansivu2017-11-231-9/+6
| |/| | | | | | | | | | | | | | pierreozoux-fix-logger
| | * | Try to fix buildpierreozoux2017-11-231-6/+1
| | |/
| | * Fix bug when LOGGER is enabled, but LOGGERS is empty.pierreozoux2017-11-221-2/+7
| | |
| | * Make logger enabled by defaultpierreozoux2017-11-221-1/+2
| | |
| | * Fix add logger bugpierreozoux2017-11-221-6/+2
| | | | | | | | | | | | | | | In case you want to have only the console, it will fail at the `Winston.add` as it is already there.
| * | Add Gogs Integration as separate project.Lauri Ojansivu2017-11-231-0/+6
| |/
| * Maybe github does not like : at bullet point.Lauri Ojansivu2017-11-211-6/+2
| |
| * Try to fix markdown. Is there bug at GitHub? It did combine bullet points to ↵Lauri Ojansivu2017-11-211-6/+10
| | | | | | | | same line.
| * Try to fix markdown.Lauri Ojansivu2017-11-211-6/+6
| |
| * Fix typo.Lauri Ojansivu2017-11-211-1/+1
| |
* | Merge branch 'devel'Lauri Ojansivu2017-11-2154-39/+1027
|\|
| * v0.56v0.56Lauri Ojansivu2017-11-213-4/+4
| |
| * Add bcrypt just to see if bson error goes away.Lauri Ojansivu2017-11-211-0/+1
| |
| * Merge branch 'thuanpq-card-spent-time' into develLauri Ojansivu2017-11-2150-33/+943
| |\ | | | | | | | | | Spent time/Overtime on card. Thanks to thuanpq ! Closes #1337
| | * Spent time/Overtime on card. Thanks to thuanpq ! Closes #1337Lauri Ojansivu2017-11-211-1/+3
| | |
| | * Update translations. Added Greek language.Lauri Ojansivu2017-11-2137-26/+725
| | |
| | * Merge branch 'card-spent-time' of https://github.com/thuanpq/wekan into ↵Lauri Ojansivu2017-11-2112-6/+215
| |/| | | | | | | | | | thuanpq-card-spent-time
| | * Added red-green circle to board lists item for indicating board which has ↵Thuan Pham Quoc2017-11-205-0/+47
| | | | | | | | | | | | overtime logs or normal spent time log
| | * Update spent time title to indicate Overtime or normal Spent timeThuan Pham Quoc2017-11-201-1/+5
| | |
| | * Add card spent time to log time what can be overtime or not (will support ↵Thuan Pham Quoc2017-11-208-6/+164
| | | | | | | | | | | | filtering in future)
| * | Merge branch 'couscous3-fix-title-editing-shift-key-firefox' into develLauri Ojansivu2017-11-212-2/+3
| |\ \ | | | | | | | | | | | | Card details: fix title editing with shift key. Thanks to couscous3 !
| | * | Card details: fix title editing with shift key. Thanks to couscous3 !Lauri Ojansivu2017-11-211-1/+2
| | | |
| | * | Merge branch 'fix-title-editing-shift-key-firefox' of ↵Lauri Ojansivu2017-11-211-1/+1
| |/| | | | | | | | | | | | | | https://github.com/couscous3/wekan into couscous3-fix-title-editing-shift-key-firefox
| | * | card detail: fix title editing with shift keycouscous32017-11-201-1/+1
| | |/ | | | | | | in firefox there is no global `event` object, therefore we should use the `evt` argument from the event handler
| * | Merge branch 'couscous3-remove-minicard-title-whitespace' into develLauri Ojansivu2017-11-212-2/+6
| |\ \
| | * | Remove erroneous minicard title whitespace. Thanks couscous3 !Lauri Ojansivu2017-11-211-2/+3
| | | |
| | * | Merge branch 'remove-minicard-title-whitespace' of ↵Lauri Ojansivu2017-11-211-0/+3
| |/| | | | | | | | | | | | | | https://github.com/couscous3/wekan into couscous3-remove-minicard-title-whitespace
| | * | remove erroneous minicard title whitespacecouscous32017-11-201-0/+3
| | |/ | | | | | | introduced by the markdown viewer in commit #309c1d0 (the markdown viewer uses <p> tags which have a margin-bottom)
| * | Merge branch 'thuanpq-fix-board-list-long-desc' into develLauri Ojansivu2017-11-212-0/+5
| |\ \ | | | | | | | | | | | | Fix: Board list with long-description boards not visible. Thanks thuanpq !
| | * | Board list with long-description boards not visible. Thanks thuanpq !Lauri Ojansivu2017-11-211-0/+4
| | | |
| | * | Merge branch 'fix-board-list-long-desc' of https://github.com/thuanpq/wekan ↵Lauri Ojansivu2017-11-211-0/+1
| |/| | | | | | | | | | | | | | into thuanpq-fix-board-list-long-desc
| | * | Fixed issue on board list with long-desc boardsThuan Pham Quoc2017-11-201-0/+1
| | |/
| * | Merge branch 'GhassenRjab-feature/copy-move-cards-x-boards' into develLauri Ojansivu2017-11-214-3/+70
| |\ \ | | |/ | |/| | | | | | | Copy/Move card to another board in Standalone Wekan. Thanks to GhassenRjab and thuanpq ! Closes #797
| | * Copy/Move card to another board in Standalone Wekan. Thanks to GhassenRjab ↵Lauri Ojansivu2017-11-211-0/+8
| | | | | | | | | | | | and thuanpq ! Closes #797
| | * Fix Copy/Move cards. Thanks to thuanpq !Lauri Ojansivu2017-11-212-3/+6
| | |
| | * Merge branch 'feature/copy-move-cards-x-boards' of ↵Lauri Ojansivu2017-11-203-3/+59
| |/| | | | | | | | | | https://github.com/GhassenRjab/wekan into GhassenRjab-feature/copy-move-cards-x-boards
| | * Hide list of boards in Copy|Move cards for Sandstorm usersGhassen Rjab2017-11-141-2/+8
| | |
| | * Move cards cross boardsGhassen Rjab2017-11-142-2/+6
| | |
| | * Copy cards cross boardsGhassen Rjab2017-11-142-1/+47
| | |
* | | Merge branch 'devel'Lauri Ojansivu2017-11-1960-784/+1470
|\| | | | | | | | | | | | | | Conflicts: sandstorm-pkgdef.capnp
| * | v0.55v0.55Lauri Ojansivu2017-11-193-4/+4
| | |