summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | v0.55v0.55Lauri Ojansivu2017-11-193-4/+4
| |
* | Add link to commit by xet7 to CHANGELOG invitation code fix.Lauri Ojansivu2017-11-191-1/+1
| |
* | Fix: Invitation /sign-up page did not show input for invitation code. Thanks ↵Lauri Ojansivu2017-11-192-2/+3
| | | | | | | | to xet7 !
* | Fix: Error after sending invitation and joining board:Lauri Ojansivu2017-11-192-3/+5
| | | | | | | | | | Exception while invoking method 'login' TypeError: Cannot read property 'loginDisabled' of undefined. Thanks to nztqa ! Closes #1331
* | Merge branch 'soohwa-add-rest-api-bettor-error-output' into develLauri Ojansivu2017-11-197-368/+611
|\ \ | | | | | | | | | REST API better error output. Thanks to soohwa ! Related #1037
| * | REST API better error output. Thanks to soohwa ! Related #1037Lauri Ojansivu2017-11-197-368/+611
|/| |
| * | Add REST API better error outputsoohwa2017-10-156-365/+607
| | |
* | | Fix: Helper to list boards for user. Thanks to milesibastos ! Closes #1326Lauri Ojansivu2017-11-192-5/+6
| | |
* | | Merge branch 'thuanpq-devel' into develLauri Ojansivu2017-11-1946-419/+831
|\ \ \ | | | | | | | | | | | | | | | | | | | | User Admin to Admin Panel: List users. Change: is user admin, name, fullname, email address, is user active. Not changing password yet. Thanks to thuanpq and xet7 ! Related #802
| * | | Update translations.Lauri Ojansivu2017-11-1935-357/+462
| | | |
| * | | User Admin to Admin Panel: List users.Lauri Ojansivu2017-11-191-1/+2
| | | | | | | | | | | | | | | | | | | | Change: is user admin, name, fullname, email address, is user active. Not changing password yet. Thanks to thuanpq and xet7 ! Related #802
| * | | Change admin panel header order to info people version.Lauri Ojansivu2017-11-191-4/+4
| | | |
| * | | Make Admin Panel People page text translateableLauri Ojansivu2017-11-192-15/+18
| | | |
| * | | Merge branch 'devel' of https://github.com/thuanpq/wekan into thuanpq-develLauri Ojansivu2017-11-189-60/+363
|/| | |
| * | | Fix Missing trailing comma in users.jsThuan Pham Quoc2017-11-161-1/+1
| | | |
| * | | Added update all user profile from admin panelThuan Pham Quoc2017-11-082-59/+81
| | | |
| * | | Updated users methods to get user id from client on updating user data, is ↵Thuan Pham Quoc2017-11-082-12/+13
| | | | | | | | | | | | | | | | aimed to support admin update other user profile
| * | | Added pagination to people management in admin panelThuan Pham Quoc2017-11-084-7/+55
| | | |
| * | | Added edit user from admin panelThuan Pham Quoc2017-11-072-22/+155
| | | |
| * | | Added people list in admin panel , just raw data right now, will add more ↵Thuan Pham Quoc2017-11-076-4/+102
| | | | | | | | | | | | | | | | features soon
| * | | Add .idea to .gitignoreThuan Pham Quoc2017-11-061-0/+1
| | |/ | |/|
* | | Merge branch 'brooksbecton-addMarkdownToTitle' into develLauri Ojansivu2017-11-186-11/+38
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | Markdown in card/minicard/checlist titles and checklist items. Next line: Shift+Enter. Submit: Enter. Closes #926. Fix: Emoji detection breaks MAC addresses. Closes #1248. Fix: Codeblocks should not be scanned for emoji. Closes #643. Fix: Whitespace trimming breaks Markdown code block indentation. Closes #1288. Thanks to brooksbecton !
| * | Markdown in card/minicard/checlist titlesLauri Ojansivu2017-11-181-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | and checklist items. Next line: Shift+Enter. Submit: Enter. Closes #926. Fix: Emoji detection breaks MAC addresses. Closes #1248. Fix: Codeblocks should not be scanned for emoji. Closes #643. Fix: Whitespace trimming breaks Markdown code block indentation. Closes #1288. Thanks to brooksbecton !