diff --git a/.gitattributes b/.gitattributes index 94b645886..71b226590 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,6 +7,7 @@ app/constants.php export-subst .scrutinizer.yml export-ignore .travis.yml export-ignore Dockerfile export-ignore +docker-compose.yml export-ignore Makefile export-ignore README.md export-ignore Vagrantfile export-ignore diff --git a/.travis.yml b/.travis.yml index 1c132a0b9..40af3ca87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,6 @@ before_script: - phpenv config-rm xdebug.ini - phpenv config-add tests/php.ini - composer install - - php -i script: - phpunit -c tests/units.$DB.xml diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index f45769499..c93c92f1e 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -29,7 +29,7 @@ Contributors: - [Daniel Raknes](https://github.com/danielraknes) - [David-Norris](https://github.com/David-Norris) - [Dmitry](https://github.com/dmkcv) -- [Djpadz](https://github.com/djpadz) +- [Dj Padzensky](https://github.com/djpadz) - [Draza (bdpsoft)](https://github.com/bdpsoft) - [Eskiso](https://github.com/eSkiSo) - [Esteban Monge](https://github.com/EstebanMonge) @@ -120,6 +120,7 @@ Contributors: - [Vladimir Babin](https://github.com/Chiliec) - [Yannick Ihmels](https://github.com/ihmels) - [Ybarc](https://github.com/ybarc) +- [Yu Yongwoo](https://github.com/uyu423) - [Yuichi Murata](https://github.com/yuichi1004) -There is also many people who have reported bugs or proposed awesome ideas. \ No newline at end of file +There is also many people who have reported bugs or proposed awesome ideas. diff --git a/ChangeLog b/ChangeLog index 54a28db7a..398ec499e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,14 +1,41 @@ -Version 1.0.27 (unreleased) +Version 1.0.28 (unreleased) +-------------- + +New features: + +* Search in activity stream +* Search in comments +* Search by task creator +* Added command line utility to reset user password and to disable 2FA + +Improvements: + +* Filter/Lexer/QueryBuilder refactoring + +Bug fixes: + +* Removed PHP notices in comment suppression view + +Version 1.0.27 -------------- New features: * Added Markdown editor -* Added letter avatar provider -* Added pluggable Avatar providers +* Added user avatars with pluggable system + - Default is a letter based avatar + - Gravatar + - Avatar Image upload +* Added Korean translation Improvements: +* Added more logging for LDAP client +* Improve schema migration process +* Improve notification configuration form +* Handle state in OAuth2 client +* Allow to use the original template in overridden templates +* Unification of the project header * Refactoring of Javascript code * Improve comments design * Improve task summary sections @@ -27,6 +54,7 @@ Improvements: Bug fixes: +* Fix bad unique constraints in Mysql table user_has_notifications * Force integer type for aggregated metrics (Burndown chart concat values instead of summing) * Fixes cycle time calculation when the start date is defined in the future * Access allowed to any tasks from the shared public board by changing the URL parameters diff --git a/Makefile b/Makefile index f44475f68..d3ccf4852 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ CSS_VENDOR = $(addprefix assets/css/vendor/, $(addsuffix .css, jquery-ui.min jqu JS_APP = $(addprefix assets/js/src/, $(addsuffix .js, Namespace App Dropdown Popover Notification Accordion Session Calendar AvgTimeColumnChart BurndownChart CompareHoursColumnChart CumulativeFlowDiagram LeadCycleTimeChart UserRepartitionChart TaskTimeColumnChart TaskRepartitionChart Gantt Column Markdown ProjectPermission ProjectCreation Screenshot FileUpload Search Task Subtask Swimlane BoardColumnView BoardColumnScrolling BoardHorizontalScrolling BoardCollapsedMode BoardDragAndDrop BoardTask BoardPolling Tooltip Bootstrap)) JS_VENDOR = $(addprefix assets/js/vendor/, $(addsuffix .js, jquery-1.11.3.min jquery-ui.min jquery-ui-timepicker-addon.min jquery.ui.touch-punch.min chosen.jquery.min moment.min fullcalendar.min mousetrap.min mousetrap-global-bind.min simplemde.min)) -JS_LANG = $(addprefix assets/js/vendor/lang/, $(addsuffix .js, cs da de es el fi fr hu id it ja nl nb pl pt pt-br ru sv sr th tr zh-cn)) +JS_LANG = $(addprefix assets/js/vendor/lang/, $(addsuffix .js, cs da de es el fi fr hu id it ja ko nl nb pl pt pt-br ru sv sr th tr zh-cn)) all: css js @@ -56,6 +56,7 @@ archive: @ rm -rf ${BUILD_DIR}/kanboard/Makefile @ rm -rf ${BUILD_DIR}/kanboard/Vagrantfile @ rm -rf ${BUILD_DIR}/kanboard/Dockerfile + @ rm -rf ${BUILD_DIR}/kanboard/docker-compose.yml @ rm -rf ${BUILD_DIR}/kanboard/.*.yml @ rm -rf ${BUILD_DIR}/kanboard/*.md @ rm -rf ${BUILD_DIR}/kanboard/*.markdown @@ -71,40 +72,12 @@ archive: @ find ${BUILD_DIR}/kanboard/vendor -name .travis.yml -delete @ find ${BUILD_DIR}/kanboard/vendor -name README.* -delete @ find ${BUILD_DIR}/kanboard/vendor -name .gitignore -delete - @ cd ${BUILD_DIR}/kanboard && sed -i.bak s/master/${version}/g app/constants.php && rm -f app/*.bak + @ cd ${BUILD_DIR}/kanboard && sed -i.bak 11s/.*/"define('APP_VERSION', '${version}');"/g app/constants.php && rm -f app/*.bak @ cd ${BUILD_DIR} && zip -r kanboard-${version}.zip kanboard > /dev/null @ cd ${BUILD_DIR} && mv kanboard-${version}.zip ${dst} @ cd ${dst} && if [ -L kanboard-latest.zip ]; then unlink kanboard-latest.zip; ln -s kanboard-${version}.zip kanboard-latest.zip; fi @ rm -rf ${BUILD_DIR}/kanboard -test-archive: - @ echo "Build archive with tests: version=${version}, destination=${dst}" - @ rm -rf ${BUILD_DIR}/kanboard ${BUILD_DIR}/kanboard-*.zip - @ cd ${BUILD_DIR} && git clone --depth 1 -q https://github.com/fguillot/kanboard.git - @ cd ${BUILD_DIR}/kanboard && composer --prefer-dist --optimize-autoloader --quiet install - @ rm -rf ${BUILD_DIR}/kanboard/data/* - @ rm -rf ${BUILD_DIR}/kanboard/.git* - @ rm -rf ${BUILD_DIR}/kanboard/.*.yml - @ rm -rf ${BUILD_DIR}/kanboard/*.md - @ rm -rf ${BUILD_DIR}/kanboard/*.markdown - @ rm -rf ${BUILD_DIR}/kanboard/Dockerfile - @ rm -rf ${BUILD_DIR}/kanboard/.docker - @ rm -rf ${BUILD_DIR}/kanboard/Vagrantfile - @ rm -rf ${BUILD_DIR}/kanboard/app.json - @ rm -rf ${BUILD_DIR}/kanboard/plugins/.gitignore - @ cd ${BUILD_DIR}/kanboard && find ./vendor -name notes -type d -exec rm -rf {} +; - @ cd ${BUILD_DIR}/kanboard && find ./vendor -name test -type d -exec rm -rf {} +; - @ cd ${BUILD_DIR}/kanboard && find ./vendor -name tests -type d -exec rm -rf {} +; - @ find ${BUILD_DIR}/kanboard/vendor -name composer.json -delete - @ find ${BUILD_DIR}/kanboard/vendor -name phpunit.xml -delete - @ find ${BUILD_DIR}/kanboard/vendor -name .travis.yml -delete - @ find ${BUILD_DIR}/kanboard/vendor -name README.* -delete - @ find ${BUILD_DIR}/kanboard/vendor -name .gitignore -delete - @ cd ${BUILD_DIR}/kanboard && sed -i.bak s/master/${version}/g app/constants.php && rm -f app/*.bak - @ cd ${BUILD_DIR} && zip -r kanboard-${version}.zip kanboard > /dev/null - @ cd ${BUILD_DIR} && mv kanboard-${version}.zip ${dst} - @ rm -rf ${BUILD_DIR}/kanboard - test-sqlite-coverage: @ phpunit --coverage-html /tmp/coverage --whitelist app/ -c tests/units.sqlite.xml diff --git a/README.md b/README.md index 9ca0c6169..42b80aa92 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Official website: - [Change Log](https://github.com/fguillot/kanboard/blob/master/ChangeLog) - [Documentation](https://github.com/fguillot/kanboard/blob/master/doc/index.markdown) -[![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy) +[![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy?template=https://github.com/fguillot/kanboard) Authors ------- diff --git a/Vagrantfile b/Vagrantfile index 63846c3d5..7db068e46 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,54 +1,16 @@ -$debian_script = <