diff --git a/.travis.yml b/.travis.yml index a7ce19d83..303181075 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,13 +29,13 @@ before_script: - mysql -e "create database IF NOT EXISTS ipeer_test;" -uroot script: vendor/bin/phing build-ci -deploy: - provider: releases - skip_cleanup: true - api_key: - secure: JqPtCTP6y1zJqmtShDvvQOSsQ/Vf5iAmk4wfIuw2ATV2puQH7/ojQNmLRb7b59Ek5dJzHzIx3RmK+JZtAPHV7HHEZ4sH0qhEM4GZQjmWre4fqmYS5+XnFjQ7C0iLYmVCklAQ3ziinzzESwrfVxtehq5/XNnt6kUCJorRvS22ee8= - file: ipeer-release.zip - on: - repo: ubc/iPeer - tags: true - php: 5.3 +#deploy: +# provider: releases +# skip_cleanup: true +# api_key: +# secure: JqPtCTP6y1zJqmtShDvvQOSsQ/Vf5iAmk4wfIuw2ATV2puQH7/ojQNmLRb7b59Ek5dJzHzIx3RmK+JZtAPHV7HHEZ4sH0qhEM4GZQjmWre4fqmYS5+XnFjQ7C0iLYmVCklAQ3ziinzzESwrfVxtehq5/XNnt6kUCJorRvS22ee8= +# file: ipeer-release.zip +# on: +# repo: ubc/iPeer +# tags: true +# php: 5.3 diff --git a/app/config/core.php b/app/config/core.php index 45017a690..be89350d4 100644 --- a/app/config/core.php +++ b/app/config/core.php @@ -343,7 +343,7 @@ $CWL['applicationID'] = ''; $CWL['applicationPassword'] = ''; - define('IPEER_VERSION', '3.1.9'); + define('IPEER_VERSION', '3.2.0'); /** diff --git a/readme.md b/readme.md index a7e000107..d2de4e6c9 100644 --- a/readme.md +++ b/readme.md @@ -76,6 +76,30 @@ Runing the tests: It is better not to touch the mouse or keyboard during the tests. +iPeer 3.2.0 +----------- +* Fixed wrong score calculation when using rubric with zero mark enabled +* Validated Rubric and Mixeval form data +* Fixed #532 permission issue when re-add user +* Fixed empty email body when there is no special merge field +* Commented out volume mount for ipeer app docker image +* Fixed the permission issue in docker image +* Added docker instructions to readme +* Added image directive in docker-compose +* Added AWS deployment script +* Added a simple health endpoint +* Added deployment instruction/scripts for GCE +* Removed config dir and database writable checking +* More strict checking for env vars +* Updateed build.xml and travis.yml to use environment vars +* Set default Session.model value +* Added web container for static file serving +* Updated cake guard +* Used table to detect installation and refactor installation +* Added docker support +* Updated translation file +* Updated deployment script for travis + iPeer 3.1.9 --------------------------- * Fixed #527 wrong grades calculated during the grade through API diff --git a/version.txt b/version.txt index 7148b0a99..944880fa1 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -3.1.9 +3.2.0