Merge pull request #1 from fguillot/master

Update from upstream

1 files changed, 46 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 153e4e64..a62c105a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 BUILD_DIR = /tmp
 
-CSS_APP = $(addprefix assets/css/src/, $(addsuffix .css, base links title table form button alert tooltip header board task comment subtask markdown listing activity dashboard pagination popover confirm sidebar responsive dropdown screenshot filters gantt))
+CSS_APP = $(addprefix assets/css/src/, $(addsuffix .css, base links title table form button alert tooltip header board task comment subtask markdown listing activity dashboard pagination popover confirm sidebar responsive dropdown upload filters gantt project files views))
 CSS_PRINT = $(addprefix assets/css/src/, $(addsuffix .css, print links table board task comment subtask markdown))
 CSS_VENDOR = $(addprefix assets/css/vendor/, $(addsuffix .css, jquery-ui.min jquery-ui-timepicker-addon.min chosen.min fullcalendar.min font-awesome.min c3.min))
 
-JS_APP = $(addprefix assets/js/src/, $(addsuffix .js, Popover Dropdown Tooltip Markdown Sidebar Search App Screenshot Calendar Board Swimlane Gantt Task TaskRepartitionChart UserRepartitionChart CumulativeFlowDiagram BurndownChart AvgTimeColumnChart TaskTimeColumnChart LeadCycleTimeChart Router))
-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))
-JS_LANG = $(addprefix assets/js/vendor/lang/, $(addsuffix .js, da de es fi fr hu id it ja nl nb pl pt pt-br ru sv sr th tr zh-cn))
+JS_APP = $(addprefix assets/js/src/, $(addsuffix .js, Popover Dropdown Tooltip Markdown Search App Screenshot FileUpload Calendar Board Column Swimlane Gantt Task Project Subtask TaskRepartitionChart UserRepartitionChart CumulativeFlowDiagram BurndownChart AvgTimeColumnChart TaskTimeColumnChart LeadCycleTimeChart CompareHoursColumnChart Router))
+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 jquery.textcomplete))
+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))
 
 all: css js
 
@@ -62,6 +62,7 @@ archive:
 	@ rm -rf ${BUILD_DIR}/kanboard/*.markdown
 	@ rm -rf ${BUILD_DIR}/kanboard/*.lock
 	@ rm -rf ${BUILD_DIR}/kanboard/*.json
+	@ rm -rf ${BUILD_DIR}/kanboard/.docker
 	@ cd ${BUILD_DIR}/kanboard && find ./vendor -name doc -type d -exec rm -rf {} +;
 	@ 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 {} +;
@@ -77,6 +78,37 @@ archive:
 	@ 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
+
 test-sqlite:
 	@ phpunit -c tests/units.sqlite.xml
 
@@ -97,7 +129,7 @@ sql:
 	@ mysqldump -uroot --quote-names --no-create-info --skip-comments --no-set-names kanboard settings >> app/Schema/Sql/mysql.sql
 	@ mysqldump -uroot --quote-names --no-create-info --skip-comments --no-set-names kanboard links >> app/Schema/Sql/mysql.sql
 
-	@ php -r "echo 'INSERT INTO users (username, password, is_admin) VALUES (\'admin\', \''.password_hash('admin', PASSWORD_DEFAULT).'\', \'1\');';" | \
+	@ php -r "echo 'INSERT INTO users (username, password, role) VALUES (\'admin\', \''.password_hash('admin', PASSWORD_DEFAULT).'\', \'app-admin\');';" | \
 	tee -a app/Schema/Sql/postgres.sql app/Schema/Sql/mysql.sql >/dev/null
 
 	@ let mysql_version=`echo 'select version from schema_version;' | mysql -N -uroot kanboard` ;\
@@ -106,4 +138,13 @@ sql:
 	@ let pg_version=`psql -U postgres -A -c 'copy(select version from schema_version) to stdout;' kanboard` ;\
 	echo "INSERT INTO schema_version VALUES ('$$pg_version');" >> app/Schema/Sql/postgres.sql
 
+docker-image:
+	@ docker build -t kanboard/kanboard:latest .
+
+docker-push:
+	@ docker push kanboard/kanboard:latest
+
+docker-run:
+	@ docker run -d --name kanboard -p 80:80 -t kanboard/kanboard:latest
+
 .PHONY: all