summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'devel'Lauri Ojansivu2018-05-282-29/+29
|\
| * Update translations.Lauri Ojansivu2018-05-282-29/+29
| |
* | Merge branch 'devel'Lauri Ojansivu2018-05-268-22/+47
|\|
| * v1.02v1.02Lauri Ojansivu2018-05-261-1/+1
| |
| * Merge branch 'devel' of github.com:wekan/wekan into develLauri Ojansivu2018-05-260-0/+0
| |\
| | * Update translations.Lauri Ojansivu2018-05-262-5/+5
| | |
| * | Update translations.Lauri Ojansivu2018-05-262-5/+5
| |/ | | | | | | Correction: Releasing Wekan v1.02
| * v1.0.2Lauri Ojansivu2018-05-263-4/+4
| |
| * Actually, without @latest it works the same.Lauri Ojansivu2018-05-261-1/+1
| |
| * Use latest npm.Lauri Ojansivu2018-05-262-2/+2
| |
| * Remove bcrypt, continued.Lauri Ojansivu2018-05-262-9/+17
| |
| * Merge branch 'xadagaras-bugfix/received_end_date_picker' into develLauri Ojansivu2018-05-262-5/+5
| |\
| | * - Fix Received Date and End Date on Cards.Lauri Ojansivu2018-05-261-2/+3
| | | | | | | | | | | | Thanks to xadagaras !
| | * Merge branch 'bugfix/received_end_date_picker' of ↵Lauri Ojansivu2018-05-261-3/+2
| |/| | | | | | | | | | https://github.com/xadagaras/wekan into xadagaras-bugfix/received_end_date_picker
| | * Extend editCardReceivedDatePopup and editCardEndDatePopup from DatePicker to ↵Daniel Kreuter2018-05-251-3/+2
| | | | | | | | | | | | fix #1654
| * | Merge branch 'kubiko-devel' into develLauri Ojansivu2018-05-262-2/+9
| |\ \
| | * | - Snap: Filtering out swap file created at build time, adding stage package.Lauri Ojansivu2018-05-261-2/+5
| | | | | | | | | | | | | | | | Thanks to kubiko !
| | * | Merge branch 'devel' of https://github.com/kubiko/wekan into kubiko-develLauri Ojansivu2018-05-261-0/+4
| |/| |
| | * | filtering out swap file created at build time, adding stage packageOndrej Kubik2018-05-251-0/+4
| | |/ | | | | | | | | | Signed-off-by: Ondrej Kubik <ondrej.kubik@canonical.com>
| * | - Removed binary version of bcrypt because of vulnerability that has issue ↵Lauri Ojansivu2018-05-261-2/+4
| | | | | | | | | | | | | | | | | | that is not fixed yet. This may cause some slowdown. Thanks to xet7 !
| * | Remove binary version of bcrypt because of security vulnerability.Lauri Ojansivu2018-05-261-0/+8
| |/ | | | | | | This may cause some slowdown.
* | Merge branch 'devel'Lauri Ojansivu2018-05-241-1/+0
|\|
| * Remove bcryptLauri Ojansivu2018-05-241-1/+0
| |
* | Merge branch 'devel'Lauri Ojansivu2018-05-242-9/+1
|\|
| * Go back to xss 0.3.8, because 1.0.0 did break snap build.Lauri Ojansivu2018-05-242-9/+1
| |
* | Merge branch 'devel'Lauri Ojansivu2018-05-245-0/+175
|\ \
| * | Merge remote-tracking branch 'upstream/devel' into develLauri Ojansivu2018-05-2455-228/+691
| |\|
| * | Added initial DJango 2.0.5 project config with pyjade, python 3.6.5 venv.SpeaKeasY2018-05-205-0/+175
| | |
* | | Merge branch 'devel'Lauri Ojansivu2018-05-242-1/+9
|\ \ \ | | |/ | |/|
| * | Merge branch 'greenkeeper/xss-1.0.0' into develLauri Ojansivu2018-05-242-1/+9
| |\ \
| | * | - Update xss to version 1.00Lauri Ojansivu2018-05-241-0/+8
| | | | | | | | | | | | | | | | Thanks to xet7 !
| | * | fix(package): update xss to version 1.0.0greenkeeper[bot]2018-05-241-1/+1
| |/ /
* | | Merge branch 'devel'Lauri Ojansivu2018-05-237-167/+151
|\| |
| * | v1.01v1.01Lauri Ojansivu2018-05-233-4/+4
| | |
| * | Update translations.Lauri Ojansivu2018-05-232-67/+67
| | |
| * | - Possible quickfix for all customFields Import errors, please test.Lauri Ojansivu2018-05-231-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Thanks to feuerball11 and xet7 ! Related #807 Closes #1652, closes #1651
| * | Fix lint errors.Lauri Ojansivu2018-05-231-104/+104
| | |
| * | lint correctionsIgnatz2018-05-231-164/+139
| | |
| * | possible quickfix for all customFields Import errorsIgnatz2018-05-231-0/+1
| | |
* | | Merge branch 'devel'Lauri Ojansivu2018-05-221-5/+8
|\| |
| * | More details to issue template.Lauri Ojansivu2018-05-221-5/+8
| | |
* | | Merge branch 'devel'Lauri Ojansivu2018-05-223-10/+7
|\| |
| * | Simplify issue templateLauri Ojansivu2018-05-221-4/+3
| | |
| * | Remove duplicate Contributing.mdLauri Ojansivu2018-05-222-6/+4
| | |
* | | Merge branch 'devel'Lauri Ojansivu2018-05-2145-46/+54
|\| |
| * | v1.00v1.00Lauri Ojansivu2018-05-213-3/+11
| | |
| * | Update translations.Lauri Ojansivu2018-05-2141-42/+42
| | |
| * | Fix typo.Lauri Ojansivu2018-05-211-1/+1
| | | | | | | | | | | | | | | | | | Thanks to yarons ! Closes #1647
* | | Merge branch 'devel'Lauri Ojansivu2018-05-2151-79/+502
|\| |
| * | v0.99v0.99Lauri Ojansivu2018-05-213-4/+4
| | |