diff -Nru gridcoinresearch-3.7.12.0~stretch/CHANGELOG.md gridcoinresearch-3.7.13.0/CHANGELOG.md --- gridcoinresearch-3.7.12.0~stretch/CHANGELOG.md 2018-05-25 07:06:44.000000000 +0000 +++ gridcoinresearch-3.7.13.0/CHANGELOG.md 2018-06-05 05:15:09.000000000 +0000 @@ -4,6 +4,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [3.7.13.0] 2018-06-02, leisure +### Fixed + - Fix voting regression when done from the UI, #1133 (@Foggyx420). + ## [3.7.12.0] 2018-05-25, leisure ### Fixed @@ -436,4 +440,4 @@ ### Removed - Remove lots of dead, obsolete code. - Removed unused link dependencies: librt, boost_chrono, boost_date_time, libz - and libdl. \ No newline at end of file + and libdl. diff -Nru gridcoinresearch-3.7.12.0~stretch/configure.ac gridcoinresearch-3.7.13.0/configure.ac --- gridcoinresearch-3.7.12.0~stretch/configure.ac 2018-05-25 07:06:44.000000000 +0000 +++ gridcoinresearch-3.7.13.0/configure.ac 2018-06-05 05:15:09.000000000 +0000 @@ -2,7 +2,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 3) define(_CLIENT_VERSION_MINOR, 7) -define(_CLIENT_VERSION_REVISION, 12) +define(_CLIENT_VERSION_REVISION, 13) define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_IS_RELEASE, false) define(_COPYRIGHT_YEAR, 2018) diff -Nru gridcoinresearch-3.7.12.0~stretch/debian/changelog gridcoinresearch-3.7.13.0/debian/changelog --- gridcoinresearch-3.7.12.0~stretch/debian/changelog 2018-05-25 07:06:46.000000000 +0000 +++ gridcoinresearch-3.7.13.0/debian/changelog 2018-06-05 05:15:11.000000000 +0000 @@ -1,10 +1,17 @@ -gridcoinresearch (3.7.12.0~stretch-27~ubuntu14.04.1) trusty; urgency=low +gridcoinresearch (3.7.13.0-28~ubuntu14.04.1) trusty; urgency=low * Auto build. - -- Richard Leckinger Fri, 25 May 2018 07:06:46 +0000 + -- Richard Leckinger Tue, 05 Jun 2018 05:15:11 +0000 -gridcoinresearch (3.7.12.0~stretch-1) stretch; urgency=medium +gridcoinresearch (3.7.13.0-1) xenial; urgency=medium + + * Fixed + Fix voting regression when done from the UI, #1133 (@Foggyx420). + + -- Richard Leckinger Tue, 05 Jun 2018 17:05:00 +1200 + +gridcoinresearch (3.7.12.0-1) xenial; urgency=medium * Fixed Fixes for displaying on high DPI displays, #517 (@skcin). diff -Nru gridcoinresearch-3.7.12.0~stretch/debian/git-build-recipe.manifest gridcoinresearch-3.7.13.0/debian/git-build-recipe.manifest --- gridcoinresearch-3.7.12.0~stretch/debian/git-build-recipe.manifest 2018-05-25 07:06:46.000000000 +0000 +++ gridcoinresearch-3.7.13.0/debian/git-build-recipe.manifest 2018-06-05 05:15:11.000000000 +0000 @@ -1,3 +1,3 @@ -# git-build-recipe format 0.4 deb-version {debupstream}-27 -lp:~gridcoin/gridcoin git-commit:e2f1d5d9757ed06bee03bcdf19467dd5c02279b2 -merge packaging lp:~gridcoin/gridcoin git-commit:5e35d35e071338ea3521d71f9af1f5beda318f03 +# git-build-recipe format 0.4 deb-version {debupstream}-28 +lp:~gridcoin/gridcoin git-commit:9c821ca73a88e42b56b3ccca28576b5e7ea71a33 +merge packaging lp:~gridcoin/gridcoin git-commit:4709b00e7fe70e2638108dce5fefba44fa97356b diff -Nru gridcoinresearch-3.7.12.0~stretch/README.md gridcoinresearch-3.7.13.0/README.md --- gridcoinresearch-3.7.12.0~stretch/README.md 2018-05-25 07:06:44.000000000 +0000 +++ gridcoinresearch-3.7.13.0/README.md 2018-06-05 05:15:09.000000000 +0000 @@ -92,4 +92,4 @@ | Development | Staging | Master | |----------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------| -| [![Build Status](https://travis-ci.org/gridcoin/Gridcoin-Research.svg?branch=development)](https://travis-ci.org/gridcoin/Gridcoin-Research) | [![Build Status](https://travis-ci.org/gridcoin/Gridcoin-Research.svg?branch=staging)](https://travis-ci.org/gridcoin/Gridcoin-Research) | [![Build Status](https://travis-ci.org/gridcoin/Gridcoin-Research.svg?branch=master)](https://travis-ci.org/gridcoin/Gridcoin-Research) | +| [![Build Status](https://travis-ci.org/gridcoin-community/Gridcoin-Research.svg?branch=development)](https://travis-ci.org/gridcoin-community/Gridcoin-Research) | [![Build Status](https://travis-ci.org/gridcoin-community/Gridcoin-Research.svg?branch=staging)](https://travis-ci.org/gridcoin-community/Gridcoin-Research) | [![Build Status](https://travis-ci.org/gridcoin-community/Gridcoin-Research.svg?branch=master)](https://travis-ci.org/gridcoin-community/Gridcoin-Research) | diff -Nru gridcoinresearch-3.7.12.0~stretch/src/rpcblockchain.cpp gridcoinresearch-3.7.13.0/src/rpcblockchain.cpp --- gridcoinresearch-3.7.12.0~stretch/src/rpcblockchain.cpp 2018-05-25 07:06:44.000000000 +0000 +++ gridcoinresearch-3.7.13.0/src/rpcblockchain.cpp 2018-06-05 05:15:09.000000000 +0000 @@ -981,19 +981,19 @@ std::string ExecuteRPCCommand(std::string method, std::string arg1, std::string arg2, std::string arg3, std::string arg4, std::string arg5, std::string arg6) { Array params; - params.push_back(method); params.push_back(arg1); - params.push_back(arg2); + params.push_back(RoundFromString(arg2, 0)); params.push_back(arg3); params.push_back(arg4); - params.push_back(arg5); + params.push_back(RoundFromString(arg5, 0)); params.push_back(arg6); LogPrintf("Executing method %s\n",method); Value vResult; try { - vResult = execute(params,false); + if (method == "addpoll") + vResult = addpoll(params, false); } catch (std::exception& e) { @@ -1053,14 +1053,19 @@ std::string ExecuteRPCCommand(std::string method, std::string arg1, std::string arg2) { Array params; - params.push_back(method); params.push_back(arg1); - params.push_back(arg2); + + if (method == "vote") + params.push_back(arg2); LogPrintf("Executing method %s\n",method); Value vResult; try { - vResult = execute(params,false); + if (method == "vote") + vResult = vote(params,false); + + if (method == "rain") + vResult = rain(params,false); } catch (std::exception& e) {