[vz-dev] [volkszaehler/volkszaehler.org] a4ae8d: Use phpunit config to exclude slow group from test...
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: a4ae8d097fac82da804c37b3d482f11f2c0ae166 https://github.com/volkszaehler/volkszaehler.org/commit/a4ae8d097fac82da804c37b3d482f11f2c0ae166 Author: andig cpui...@gmx.de Date: 2014-07-13 (Sun, 13 Jul 2014) Changed paths: M .travis.yml M test/Tests/SetupPerformanceData.php M test/phpunit.xml Log Message: --- Use phpunit config to exclude slow group from testing Commit: d14c8ad7a90b35b2fd4dd65fdf2fb66589d497d0 https://github.com/volkszaehler/volkszaehler.org/commit/d14c8ad7a90b35b2fd4dd65fdf2fb66589d497d0 Author: Justin Otherguy jus...@justinotherguy.org Date: 2014-07-15 (Tue, 15 Jul 2014) Changed paths: M .travis.yml M test/Tests/SetupPerformanceData.php M test/phpunit.xml Log Message: --- Merge pull request #175 from andig/fix-phpunit-groups Use phpunit config to exclude slow group from testing Compare: https://github.com/volkszaehler/volkszaehler.org/compare/47e06cd67d89...d14c8ad7a90b
[vz-dev] [volkszaehler/volkszaehler.org] 0ab3ee: Add ability for JSON POST requests plus support .v...
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: 0ab3eec13973f6c1d8c109e2196361431cc61d95 https://github.com/volkszaehler/volkszaehler.org/commit/0ab3eec13973f6c1d8c109e2196361431cc61d95 Author: andig cpui...@gmx.de Date: 2014-07-09 (Wed, 09 Jul 2014) Changed paths: M misc/tools/vzclient Log Message: --- Add ability for JSON POST requests plus support .vzclient.conf on windows Commit: e7ea0b86e8d1eabe6911c213070a2d4470347521 https://github.com/volkszaehler/volkszaehler.org/commit/e7ea0b86e8d1eabe6911c213070a2d4470347521 Author: andig cpui...@gmx.de Date: 2014-07-10 (Thu, 10 Jul 2014) Changed paths: M lib/Volkszaehler/Controller/DataController.php M lib/Volkszaehler/Interpreter/Interpreter.php M lib/Volkszaehler/View/HTTP/Request.php Log Message: --- Add ability to ignore duplicate records (options=skipduplicates) and remove ability to add multiple channels from b111cfa2 Commit: 32f7749a19ee57990da55915983472c7e5ad4494 https://github.com/volkszaehler/volkszaehler.org/commit/32f7749a19ee57990da55915983472c7e5ad4494 Author: Justin Otherguy jus...@justinotherguy.org Date: 2014-08-04 (Mon, 04 Aug 2014) Changed paths: M lib/Volkszaehler/Controller/DataController.php M lib/Volkszaehler/Interpreter/Interpreter.php M lib/Volkszaehler/View/HTTP/Request.php M misc/tools/vzclient Log Message: --- Merge pull request #177 from andig/ignore-duplicates Improve insert performance Compare: https://github.com/volkszaehler/volkszaehler.org/compare/d14c8ad7a90b...32f7749a19ee
[vz-dev] [volkszaehler/vzlogger] 1259e6: Skip first entry on middleware duplicate entry exc...
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: 1259e6d1352cc59512948068085f2bf80e6ee603 https://github.com/volkszaehler/vzlogger/commit/1259e6d1352cc59512948068085f2bf80e6ee603 Author: andig cpui...@gmx.de Date: 2014-08-04 (Mon, 04 Aug 2014) Changed paths: M src/api/Volkszaehler.cpp Log Message: --- Skip first entry on middleware duplicate entry exception (+ formatting fix) Commit: 66db762c6e387a2df70f9fae3d103dc784569189 https://github.com/volkszaehler/vzlogger/commit/66db762c6e387a2df70f9fae3d103dc784569189 Author: andig cpui...@gmx.de Date: 2014-08-04 (Mon, 04 Aug 2014) Changed paths: M src/api/Volkszaehler.cpp Log Message: --- Formatting fixes Commit: 34fc23c6b06f0db72f18dffdd152a9fe100e9056 https://github.com/volkszaehler/vzlogger/commit/34fc23c6b06f0db72f18dffdd152a9fe100e9056 Author: Justin Otherguy jus...@justinotherguy.org Date: 2014-08-04 (Mon, 04 Aug 2014) Changed paths: M src/api/Volkszaehler.cpp Log Message: --- Merge pull request #36 from andig/fix-duplicates Skip first entry on middleware duplicate entry exception Compare: https://github.com/volkszaehler/vzlogger/compare/57e85f1d65c9...34fc23c6b06f
[vz-dev] [volkszaehler/volkszaehler.org] 4bd777: Avoid timestamp casted to string
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: 4bddd4a281ecf38a28f1c13dc3eea5ee7318 https://github.com/volkszaehler/volkszaehler.org/commit/4bddd4a281ecf38a28f1c13dc3eea5ee7318 Author: andig cpui...@gmx.de Date: 2014-09-02 (Tue, 02 Sep 2014) Changed paths: M lib/Volkszaehler/Interpreter/Interpreter.php Log Message: --- Avoid timestamp casted to string Commit: 65777a29c704a6743c0cfd8b8122ea35935d4f36 https://github.com/volkszaehler/volkszaehler.org/commit/65777a29c704a6743c0cfd8b8122ea35935d4f36 Author: jahir jh.git...@hirsch.ws Date: 2014-09-04 (Thu, 04 Sep 2014) Changed paths: M lib/Volkszaehler/Interpreter/Interpreter.php Log Message: --- Merge pull request #178 from andig/fix-bigint-conversion Avoid timestamp casted to string Compare: https://github.com/volkszaehler/volkszaehler.org/compare/32f7749a19ee...65777a29c704
[vz-dev] [volkszaehler/vzlogger] 1d4972: Remove foreground option, reformatted vzlogger.con...
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: 1d4972dbb3bfef2a7bec54d9b3d655f1f18c6c64 https://github.com/volkszaehler/vzlogger/commit/1d4972dbb3bfef2a7bec54d9b3d655f1f18c6c64 Author: andig cpui...@gmx.de Date: 2014-08-25 (Mon, 25 Aug 2014) Changed paths: M CMakeLists.txt M configure M configure.ac R etc/vzlogger-1.conf M etc/vzlogger.conf M include/Channel.hpp M include/Config_Options.hpp M include/MeterMap.hpp M src/Buffer.cpp M src/Channel.cpp M src/Config_Options.cpp M src/Meter.cpp M src/MeterMap.cpp M src/Obis.cpp M src/Options.cpp M src/Reading.cpp M src/api/CurlIF.cpp M src/api/MySmartGrid.cpp M src/api/Volkszaehler.cpp M src/local.cpp M src/protocols/MeterD0.cpp M src/protocols/MeterExec.cpp M src/protocols/MeterFile.cpp M src/protocols/MeterFluksoV2.cpp M src/protocols/MeterRandom.cpp M src/protocols/MeterS0.cpp M src/protocols/MeterSML.cpp M src/test.cpp M src/threads.cpp M src/vzlogger.cpp Log Message: --- Remove foreground option, reformatted vzlogger.conf, reformatted code Commit: 6b37a125bccbeb9365dc1835120cffa14ffdf5be https://github.com/volkszaehler/vzlogger/commit/6b37a125bccbeb9365dc1835120cffa14ffdf5be Author: Justin Otherguy jus...@justinotherguy.org Date: 2014-09-26 (Fri, 26 Sep 2014) Changed paths: M CMakeLists.txt M configure M configure.ac R etc/vzlogger-1.conf M etc/vzlogger.conf M include/Channel.hpp M include/Config_Options.hpp M include/MeterMap.hpp M src/Buffer.cpp M src/Channel.cpp M src/Config_Options.cpp M src/Meter.cpp M src/MeterMap.cpp M src/Obis.cpp M src/Options.cpp M src/Reading.cpp M src/api/CurlIF.cpp M src/api/MySmartGrid.cpp M src/api/Volkszaehler.cpp M src/local.cpp M src/protocols/MeterD0.cpp M src/protocols/MeterExec.cpp M src/protocols/MeterFile.cpp M src/protocols/MeterFluksoV2.cpp M src/protocols/MeterRandom.cpp M src/protocols/MeterS0.cpp M src/protocols/MeterSML.cpp M src/test.cpp M src/threads.cpp M src/vzlogger.cpp Log Message: --- Merge pull request #40 from andig/master-remove-foreground Remove foreground option, reformatted vzlogger.conf, reformatted code Compare: https://github.com/volkszaehler/vzlogger/compare/34fc23c6b06f...6b37a125bccb
[vz-dev] [volkszaehler/volkszaehler.org] a3c80f: Hide uncommon properties in edit dialog, too
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: a3c80f65645877a9a1f8ef90838d1f9edb766986 https://github.com/volkszaehler/volkszaehler.org/commit/a3c80f65645877a9a1f8ef90838d1f9edb766986 Author: andig cpui...@gmx.de Date: 2014-09-28 (Sun, 28 Sep 2014) Changed paths: M htdocs/frontend/javascripts/wui.js Log Message: --- Hide uncommon properties in edit dialog, too Commit: 8d15756475f7a92e2db8ee64d12b2f1bdff6fdb8 https://github.com/volkszaehler/volkszaehler.org/commit/8d15756475f7a92e2db8ee64d12b2f1bdff6fdb8 Author: Justin Otherguy jus...@justinotherguy.org Date: 2014-09-28 (Sun, 28 Sep 2014) Changed paths: M htdocs/frontend/javascripts/wui.js Log Message: --- Merge pull request #179 from andig/fix-hidden-props Hide uncommon properties in edit dialog, too Compare: https://github.com/volkszaehler/volkszaehler.org/compare/a374d1fbfa55...8d15756475f7
[vz-dev] [volkszaehler/vzlogger] 98b033: fix invalid uuid in example etc/vzlogger.conf
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: 98b0336feca26634cf494215e197af56c1e0f1bf https://github.com/volkszaehler/vzlogger/commit/98b0336feca26634cf494215e197af56c1e0f1bf Author: Thorben Thuermer r...@constancy.org Date: 2014-09-30 (Tue, 30 Sep 2014) Changed paths: M etc/vzlogger.conf Log Message: --- fix invalid uuid in example etc/vzlogger.conf Commit: f58f58859a7dbeeceeaf3851c02005674c047021 https://github.com/volkszaehler/vzlogger/commit/f58f58859a7dbeeceeaf3851c02005674c047021 Author: Justin Otherguy jus...@justinotherguy.org Date: 2014-09-30 (Tue, 30 Sep 2014) Changed paths: M etc/vzlogger.conf Log Message: --- Merge pull request #43 from r00t-/fixconfiguuid fix invalid uuid in example etc/vzlogger.conf Compare: https://github.com/volkszaehler/vzlogger/compare/ec5186e4ee53...f58f58859a7d
[vz-dev] [volkszaehler/volkszaehler.org] 97e730: Load jQuery over SSL- required to access installat...
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: 97e730193066d9ca83dc926b36f33a286900d23a https://github.com/volkszaehler/volkszaehler.org/commit/97e730193066d9ca83dc926b36f33a286900d23a Author: andig cpui...@gmx.de Date: 2014-10-21 (Tue, 21 Oct 2014) Changed paths: M htdocs/frontend/index.html Log Message: --- Load jQuery over SSL- required to access installation via SSL Commit: eceaec8709722526f1e48bba40af59123c20a509 https://github.com/volkszaehler/volkszaehler.org/commit/eceaec8709722526f1e48bba40af59123c20a509 Author: jahir jh.git...@hirsch.ws Date: 2014-10-21 (Tue, 21 Oct 2014) Changed paths: M htdocs/frontend/index.html Log Message: --- Merge pull request #186 from andig/ssl Load jQuery over SSL- required to access installation via SSL Compare: https://github.com/volkszaehler/volkszaehler.org/compare/232a1d8ba81a...eceaec870972
[vz-dev] [volkszaehler/vzlogger] 8feb97: Fix TD3511 and ISKRAemeco MT174 issues
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: 8feb9783ec9f446719494185d55a0750935c98ba https://github.com/volkszaehler/vzlogger/commit/8feb9783ec9f446719494185d55a0750935c98ba Author: andig cpui...@gmx.de Date: 2014-11-02 (Sun, 02 Nov 2014) Changed paths: M CMakeLists.txt M src/Meter.cpp M src/Obis.cpp M src/protocols/MeterD0.cpp Log Message: --- Fix TD3511 and ISKRAemeco MT174 issues Code reformatted Commit: a15360a377eb180c74c781cc6ca524303a262379 https://github.com/volkszaehler/vzlogger/commit/a15360a377eb180c74c781cc6ca524303a262379 Author: andig cpui...@gmx.de Date: 2014-11-03 (Mon, 03 Nov 2014) Changed paths: M CMakeLists.txt M src/Meter.cpp M src/Obis.cpp M src/protocols/MeterD0.cpp Log Message: --- Merge pull request #52 from andig/td3511-v2 Fix TD3511 and ISKRAemeco MT174 issues Compare: https://github.com/volkszaehler/vzlogger/compare/e632fda63952...a15360a377eb
[vz-dev] [volkszaehler/vzlogger] 6e305a: Fix obis parsing failing on hex digits (thanks to ...
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: 6e305a7a7460aed4a026fe5028dd9c074984e271 https://github.com/volkszaehler/vzlogger/commit/6e305a7a7460aed4a026fe5028dd9c074984e271 Author: andig cpui...@gmx.de Date: 2014-11-12 (Wed, 12 Nov 2014) Changed paths: M CMakeLists.txt M src/Obis.cpp Log Message: --- Fix obis parsing failing on hex digits (thanks to Udo) Commit: b0349403037d1619997255ccca85a4794a791e2d https://github.com/volkszaehler/vzlogger/commit/b0349403037d1619997255ccca85a4794a791e2d Author: andig cpui...@gmx.de Date: 2014-11-12 (Wed, 12 Nov 2014) Changed paths: M CMakeLists.txt M src/Obis.cpp Log Message: --- Merge pull request #55 from andig/fix-obis Fix obis parsing failing on hex digits Compare: https://github.com/volkszaehler/vzlogger/compare/13875bb5e342...b0349403037d
[vz-dev] [volkszaehler/vzlogger] dc2161: googletest framework from ext svn
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: dc2161907fd8eea09364e1f5955199efd59c8fa3 https://github.com/volkszaehler/vzlogger/commit/dc2161907fd8eea09364e1f5955199efd59c8fa3 Author: Matthias Behr mb...@mcbehr.de Date: 2014-11-12 (Wed, 12 Nov 2014) Changed paths: M .travis.yml M CMakeLists.txt A gtest/CMakeLists.txt A tests/CMakeLists.txt A tests/example_test.cpp Log Message: --- googletest framework from ext svn Commit: 76e94e0e1b7bbb755e99056021efd705052a4165 https://github.com/volkszaehler/vzlogger/commit/76e94e0e1b7bbb755e99056021efd705052a4165 Author: Matthias Behr mb...@mcbehr.de Date: 2014-11-12 (Wed, 12 Nov 2014) Changed paths: M tests/CMakeLists.txt A tests/MeterD0.cpp Log Message: --- first real tests for meterD0 handling Commit: 5cd52226e72f7bcd79b1661e7063b274330f4aea https://github.com/volkszaehler/vzlogger/commit/5cd52226e72f7bcd79b1661e7063b274330f4aea Author: andig cpui...@gmx.de Date: 2014-11-12 (Wed, 12 Nov 2014) Changed paths: M .travis.yml M CMakeLists.txt A gtest/CMakeLists.txt A tests/CMakeLists.txt A tests/MeterD0.cpp A tests/example_test.cpp Log Message: --- Merge pull request #57 from mbehr1/meterD0test3 googletest framework from ext svn Compare: https://github.com/volkszaehler/vzlogger/compare/b0349403037d...5cd52226e72f
[vz-dev] [volkszaehler/vzlogger] b3528f: disable googletest based unit tests if subversion/...
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: b3528fe3522bdb5bb721f73a8469ab543bc55352 https://github.com/volkszaehler/vzlogger/commit/b3528fe3522bdb5bb721f73a8469ab543bc55352 Author: Matthias Behr mb...@mcbehr.de Date: 2014-11-30 (Sun, 30 Nov 2014) Changed paths: M CMakeLists.txt Log Message: --- disable googletest based unit tests if subversion/svn not installed. Commit: ac0ac26a1e237d98ff3322c25c6262007dd67274 https://github.com/volkszaehler/vzlogger/commit/ac0ac26a1e237d98ff3322c25c6262007dd67274 Author: andig cpui...@gmx.de Date: 2014-11-30 (Sun, 30 Nov 2014) Changed paths: M CMakeLists.txt Log Message: --- Merge pull request #61 from mbehr1/svn_detect disable googletest based unit tests if subversion/svn not installed. Compare: https://github.com/volkszaehler/vzlogger/compare/5cd52226e72f...ac0ac26a1e23
[vz-dev] [volkszaehler/vzlogger]
Branch: refs/heads/v0.4.0 Home: https://github.com/volkszaehler/vzlogger
[vz-dev] [volkszaehler/vzlogger]
Branch: refs/heads/v0.4.0 Home: https://github.com/volkszaehler/vzlogger
[vz-dev] [volkszaehler/vzlogger]
Branch: refs/tags/0.4.0 Home: https://github.com/volkszaehler/vzlogger
[vz-dev] [volkszaehler/vzlogger] 89a81a: corrected a minor typo
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: 89a81acb2ccc65cba6a6c360895260b283dc86e7 https://github.com/volkszaehler/vzlogger/commit/89a81acb2ccc65cba6a6c360895260b283dc86e7 Author: Justin Otherguy jus...@justinotherguy.org Date: 2014-12-29 (Mon, 29 Dec 2014) Changed paths: M debian/control Log Message: --- corrected a minor typo
[vz-dev] [volkszaehler/vzlogger] d8ddf0: fix cmake -DENABLE_LOCAL=on (to generate #define ...
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: d8ddf05cb0f04afb20d049eceabeb20bbc5b04ec https://github.com/volkszaehler/vzlogger/commit/d8ddf05cb0f04afb20d049eceabeb20bbc5b04ec Author: r00t- r...@constancy.org Date: 2014-12-29 (Mon, 29 Dec 2014) Changed paths: M CMakeLists.txt Log Message: --- fix cmake -DENABLE_LOCAL=on (to generate #define LOCAL_SUPPORT 1 in config.h) Commit: 69c589d9744b253838048c6df9db39911b42b48f https://github.com/volkszaehler/vzlogger/commit/69c589d9744b253838048c6df9db39911b42b48f Author: andig cpui...@gmx.de Date: 2014-12-29 (Mon, 29 Dec 2014) Changed paths: M CMakeLists.txt Log Message: --- Merge pull request #87 from r00t-/fix_cmake_local fix cmake -DENABLE_LOCAL=on Compare: https://github.com/volkszaehler/vzlogger/compare/4612a3d66a11...69c589d9744b
[vz-dev] [volkszaehler/volkszaehler.org] 6ae36e: inherit protocol for jquery inclusion, don't force...
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: 6ae36ea3ae5c499e598c213028d3c75feed8 https://github.com/volkszaehler/volkszaehler.org/commit/6ae36ea3ae5c499e598c213028d3c75feed8 Author: Thorben Thuermer r...@constancy.org Date: 2014-12-29 (Mon, 29 Dec 2014) Changed paths: M htdocs/frontend/index.html Log Message: --- inherit protocol for jquery inclusion, don't force https Commit: 67978a75ca2316c757e5f2e13e0bf25f22ff9c3e https://github.com/volkszaehler/volkszaehler.org/commit/67978a75ca2316c757e5f2e13e0bf25f22ff9c3e Author: andig cpui...@gmx.de Date: 2014-12-29 (Mon, 29 Dec 2014) Changed paths: M htdocs/frontend/index.html Log Message: --- Merge pull request #200 from r00t-/master inherit protocol for jquery inclusion, don't force https Compare: https://github.com/volkszaehler/volkszaehler.org/compare/138307ce14d9...67978a75ca23
[vz-dev] [volkszaehler/volkszaehler.org] 7a180e: Parse URL Options and use this for retrieving data...
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: 7a180e9e259f81089f167afbcead20928ea8ea10 https://github.com/volkszaehler/volkszaehler.org/commit/7a180e9e259f81089f167afbcead20928ea8ea10 Author: schoby schoby@penguin-Air Date: 2014-12-29 (Mon, 29 Dec 2014) Changed paths: M htdocs/frontend/javascripts/entities.js M htdocs/frontend/javascripts/functions.js Log Message: --- Parse URL Options and use this for retrieving data from data controller. A possible example for an URL option would be options=exact - so this way you get exact values by the risk of getting an empty diagram. Commit: dc37fb937700e6c8655573a594d861557c580e68 https://github.com/volkszaehler/volkszaehler.org/commit/dc37fb937700e6c8655573a594d861557c580e68 Author: andig cpui...@gmx.de Date: 2014-12-29 (Mon, 29 Dec 2014) Changed paths: M htdocs/frontend/javascripts/entities.js M htdocs/frontend/javascripts/functions.js Log Message: --- Merge pull request #203 from schoby1/master Parse URL Options and use this for retrieving data from data controller. Compare: https://github.com/volkszaehler/volkszaehler.org/compare/67978a75ca23...dc37fb937700
[vz-dev] [volkszaehler/vzlogger] bf8c31: added unit tests for Volkszaehler api_parse_except...
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: bf8c318a36add7dc5307ad89a6a4bc7a9c7cd530 https://github.com/volkszaehler/vzlogger/commit/bf8c318a36add7dc5307ad89a6a4bc7a9c7cd530 Author: Matthias Behr mb...@mcbehr.de Date: 2014-12-29 (Mon, 29 Dec 2014) Changed paths: M include/api/Volkszaehler.hpp M tests/CMakeLists.txt A tests/ut_api_volkszaehler.cpp Log Message: --- added unit tests for Volkszaehler api_parse_exception Commit: 48e8dc0f0bfd929019ef40e83d0f51a6721a1ec4 https://github.com/volkszaehler/vzlogger/commit/48e8dc0f0bfd929019ef40e83d0f51a6721a1ec4 Author: Matthias Behr mb...@mcbehr.de Date: 2014-12-29 (Mon, 29 Dec 2014) Changed paths: M tests/ut_api_volkszaehler.cpp Log Message: --- fixed int vs. long comp Commit: fd9ec3eb57c1ea6d52646a2e580ea34053fd4033 https://github.com/volkszaehler/vzlogger/commit/fd9ec3eb57c1ea6d52646a2e580ea34053fd4033 Author: r00t- r...@constancy.org Date: 2014-12-30 (Tue, 30 Dec 2014) Changed paths: M include/api/Volkszaehler.hpp M tests/CMakeLists.txt A tests/ut_api_volkszaehler.cpp Log Message: --- Merge pull request #88 from mbehr1/ut_api_volkszaehler Unit tests volkszaehler api_parse_exception Compare: https://github.com/volkszaehler/vzlogger/compare/69c589d9744b...fd9ec3eb57c1
[vz-dev] [volkszaehler/vzlogger] 3e59e4: add git version info
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: 3e59e4c3f409ae7e051b7c5a8ddc50eb1ac9db0b https://github.com/volkszaehler/vzlogger/commit/3e59e4c3f409ae7e051b7c5a8ddc50eb1ac9db0b Author: Matthias Behr mb...@mcbehr.de Date: 2014-12-29 (Mon, 29 Dec 2014) Changed paths: M CMakeLists.txt A include/gitSha1.h A modules/GetGitRevisionDescription.cmake A modules/GetGitRevisionDescription.cmake.in M src/CMakeLists.txt A src/gitSha1.cpp.in M src/vzlogger.cpp Log Message: --- add git version info Commit: f9e8e0c917ad4f3b37ff42a4098f61963a73a06a https://github.com/volkszaehler/vzlogger/commit/f9e8e0c917ad4f3b37ff42a4098f61963a73a06a Author: andig cpui...@gmx.de Date: 2014-12-30 (Tue, 30 Dec 2014) Changed paths: M CMakeLists.txt A include/gitSha1.h A modules/GetGitRevisionDescription.cmake A modules/GetGitRevisionDescription.cmake.in M src/CMakeLists.txt A src/gitSha1.cpp.in M src/vzlogger.cpp Log Message: --- Merge pull request #83 from mbehr1/fix_80_version_info add git version info Compare: https://github.com/volkszaehler/vzlogger/compare/fd9ec3eb57c1...f9e8e0c917ad
[vz-dev] [volkszaehler/volkszaehler.org] b1ce5f: Introduce unit scale for better managing energy (k...
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: b1ce5f5d440407295396c69246988c195b6f6114 https://github.com/volkszaehler/volkszaehler.org/commit/b1ce5f5d440407295396c69246988c195b6f6114 Author: andig cpui...@gmx.de Date: 2014-12-30 (Tue, 30 Dec 2014) Changed paths: M htdocs/frontend/index.html M htdocs/frontend/javascripts/entity.js M htdocs/frontend/javascripts/init.js M htdocs/frontend/javascripts/wui.js M lib/Volkszaehler/Definition/Definition.php M lib/Volkszaehler/Definition/EntityDefinition.json M lib/Volkszaehler/Definition/EntityDefinition.php A lib/Volkszaehler/Definition/README.md M lib/Volkszaehler/Interpreter/CounterInterpreter.php M lib/Volkszaehler/Interpreter/Interpreter.php M lib/Volkszaehler/Interpreter/MeterInterpreter.php M lib/Volkszaehler/Interpreter/SensorInterpreter.php M lib/bootstrap.php Log Message: --- Introduce unit scale for better managing energy (kW) vs. flow units (e.g. m3) Commit: 236f8e0c4e172d00578e10c52c711f12692ae265 https://github.com/volkszaehler/volkszaehler.org/commit/236f8e0c4e172d00578e10c52c711f12692ae265 Author: andig cpui...@gmx.de Date: 2014-12-31 (Wed, 31 Dec 2014) Changed paths: M htdocs/frontend/index.html M htdocs/frontend/javascripts/entity.js M htdocs/frontend/javascripts/init.js M htdocs/frontend/javascripts/wui.js M lib/Volkszaehler/Definition/Definition.php M lib/Volkszaehler/Definition/EntityDefinition.json M lib/Volkszaehler/Definition/EntityDefinition.php A lib/Volkszaehler/Definition/README.md M lib/Volkszaehler/Interpreter/CounterInterpreter.php M lib/Volkszaehler/Interpreter/Interpreter.php M lib/Volkszaehler/Interpreter/MeterInterpreter.php M lib/Volkszaehler/Interpreter/SensorInterpreter.php M lib/bootstrap.php Log Message: --- Merge pull request #201 from andig/fix-flow-units Introduce unit scale for better managing energy (kW) vs. flow units (m3) Compare: https://github.com/volkszaehler/volkszaehler.org/compare/794cbe6e9356...236f8e0c4e17
[vz-dev] [volkszaehler/vzlogger] 022b60: disabled googlemock and googletest on gcc 4.8
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: 022b60935e766529b45a27579036c88ec775d470 https://github.com/volkszaehler/vzlogger/commit/022b60935e766529b45a27579036c88ec775d470 Author: Matthias Behr mb...@mcbehr.de Date: 2015-01-01 (Thu, 01 Jan 2015) Changed paths: M CMakeLists.txt Log Message: --- disabled googlemock and googletest on gcc 4.8 Commit: df069806daee4d13d1ef266b383fb351223c7fdf https://github.com/volkszaehler/vzlogger/commit/df069806daee4d13d1ef266b383fb351223c7fdf Author: andig cpui...@gmx.de Date: 2015-01-01 (Thu, 01 Jan 2015) Changed paths: M CMakeLists.txt Log Message: --- Merge pull request #95 from mbehr1/disable_googlemock_gcc_l_48 disabled googlemock and googletest on gcc 4.8 Compare: https://github.com/volkszaehler/vzlogger/compare/214a702e2955...df069806daee
[vz-dev] [volkszaehler/volkszaehler.org]
Branch: refs/heads/andig-patch-1 Home: https://github.com/volkszaehler/volkszaehler.org
[vz-dev] [volkszaehler/volkszaehler.org] 62a83b: Fix mixed content security warning in FireFox
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: 62a83b2cef4fdc4c1b348e07b772943c039898df https://github.com/volkszaehler/volkszaehler.org/commit/62a83b2cef4fdc4c1b348e07b772943c039898df Author: andig cpui...@gmx.de Date: 2015-01-25 (Sun, 25 Jan 2015) Changed paths: M htdocs/frontend/javascripts/options.js Log Message: --- Fix mixed content security warning in FireFox Commit: 14e5011c9acb2e412e76be4ac64f4a0412790bfb https://github.com/volkszaehler/volkszaehler.org/commit/14e5011c9acb2e412e76be4ac64f4a0412790bfb Author: andig cpui...@gmx.de Date: 2015-01-26 (Mon, 26 Jan 2015) Changed paths: M htdocs/frontend/javascripts/options.js Log Message: --- Merge pull request #232 from volkszaehler/andig-patch-1 Fix mixed content security warning in FireFox Compare: https://github.com/volkszaehler/volkszaehler.org/compare/e5d8c0b6a9f7...14e5011c9acb
[vz-dev] [volkszaehler/volkszaehler.org] 52d495: Various performance improvements (cache entities, ...
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: 52d4957ff1a20f56140e13556193a2020a629428 https://github.com/volkszaehler/volkszaehler.org/commit/52d4957ff1a20f56140e13556193a2020a629428 Author: andig cpui...@gmx.de Date: 2015-01-21 (Wed, 21 Jan 2015) Changed paths: M etc/volkszaehler.conf.template.php M lib/Volkszaehler/Controller/Controller.php M lib/Volkszaehler/Controller/DataController.php M lib/Volkszaehler/Controller/EntityController.php M lib/Volkszaehler/Definition/Definition.php M lib/Volkszaehler/Interpreter/AggregatorInterpreter.php M lib/Volkszaehler/Interpreter/CounterInterpreter.php M lib/Volkszaehler/Interpreter/Interpreter.php M lib/Volkszaehler/Interpreter/MeterInterpreter.php M lib/Volkszaehler/Interpreter/SensorInterpreter.php M lib/Volkszaehler/Router.php M lib/Volkszaehler/View/CSV.php M lib/Volkszaehler/View/JSON.php M lib/Volkszaehler/View/JpGraph.php M lib/Volkszaehler/View/XML.php Log Message: --- Various performance improvements (cache entities, entity and property definitions, use Iterators instead of callbacks) Commit: 6a891e3d5a5bd00a8ab9a4e9e60825b5d5164f4d https://github.com/volkszaehler/volkszaehler.org/commit/6a891e3d5a5bd00a8ab9a4e9e60825b5d5164f4d Author: andig cpui...@gmx.de Date: 2015-01-22 (Thu, 22 Jan 2015) Changed paths: M lib/Volkszaehler/Controller/DataController.php Log Message: --- Always use SQL instead of Doctrine for performance Commit: e5d8c0b6a9f733714c207e3c16cfd5fd56fc3078 https://github.com/volkszaehler/volkszaehler.org/commit/e5d8c0b6a9f733714c207e3c16cfd5fd56fc3078 Author: jahir jh.git...@hirsch.ws Date: 2015-01-24 (Sat, 24 Jan 2015) Changed paths: M etc/volkszaehler.conf.template.php M lib/Volkszaehler/Controller/Controller.php M lib/Volkszaehler/Controller/DataController.php M lib/Volkszaehler/Controller/EntityController.php M lib/Volkszaehler/Definition/Definition.php M lib/Volkszaehler/Interpreter/AggregatorInterpreter.php M lib/Volkszaehler/Interpreter/CounterInterpreter.php M lib/Volkszaehler/Interpreter/Interpreter.php M lib/Volkszaehler/Interpreter/MeterInterpreter.php M lib/Volkszaehler/Interpreter/SensorInterpreter.php M lib/Volkszaehler/Router.php M lib/Volkszaehler/View/CSV.php M lib/Volkszaehler/View/JSON.php M lib/Volkszaehler/View/JpGraph.php M lib/Volkszaehler/View/XML.php Log Message: --- Merge pull request #228 from andig/cache-entities Various performance improvements (cache entities, entity and properties) Compare: https://github.com/volkszaehler/volkszaehler.org/compare/954baea0c267...e5d8c0b6a9f7
[vz-dev] [volkszaehler/volkszaehler.org] 39301c: Extended installation instructions
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: 39301c7a7ffc841eaa9787c790401b75cec7bc7c https://github.com/volkszaehler/volkszaehler.org/commit/39301c7a7ffc841eaa9787c790401b75cec7bc7c Author: Jakob Hirsch j...@plonk.de Date: 2015-01-14 (Wed, 14 Jan 2015) Changed paths: M INSTALL Log Message: --- Extended installation instructions The old instructions were a little unclear, because with the first method listed on getcomposer.org you won't be able to simply use composer install Commit: c1f2d248997fcc788dfa82e567f3dc9c0cd20ba6 https://github.com/volkszaehler/volkszaehler.org/commit/c1f2d248997fcc788dfa82e567f3dc9c0cd20ba6 Author: andig cpui...@gmx.de Date: 2015-01-14 (Wed, 14 Jan 2015) Changed paths: M INSTALL Log Message: --- Merge pull request #223 from jahir/master Extended installation instructions Compare: https://github.com/volkszaehler/volkszaehler.org/compare/92b2f91745c5...c1f2d248997f
[vz-dev] [volkszaehler/volkszaehler.org] 96b974: Fix axis handling
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: 96b9746a20b89c88c73fcb15b8dda8b2505bbdaf https://github.com/volkszaehler/volkszaehler.org/commit/96b9746a20b89c88c73fcb15b8dda8b2505bbdaf Author: andig cpui...@gmx.de Date: 2015-01-20 (Tue, 20 Jan 2015) Changed paths: M htdocs/frontend/javascripts/entity.js M htdocs/frontend/javascripts/wui.js Log Message: --- Fix axis handling Commit: 290f4c803a7b6042cc0632f9b90d1db1cd0141a9 https://github.com/volkszaehler/volkszaehler.org/commit/290f4c803a7b6042cc0632f9b90d1db1cd0141a9 Author: andig cpui...@gmx.de Date: 2015-01-20 (Tue, 20 Jan 2015) Changed paths: M htdocs/frontend/javascripts/entity.js M htdocs/frontend/javascripts/wui.js Log Message: --- Merge pull request #224 from andig/fix-negatives Fix axis handling Compare: https://github.com/volkszaehler/volkszaehler.org/compare/e50a49abfb94...290f4c803a7b
[vz-dev] [volkszaehler/volkszaehler.org] 7cdd37: Fix options name
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: 7cdd3786eaf19f34bbb63205b8893eb08ce9029f https://github.com/volkszaehler/volkszaehler.org/commit/7cdd3786eaf19f34bbb63205b8893eb08ce9029f Author: andig cpui...@gmx.de Date: 2015-01-20 (Tue, 20 Jan 2015) Changed paths: M htdocs/frontend/javascripts/entities.js Log Message: --- Fix options name Commit: 954baea0c2678ca230102a5bfb60a13a87edddaa https://github.com/volkszaehler/volkszaehler.org/commit/954baea0c2678ca230102a5bfb60a13a87edddaa Author: andig cpui...@gmx.de Date: 2015-01-20 (Tue, 20 Jan 2015) Changed paths: M htdocs/frontend/javascripts/entities.js Log Message: --- Merge pull request #226 from andig/fix-totals Fix options name Compare: https://github.com/volkszaehler/volkszaehler.org/compare/290f4c803a7b...954baea0c267
[vz-dev] [volkszaehler/volkszaehler.org] c6ca3c: Various performance improvements (cache entities, ...
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: c6ca3cfa07a92ea8b16895d3854063f2ea4967d8 https://github.com/volkszaehler/volkszaehler.org/commit/c6ca3cfa07a92ea8b16895d3854063f2ea4967d8 Author: andig cpui...@gmx.de Date: 2015-01-20 (Tue, 20 Jan 2015) Changed paths: M etc/volkszaehler.conf.template.php M lib/Volkszaehler/Controller/Controller.php M lib/Volkszaehler/Controller/DataController.php M lib/Volkszaehler/Controller/EntityController.php M lib/Volkszaehler/Definition/Definition.php M lib/Volkszaehler/Interpreter/AggregatorInterpreter.php M lib/Volkszaehler/Interpreter/CounterInterpreter.php M lib/Volkszaehler/Interpreter/Interpreter.php M lib/Volkszaehler/Interpreter/MeterInterpreter.php M lib/Volkszaehler/Interpreter/SensorInterpreter.php M lib/Volkszaehler/Router.php M lib/Volkszaehler/View/CSV.php M lib/Volkszaehler/View/JSON.php M lib/Volkszaehler/View/JpGraph.php M lib/Volkszaehler/View/XML.php Log Message: --- Various performance improvements (cache entities, entity and property definitions, use Iterators instead of callbacks) Commit: e0d0f08d54296e1146608773b8c4d65935e15f28 https://github.com/volkszaehler/volkszaehler.org/commit/e0d0f08d54296e1146608773b8c4d65935e15f28 Author: jahir jh.git...@hirsch.ws Date: 2015-01-20 (Tue, 20 Jan 2015) Changed paths: M etc/volkszaehler.conf.template.php M lib/Volkszaehler/Controller/Controller.php M lib/Volkszaehler/Controller/DataController.php M lib/Volkszaehler/Controller/EntityController.php M lib/Volkszaehler/Definition/Definition.php M lib/Volkszaehler/Interpreter/AggregatorInterpreter.php M lib/Volkszaehler/Interpreter/CounterInterpreter.php M lib/Volkszaehler/Interpreter/Interpreter.php M lib/Volkszaehler/Interpreter/MeterInterpreter.php M lib/Volkszaehler/Interpreter/SensorInterpreter.php M lib/Volkszaehler/Router.php M lib/Volkszaehler/View/CSV.php M lib/Volkszaehler/View/JSON.php M lib/Volkszaehler/View/JpGraph.php M lib/Volkszaehler/View/XML.php Log Message: --- Merge pull request #215 from andig/cache-entities Performance: add caching Compare: https://github.com/volkszaehler/volkszaehler.org/compare/954baea0c267...e0d0f08d5429
[vz-dev] [volkszaehler/volkszaehler.org] 67be52: Add apc(u) to travis for testing caching
Branch: refs/heads/travis-apcu Home: https://github.com/volkszaehler/volkszaehler.org Commit: 67be52d66b765ec54e06fc6dcb6165d18a6a202f https://github.com/volkszaehler/volkszaehler.org/commit/67be52d66b765ec54e06fc6dcb6165d18a6a202f Author: andig cpui...@gmx.de Date: 2015-01-21 (Wed, 21 Jan 2015) Changed paths: M .travis.yml A test/bin/apc.ini A test/bin/install_apcu.sh Log Message: --- Add apc(u) to travis for testing caching
[vz-dev] [volkszaehler/volkszaehler.org] d57f7d: Add apc(u) to travis for testing caching
Branch: refs/heads/travis-apcu Home: https://github.com/volkszaehler/volkszaehler.org Commit: d57f7de54be84d26c23665971a5704eb1fb021aa https://github.com/volkszaehler/volkszaehler.org/commit/d57f7de54be84d26c23665971a5704eb1fb021aa Author: andig cpui...@gmx.de Date: 2015-01-21 (Wed, 21 Jan 2015) Changed paths: M .travis.yml A test/bin/apc.ini A test/bin/install-apcu.sh Log Message: --- Add apc(u) to travis for testing caching
[vz-dev] [volkszaehler/volkszaehler.org] fcd10b: Add apc(u) to travis for testing caching
Branch: refs/heads/travis-apcu Home: https://github.com/volkszaehler/volkszaehler.org Commit: fcd10b1006ae36a202fa11bdfbe6e599c55847ed https://github.com/volkszaehler/volkszaehler.org/commit/fcd10b1006ae36a202fa11bdfbe6e599c55847ed Author: andig cpui...@gmx.de Date: 2015-01-21 (Wed, 21 Jan 2015) Changed paths: M .travis.yml A test/bin/apc.ini A test/bin/install-apcu.sh Log Message: --- Add apc(u) to travis for testing caching
[vz-dev] [volkszaehler/volkszaehler.org] f2dd76: Add apc(u) to travis for testing caching
Branch: refs/heads/travis-apcu Home: https://github.com/volkszaehler/volkszaehler.org Commit: f2dd7639490e87352b0f73719434584a6668e3d4 https://github.com/volkszaehler/volkszaehler.org/commit/f2dd7639490e87352b0f73719434584a6668e3d4 Author: andig cpui...@gmx.de Date: 2015-01-21 (Wed, 21 Jan 2015) Changed paths: M .travis.yml Log Message: --- Add apc(u) to travis for testing caching
[vz-dev] [volkszaehler/volkszaehler.org] cafec1: Add apc(u) to travis for testing caching
Branch: refs/heads/travis-apcu Home: https://github.com/volkszaehler/volkszaehler.org Commit: cafec1889bb0b68c7aebe8587f1fffcac9b5b507 https://github.com/volkszaehler/volkszaehler.org/commit/cafec1889bb0b68c7aebe8587f1fffcac9b5b507 Author: andig cpui...@gmx.de Date: 2015-01-21 (Wed, 21 Jan 2015) Changed paths: M .travis.yml A test/bin/apc.ini A test/bin/install-apcu.sh Log Message: --- Add apc(u) to travis for testing caching
[vz-dev] [volkszaehler/vzlogger] 414783: meterD0: added new option ackseq auto to calc acks...
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: 414783719a65895f1cfcc3d21f9cce7050502459 https://github.com/volkszaehler/vzlogger/commit/414783719a65895f1cfcc3d21f9cce7050502459 Author: Matthias Behr mb...@mcbehr.de Date: 2015-01-24 (Sat, 24 Jan 2015) Changed paths: M etc/vzlogger.conf M include/protocols/MeterD0.hpp M src/protocols/MeterD0.cpp M tests/MeterD0.cpp Log Message: --- meterD0: added new option ackseq auto to calc ackseq automatically and set baudrate_read to max supported Commit: ff27eb632cf0a603c1f765642e2006b600a6a654 https://github.com/volkszaehler/vzlogger/commit/ff27eb632cf0a603c1f765642e2006b600a6a654 Author: Matthias Behr mb...@mcbehr.de Date: 2015-01-26 (Mon, 26 Jan 2015) Changed paths: M src/protocols/MeterD0.cpp Log Message: --- fix wrong baudrate_read on 2nd try if no baudrate_read option given Commit: 36d7bfc7b9365059c7a0be2b168df512315f9282 https://github.com/volkszaehler/vzlogger/commit/36d7bfc7b9365059c7a0be2b168df512315f9282 Author: andig cpui...@gmx.de Date: 2015-01-27 (Tue, 27 Jan 2015) Changed paths: M etc/vzlogger.conf M include/protocols/MeterD0.hpp M src/protocols/MeterD0.cpp M tests/MeterD0.cpp Log Message: --- Merge pull request #113 from mbehr1/meterD0_autoackseq meterD0: added new option ackseq auto to calc ackseq automatically and set baud rate_read to max supported Compare: https://github.com/volkszaehler/vzlogger/compare/4caba0b2a5e7...36d7bfc7b936
[vz-dev] [volkszaehler/vzlogger] a6e176: Revert meterD0: added new option ackseq auto to c...
Branch: refs/heads/revert-113-meterD0_autoackseq Home: https://github.com/volkszaehler/vzlogger Commit: a6e176199c36a301c1c0296518aa106c57c5f04e https://github.com/volkszaehler/vzlogger/commit/a6e176199c36a301c1c0296518aa106c57c5f04e Author: andig cpui...@gmx.de Date: 2015-01-27 (Tue, 27 Jan 2015) Changed paths: M etc/vzlogger.conf M include/protocols/MeterD0.hpp M src/protocols/MeterD0.cpp M tests/MeterD0.cpp Log Message: --- Revert meterD0: added new option ackseq auto to calc ackseq automatically and set baud rate_read to max supported
[vz-dev] [volkszaehler/vzlogger] a6e176: Revert meterD0: added new option ackseq auto to c...
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: a6e176199c36a301c1c0296518aa106c57c5f04e https://github.com/volkszaehler/vzlogger/commit/a6e176199c36a301c1c0296518aa106c57c5f04e Author: andig cpui...@gmx.de Date: 2015-01-27 (Tue, 27 Jan 2015) Changed paths: M etc/vzlogger.conf M include/protocols/MeterD0.hpp M src/protocols/MeterD0.cpp M tests/MeterD0.cpp Log Message: --- Revert meterD0: added new option ackseq auto to calc ackseq automatically and set baud rate_read to max supported Commit: 17cabfa2cd808d2c45b0d3f5f653ac40309a44b7 https://github.com/volkszaehler/vzlogger/commit/17cabfa2cd808d2c45b0d3f5f653ac40309a44b7 Author: andig cpui...@gmx.de Date: 2015-01-27 (Tue, 27 Jan 2015) Changed paths: M etc/vzlogger.conf M include/protocols/MeterD0.hpp M src/protocols/MeterD0.cpp M tests/MeterD0.cpp Log Message: --- Merge pull request #114 from volkszaehler/revert-113-meterD0_autoackseq Revert meterD0: added new option ackseq auto to calc ackseq automatical... Compare: https://github.com/volkszaehler/vzlogger/compare/36d7bfc7b936...17cabfa2cd80
[vz-dev] [volkszaehler/volkszaehler.org] 235fc2: Avoid loading data from aggregators
Branch: refs/heads/fix-agg Home: https://github.com/volkszaehler/volkszaehler.org Commit: 235fc2f2954d3c366a3b382f409cde6ddd7de224 https://github.com/volkszaehler/volkszaehler.org/commit/235fc2f2954d3c366a3b382f409cde6ddd7de224 Author: andig cpui...@gmx.de Date: 2015-01-29 (Thu, 29 Jan 2015) Changed paths: M htdocs/frontend/javascripts/entities.js M htdocs/frontend/javascripts/entity.js M lib/Volkszaehler/Interpreter/AggregatorInterpreter.php Log Message: --- Avoid loading data from aggregators
[vz-dev] [volkszaehler/volkszaehler.org]
Branch: refs/heads/revert-206-gulp Home: https://github.com/volkszaehler/volkszaehler.org
[vz-dev] [volkszaehler/volkszaehler.org]
Branch: refs/heads/fix-agg Home: https://github.com/volkszaehler/volkszaehler.org
[vz-dev] [volkszaehler/vzlogger] bbfdd2: first mock tests for MeterMap and threads.cpp
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: bbfdd2727e18839defc622a5f0faff73f6956981 https://github.com/volkszaehler/vzlogger/commit/bbfdd2727e18839defc622a5f0faff73f6956981 Author: Matthias Behr mb...@mcbehr.de Date: 2015-01-29 (Thu, 29 Jan 2015) Changed paths: M CMakeLists.txt M include/Meter.hpp M include/MeterMap.hpp M include/Options.hpp M src/Buffer.cpp M src/MeterMap.cpp M src/Options.cpp M src/api/MySmartGrid.cpp M src/api/Volkszaehler.cpp M tests/CMakeLists.txt A tests/mocks/CMakeLists.txt A tests/mocks/Channel.hpp A tests/mocks/mock_metermap.cpp Log Message: --- first mock tests for MeterMap and threads.cpp Commit: 2c3f1e9f820d0ca78cf605d79831fe768bd01d3d https://github.com/volkszaehler/vzlogger/commit/2c3f1e9f820d0ca78cf605d79831fe768bd01d3d Author: andig cpui...@gmx.de Date: 2015-01-29 (Thu, 29 Jan 2015) Changed paths: M CMakeLists.txt M include/Meter.hpp M include/MeterMap.hpp M include/Options.hpp M src/Buffer.cpp M src/MeterMap.cpp M src/Options.cpp M src/api/MySmartGrid.cpp M src/api/Volkszaehler.cpp M tests/CMakeLists.txt A tests/mocks/CMakeLists.txt A tests/mocks/Channel.hpp A tests/mocks/mock_metermap.cpp Log Message: --- Merge pull request #116 from mbehr1/mock_meter first mock tests for MeterMap and threads.cpp Compare: https://github.com/volkszaehler/vzlogger/compare/58c29d739eaf...2c3f1e9f820d
[vz-dev] [volkszaehler/volkszaehler.org] 62a83b: Fix mixed content security warning in FireFox
Branch: refs/heads/andig-patch-1 Home: https://github.com/volkszaehler/volkszaehler.org Commit: 62a83b2cef4fdc4c1b348e07b772943c039898df https://github.com/volkszaehler/volkszaehler.org/commit/62a83b2cef4fdc4c1b348e07b772943c039898df Author: andig cpui...@gmx.de Date: 2015-01-25 (Sun, 25 Jan 2015) Changed paths: M htdocs/frontend/javascripts/options.js Log Message: --- Fix mixed content security warning in FireFox
[vz-dev] [volkszaehler/vzlogger] a55bb5: added config timeout_s_read and delay_ms_baudrate_...
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: a55bb564586bcda13c9725fad5d0ed09b04fc6d6 https://github.com/volkszaehler/vzlogger/commit/a55bb564586bcda13c9725fad5d0ed09b04fc6d6 Author: Matthias Behr mb...@mcbehr.de Date: 2015-01-15 (Thu, 15 Jan 2015) Changed paths: M etc/vzlogger.conf M include/protocols/MeterD0.hpp M src/protocols/MeterD0.cpp Log Message: --- added config timeout_s_read and delay_ms_baudrate_change for MeterD0 Commit: 3d76e85b34792bfaa62d0a416c8f4ab29c11d7ad https://github.com/volkszaehler/vzlogger/commit/3d76e85b34792bfaa62d0a416c8f4ab29c11d7ad Author: Matthias Behr mb...@mcbehr.de Date: 2015-01-15 (Thu, 15 Jan 2015) Changed paths: M etc/vzlogger.conf M src/protocols/MeterD0.cpp Log Message: --- added , to conf. delay for baudrate change as well pullseq Commit: ff50f906b87db7663c2dbc0aef59a321b04360ce https://github.com/volkszaehler/vzlogger/commit/ff50f906b87db7663c2dbc0aef59a321b04360ce Author: Matthias Behr mb...@mcbehr.de Date: 2015-01-24 (Sat, 24 Jan 2015) Changed paths: M etc/vzlogger.conf M include/protocols/MeterD0.hpp M src/protocols/MeterD0.cpp Log Message: --- changed option names for consistency Commit: eeddf073d8203ad9d51cdb9a2f7e2d6538c31692 https://github.com/volkszaehler/vzlogger/commit/eeddf073d8203ad9d51cdb9a2f7e2d6538c31692 Author: Matthias Behr mb...@mcbehr.de Date: 2015-01-24 (Sat, 24 Jan 2015) Changed paths: M include/protocols/MeterD0.hpp M src/protocols/MeterD0.cpp M tests/MeterD0.cpp Log Message: --- added handling of min reaction time according to 62056-21 Commit: 9d0367d94dbaa851d09925ec58ea72eb2c6c4506 https://github.com/volkszaehler/vzlogger/commit/9d0367d94dbaa851d09925ec58ea72eb2c6c4506 Author: Matthias Behr mb...@mcbehr.de Date: 2015-01-24 (Sat, 24 Jan 2015) Changed paths: M src/protocols/MeterD0.cpp Log Message: --- fixed clang compiler error (unit. var) Commit: 4caba0b2a5e7365607bb38828767ebda8ea800f2 https://github.com/volkszaehler/vzlogger/commit/4caba0b2a5e7365607bb38828767ebda8ea800f2 Author: andig cpui...@gmx.de Date: 2015-01-24 (Sat, 24 Jan 2015) Changed paths: M etc/vzlogger.conf M include/protocols/MeterD0.hpp M src/protocols/MeterD0.cpp M tests/MeterD0.cpp Log Message: --- Merge pull request #111 from mbehr1/meterD0_config_timeouts added config read_timeout and baudrate_change_delay for MeterD0 Compare: https://github.com/volkszaehler/vzlogger/compare/b3d5bd915b02...4caba0b2a5e7
[vz-dev] [volkszaehler/vzlogger] 58c29d: indented brackets and changed descr. in .conf to g...
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: 58c29d739eaf5b4127f934353581c97c4482f1f2 https://github.com/volkszaehler/vzlogger/commit/58c29d739eaf5b4127f934353581c97c4482f1f2 Author: Matthias Behr mb...@mcbehr.de Date: 2015-01-27 (Tue, 27 Jan 2015) Changed paths: M etc/vzlogger.conf M src/protocols/MeterD0.cpp Log Message: --- indented brackets and changed descr. in .conf to german
[vz-dev] [volkszaehler/volkszaehler.org] 76cca4: Added gulp tasks for js/css minimization, img to c...
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: 76cca4853053219121a5d9b6a410171b27cf2444 https://github.com/volkszaehler/volkszaehler.org/commit/76cca4853053219121a5d9b6a410171b27cf2444 Author: andig cpui...@gmx.de Date: 2015-01-05 (Mon, 05 Jan 2015) Changed paths: M gulpfile.js M htdocs/frontend/images/sprites.png M htdocs/frontend/index.html M htdocs/frontend/javascripts/entity.js M htdocs/frontend/javascripts/init.js R htdocs/frontend/javascripts/property.js M htdocs/frontend/javascripts/wui.js M htdocs/frontend/stylesheets/sprites.css M htdocs/frontend/stylesheets/style.css M package.json Log Message: --- Added gulp tasks for js/css minimization, img to css sprite conversion and inlined minimized js libs Commit: 60ac432f155a1385f8384e0069f1e76a1cc9a031 https://github.com/volkszaehler/volkszaehler.org/commit/60ac432f155a1385f8384e0069f1e76a1cc9a031 Author: jahir jh.git...@hirsch.ws Date: 2015-01-06 (Tue, 06 Jan 2015) Changed paths: M gulpfile.js M htdocs/frontend/images/sprites.png M htdocs/frontend/index.html M htdocs/frontend/javascripts/entity.js M htdocs/frontend/javascripts/init.js R htdocs/frontend/javascripts/property.js M htdocs/frontend/javascripts/wui.js M htdocs/frontend/stylesheets/sprites.css M htdocs/frontend/stylesheets/style.css M package.json Log Message: --- Merge pull request #206 from andig/gulp Merged and minimized files to reduce HTTP traffic Compare: https://github.com/volkszaehler/volkszaehler.org/compare/88d865d408d3...60ac432f155a
[vz-dev] [volkszaehler/volkszaehler.org] db3389: Revert Reduce HTTP traffic
Branch: refs/heads/revert-206-gulp Home: https://github.com/volkszaehler/volkszaehler.org Commit: db3389efa72e6e0deb97fe0e31375bab6e6ef0ff https://github.com/volkszaehler/volkszaehler.org/commit/db3389efa72e6e0deb97fe0e31375bab6e6ef0ff Author: jahir jh.git...@hirsch.ws Date: 2015-01-06 (Tue, 06 Jan 2015) Changed paths: M gulpfile.js M htdocs/frontend/images/sprites.png M htdocs/frontend/index.html M htdocs/frontend/javascripts/entity.js M htdocs/frontend/javascripts/init.js A htdocs/frontend/javascripts/property.js M htdocs/frontend/javascripts/wui.js M htdocs/frontend/stylesheets/sprites.css M htdocs/frontend/stylesheets/style.css M package.json Log Message: --- Revert Reduce HTTP traffic
[vz-dev] [volkszaehler/volkszaehler.org] db3389: Revert Reduce HTTP traffic
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: db3389efa72e6e0deb97fe0e31375bab6e6ef0ff https://github.com/volkszaehler/volkszaehler.org/commit/db3389efa72e6e0deb97fe0e31375bab6e6ef0ff Author: jahir jh.git...@hirsch.ws Date: 2015-01-06 (Tue, 06 Jan 2015) Changed paths: M gulpfile.js M htdocs/frontend/images/sprites.png M htdocs/frontend/index.html M htdocs/frontend/javascripts/entity.js M htdocs/frontend/javascripts/init.js A htdocs/frontend/javascripts/property.js M htdocs/frontend/javascripts/wui.js M htdocs/frontend/stylesheets/sprites.css M htdocs/frontend/stylesheets/style.css M package.json Log Message: --- Revert Reduce HTTP traffic Commit: 35bf3a022d7da4069a25287f997a193939ac9af7 https://github.com/volkszaehler/volkszaehler.org/commit/35bf3a022d7da4069a25287f997a193939ac9af7 Author: jahir jh.git...@hirsch.ws Date: 2015-01-06 (Tue, 06 Jan 2015) Changed paths: M gulpfile.js M htdocs/frontend/images/sprites.png M htdocs/frontend/index.html M htdocs/frontend/javascripts/entity.js M htdocs/frontend/javascripts/init.js A htdocs/frontend/javascripts/property.js M htdocs/frontend/javascripts/wui.js M htdocs/frontend/stylesheets/sprites.css M htdocs/frontend/stylesheets/style.css M package.json Log Message: --- Merge pull request #213 from volkszaehler/revert-206-gulp Revert Reduce HTTP traffic Compare: https://github.com/volkszaehler/volkszaehler.org/compare/60ac432f155a...35bf3a022d7d
[vz-dev] [volkszaehler/volkszaehler.org] 166471: Upgrade jQuery to 2.1.3 and remove CDN dependencie...
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: 1664716c7e724cf0a5cbdd1bda2c0e3694825277 https://github.com/volkszaehler/volkszaehler.org/commit/1664716c7e724cf0a5cbdd1bda2c0e3694825277 Author: andig cpui...@gmx.de Date: 2015-01-10 (Sat, 10 Jan 2015) Changed paths: M .gitignore M gulpfile.js M htdocs/frontend/index.html R htdocs/frontend/javascripts/flot/base64.js R htdocs/frontend/javascripts/flot/canvas2image.js R htdocs/frontend/javascripts/flot/date.js R htdocs/frontend/javascripts/flot/excanvas.js R htdocs/frontend/javascripts/flot/excanvas.min.js R htdocs/frontend/javascripts/flot/jquery.colorhelpers.js R htdocs/frontend/javascripts/flot/jquery.flot.axislabels.js R htdocs/frontend/javascripts/flot/jquery.flot.canvas.js R htdocs/frontend/javascripts/flot/jquery.flot.categories.js R htdocs/frontend/javascripts/flot/jquery.flot.crosshair.js R htdocs/frontend/javascripts/flot/jquery.flot.errorbars.js R htdocs/frontend/javascripts/flot/jquery.flot.fillbetween.js R htdocs/frontend/javascripts/flot/jquery.flot.image.js R htdocs/frontend/javascripts/flot/jquery.flot.js R htdocs/frontend/javascripts/flot/jquery.flot.navigate.js R htdocs/frontend/javascripts/flot/jquery.flot.pie.js R htdocs/frontend/javascripts/flot/jquery.flot.resize.js R htdocs/frontend/javascripts/flot/jquery.flot.selection.js R htdocs/frontend/javascripts/flot/jquery.flot.stack.js R htdocs/frontend/javascripts/flot/jquery.flot.symbol.js R htdocs/frontend/javascripts/flot/jquery.flot.threshold.js R htdocs/frontend/javascripts/flot/jquery.flot.time.js R htdocs/frontend/javascripts/flot/jquery.flot.xgap.js R htdocs/frontend/stylesheets/jquery-ui-custom.css R htdocs/frontend/stylesheets/jquery-ui-vz/images/ui-bg_diagonals-thick_18_ed0930_40x40.png R htdocs/frontend/stylesheets/jquery-ui-vz/images/ui-bg_diagonals-thick_20_66_40x40.png R htdocs/frontend/stylesheets/jquery-ui-vz/images/ui-bg_flat_10_00_40x100.png R htdocs/frontend/stylesheets/jquery-ui-vz/images/ui-bg_glass_100_ee_1x400.png R htdocs/frontend/stylesheets/jquery-ui-vz/images/ui-bg_glass_100_f1f9fe_1x400.png R htdocs/frontend/stylesheets/jquery-ui-vz/images/ui-bg_gloss-wave_35_0aa2ed_500x100.png R htdocs/frontend/stylesheets/jquery-ui-vz/images/ui-bg_highlight-soft_100_ee_1x100.png R htdocs/frontend/stylesheets/jquery-ui-vz/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png R htdocs/frontend/stylesheets/jquery-ui-vz/images/ui-bg_highlight-soft_75_edc609_1x100.png R htdocs/frontend/stylesheets/jquery-ui-vz/images/ui-icons_0aa2ed_256x240.png R htdocs/frontend/stylesheets/jquery-ui-vz/images/ui-icons_1c94c4_256x240.png R htdocs/frontend/stylesheets/jquery-ui-vz/images/ui-icons_22_256x240.png R htdocs/frontend/stylesheets/jquery-ui-vz/images/ui-icons_228ef1_256x240.png R htdocs/frontend/stylesheets/jquery-ui-vz/images/ui-icons_ffd27a_256x240.png R htdocs/frontend/stylesheets/jquery-ui-vz/images/ui-icons_ff_256x240.png M htdocs/frontend/stylesheets/style.css A htdocs/frontend/vendor/flot/base64.js A htdocs/frontend/vendor/flot/canvas2image.js A htdocs/frontend/vendor/flot/date.js A htdocs/frontend/vendor/flot/flot.min.js A htdocs/frontend/vendor/flot/jquery.colorhelpers.js A htdocs/frontend/vendor/flot/jquery.flot.axislabels.js A htdocs/frontend/vendor/flot/jquery.flot.canvas.js A htdocs/frontend/vendor/flot/jquery.flot.categories.js A htdocs/frontend/vendor/flot/jquery.flot.crosshair.js A htdocs/frontend/vendor/flot/jquery.flot.errorbars.js A htdocs/frontend/vendor/flot/jquery.flot.fillbetween.js A htdocs/frontend/vendor/flot/jquery.flot.image.js A htdocs/frontend/vendor/flot/jquery.flot.js A htdocs/frontend/vendor/flot/jquery.flot.navigate.js A htdocs/frontend/vendor/flot/jquery.flot.pie.js A htdocs/frontend/vendor/flot/jquery.flot.resize.js A htdocs/frontend/vendor/flot/jquery.flot.selection.js A htdocs/frontend/vendor/flot/jquery.flot.stack.js A htdocs/frontend/vendor/flot/jquery.flot.symbol.js A htdocs/frontend/vendor/flot/jquery.flot.threshold.js A htdocs/frontend/vendor/flot/jquery.flot.time.js A htdocs/frontend/vendor/flot/jquery.flot.xgap.js A htdocs/frontend/vendor/jquery-ui/external/jquery/jquery.js A htdocs/frontend/vendor/jquery-ui/images/ui-bg_diagonals-thick_18_b81900_40x40.png A htdocs/frontend/vendor/jquery-ui/images/ui-bg_diagonals-thick_20_66_40x40.png A htdocs/frontend/vendor/jquery-ui/images/ui-bg_flat_0_aa_40x100.png A htdocs/frontend/vendor/jquery-ui/images/ui-bg_flat_10_00_40x100.png A htdocs/frontend/vendor/jquery-ui/images/ui-bg_flat_75_ff_40x100.png A htdocs/frontend/vendor/jquery-ui/images/ui-bg_glass_100_f6f6f6_1x400.png A
[vz-dev] [volkszaehler/vzlogger] 7b487e: use single curl session for Volkszaehler
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: 7b487e89b28f8f081ea14b4376138e6fcf92c830 https://github.com/volkszaehler/vzlogger/commit/7b487e89b28f8f081ea14b4376138e6fcf92c830 Author: Matthias Behr mb...@mcbehr.de Date: 2015-01-31 (Sat, 31 Jan 2015) Changed paths: A include/CurlSessionProvider.hpp M include/api/Volkszaehler.hpp M modules/CompilerFlags.cmake M src/CMakeLists.txt A src/CurlSessionProvider.cpp M src/api/Volkszaehler.cpp M src/vzlogger.cpp M tests/CMakeLists.txt M tests/mocks/CMakeLists.txt A tests/ut_CurlSessionProvider.cpp Log Message: --- use single curl session for Volkszaehler Commit: fce084466535547b94d044c15f964a12cc220f5d https://github.com/volkszaehler/vzlogger/commit/fce084466535547b94d044c15f964a12cc220f5d Author: Matthias Behr mb...@mcbehr.de Date: 2015-02-01 (Sun, 01 Feb 2015) Changed paths: M src/CurlSessionProvider.cpp Log Message: --- use pthread_mutex_timedlock on shutdown Commit: dbef1519e08db7889905383808bda0daff7e04fd https://github.com/volkszaehler/vzlogger/commit/dbef1519e08db7889905383808bda0daff7e04fd Author: andig cpui...@gmx.de Date: 2015-02-10 (Tue, 10 Feb 2015) Changed paths: A include/CurlSessionProvider.hpp M include/api/Volkszaehler.hpp M modules/CompilerFlags.cmake M src/CMakeLists.txt A src/CurlSessionProvider.cpp M src/api/Volkszaehler.cpp M src/vzlogger.cpp M tests/CMakeLists.txt M tests/mocks/CMakeLists.txt A tests/ut_CurlSessionProvider.cpp Log Message: --- Merge pull request #117 from mbehr1/curl_single_handle use single curl session for middleware requests Compare: https://github.com/volkszaehler/vzlogger/compare/5a9cb4308f2a...dbef1519e08d
[vz-dev] [volkszaehler/volkszaehler.org] 2a5488: Allow display of short type names in entity table
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: 2a5488ee068e3c759ab5554954b5db243e4c772e https://github.com/volkszaehler/volkszaehler.org/commit/2a5488ee068e3c759ab5554954b5db243e4c772e Author: andig cpui...@gmx.de Date: 2014-12-31 (Wed, 31 Dec 2014) Changed paths: M htdocs/frontend/javascripts/entity.js M htdocs/frontend/javascripts/options.js Log Message: --- Allow display of short type names in entity table Commit: cc8bdad2c8f269816fc7e8ee07686639ab6ac859 https://github.com/volkszaehler/volkszaehler.org/commit/cc8bdad2c8f269816fc7e8ee07686639ab6ac859 Author: andig cpui...@gmx.de Date: 2015-01-05 (Mon, 05 Jan 2015) Changed paths: M htdocs/frontend/javascripts/entity.js M htdocs/frontend/javascripts/options.js Log Message: --- Merge pull request #205 from andig/fix-long-names Allow display of short type names in entity table Compare: https://github.com/volkszaehler/volkszaehler.org/compare/af461ceb7b6e...cc8bdad2c8f2
[vz-dev] [volkszaehler/volkszaehler.org] 694e00: Legend extended to show date not only H:M:S
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: 694e002e2ad2f251a1d07538065d21652f6b3bff https://github.com/volkszaehler/volkszaehler.org/commit/694e002e2ad2f251a1d07538065d21652f6b3bff Author: fostex68 v...@gmx.de Date: 2015-01-05 (Mon, 05 Jan 2015) Changed paths: M htdocs/frontend/javascripts/wui.js Log Message: --- Legend extended to show date not only H:M:S Commit: 88d865d408d343b5fcec622694315454c9644999 https://github.com/volkszaehler/volkszaehler.org/commit/88d865d408d343b5fcec622694315454c9644999 Author: andig cpui...@gmx.de Date: 2015-01-05 (Mon, 05 Jan 2015) Changed paths: M htdocs/frontend/javascripts/wui.js Log Message: --- Merge pull request #211 from fostex68/patch-1 Include date in legend if zoom 1 day Compare: https://github.com/volkszaehler/volkszaehler.org/compare/cc8bdad2c8f2...88d865d408d3
[vz-dev] [volkszaehler/vzlogger]
Branch: refs/tags/0.4.0 Home: https://github.com/volkszaehler/vzlogger
[vz-dev] [volkszaehler/volkszaehler.org] 37eba7: Added digitalstrom example
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: 37eba771edc50b539a05aecb2b075c2af0689df6 https://github.com/volkszaehler/volkszaehler.org/commit/37eba771edc50b539a05aecb2b075c2af0689df6 Author: Andreas Goetz cpui...@gmx.de Date: 2015-03-15 (Sun, 15 Mar 2015) Changed paths: M misc/controller/README A misc/controller/digitalstrom/dss.sh Log Message: --- Added digitalstrom example Commit: 4e0f04cf30161ab2d9e9da9a8a426a558fa39119 https://github.com/volkszaehler/volkszaehler.org/commit/4e0f04cf30161ab2d9e9da9a8a426a558fa39119 Author: andig cpui...@gmx.de Date: 2015-03-15 (Sun, 15 Mar 2015) Changed paths: M misc/controller/README A misc/controller/digitalstrom/dss.sh Log Message: --- Merge pull request #265 from andig/digitalstrom Added digitalstrom example Compare: https://github.com/volkszaehler/volkszaehler.org/compare/4692e3537464...4e0f04cf3016
[vz-dev] [volkszaehler/vzlogger] fef183: add startup log message and fix error on overwriti...
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: fef1835f75a392beaaa1b02df8a2b92c327025de https://github.com/volkszaehler/vzlogger/commit/fef1835f75a392beaaa1b02df8a2b92c327025de Author: Matthias Behr mb...@mcbehr.de Date: 2015-03-20 (Fri, 20 Mar 2015) Changed paths: M etc/vzlogger.conf M include/Config_Options.hpp M src/vzlogger.cpp Log Message: --- add startup log message and fix error on overwriting the log level by command option Commit: a172d347628c2afe59e4d559ad1e53151d53ddb3 https://github.com/volkszaehler/vzlogger/commit/a172d347628c2afe59e4d559ad1e53151d53ddb3 Author: andig cpui...@gmx.de Date: 2015-03-21 (Sat, 21 Mar 2015) Changed paths: M etc/vzlogger.conf M include/Config_Options.hpp M src/vzlogger.cpp Log Message: --- Merge pull request #147 from mbehr1/print_144 add startup log message and fix error on overwriting the log level by command option Compare: https://github.com/volkszaehler/vzlogger/compare/ad8095d9018f...a172d347628c
[vz-dev] [volkszaehler/volkszaehler.org] d928f6: Add raw context for access to uninterpreted meter ...
Branch: refs/heads/development Home: https://github.com/volkszaehler/volkszaehler.org Commit: d928f6f1f65073f17030730aeb2ba7d25d10037c https://github.com/volkszaehler/volkszaehler.org/commit/d928f6f1f65073f17030730aeb2ba7d25d10037c Author: andig cpui...@gmx.de Date: 2015-03-08 (Sun, 08 Mar 2015) Changed paths: M lib/Volkszaehler/Controller/DataController.php A lib/Volkszaehler/Controller/RawController.php M lib/Volkszaehler/Interpreter/DataIterator.php A lib/Volkszaehler/Interpreter/RawInterpreter.php M lib/Volkszaehler/Router.php M test/Tests/Data.php A test/Tests/RawTest.php Log Message: --- Add raw context for access to uninterpreted meter data Commit: 9714811b452959770ff7f1e9cc343ea59225d969 https://github.com/volkszaehler/volkszaehler.org/commit/9714811b452959770ff7f1e9cc343ea59225d969 Author: andig cpui...@gmx.de Date: 2015-03-08 (Sun, 08 Mar 2015) Changed paths: M lib/Volkszaehler/Controller/DataController.php A lib/Volkszaehler/Controller/RawController.php M lib/Volkszaehler/Interpreter/DataIterator.php A lib/Volkszaehler/Interpreter/RawInterpreter.php M lib/Volkszaehler/Router.php M test/Tests/Data.php A test/Tests/RawTest.php Log Message: --- Merge pull request #266 from andig/add-raw-context Add raw context for access to uninterpreted meter data Compare: https://github.com/volkszaehler/volkszaehler.org/compare/d02f24514986...9714811b4529
[vz-dev] [volkszaehler/vzlogger] b2841d: changed duplicate handling to not send last ignore...
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: b2841d48515385a34b74c9ea3c2f5d9c7975ffaa https://github.com/volkszaehler/vzlogger/commit/b2841d48515385a34b74c9ea3c2f5d9c7975ffaa Author: Matthias Behr mb...@mcbehr.de Date: 2015-03-05 (Thu, 05 Mar 2015) Changed paths: M etc/vzlogger.conf M include/api/Volkszaehler.hpp M src/api/Volkszaehler.cpp M tests/ut_api_volkszaehler.cpp Log Message: --- changed duplicate handling to not send last ignored value Commit: 69aed4b6f536df8814b030a14e0eeafcbbddb0b3 https://github.com/volkszaehler/vzlogger/commit/69aed4b6f536df8814b030a14e0eeafcbbddb0b3 Author: Matthias Behr mb...@mcbehr.de Date: 2015-03-07 (Sat, 07 Mar 2015) Changed paths: M etc/vzlogger.conf M include/api/Volkszaehler.hpp M src/api/Volkszaehler.cpp M tests/ut_api_volkszaehler.cpp Log Message: --- Merge pull request #139 from mbehr1/duplicate_98 changed duplicate handling to not send last ignored value Compare: https://github.com/volkszaehler/vzlogger/compare/4c08caa98470...69aed4b6f536
[vz-dev] [volkszaehler/vzlogger] 18ad8b: added unit tests
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: 18ad8b0f7cf538d5a00e2b5bcdb9a6d018f37fbb https://github.com/volkszaehler/vzlogger/commit/18ad8b0f7cf538d5a00e2b5bcdb9a6d018f37fbb Author: Matthias Behr mb...@mcbehr.de Date: 2015-03-13 (Fri, 13 Mar 2015) Changed paths: A tests/ut_buffer.cpp Log Message: --- added unit tests Commit: ad8095d9018f52f9599bd3dac92319417aa7af6f https://github.com/volkszaehler/vzlogger/commit/ad8095d9018f52f9599bd3dac92319417aa7af6f Author: andig cpui...@gmx.de Date: 2015-03-14 (Sat, 14 Mar 2015) Changed paths: A tests/ut_buffer.cpp Log Message: --- Merge pull request #143 from mbehr1/agg_avg_86 added unit tests for buffer avg handling Compare: https://github.com/volkszaehler/vzlogger/compare/09ebfc3d3cd9...ad8095d9018f
[vz-dev] [volkszaehler/volkszaehler.org] de3e62: Use native pretty-printing on PHP 5.4
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: de3e62aac344729e7be7d9dd3f45f61e9b092f5c https://github.com/volkszaehler/volkszaehler.org/commit/de3e62aac344729e7be7d9dd3f45f61e9b092f5c Author: andig cpui...@gmx.de Date: 2015-03-12 (Thu, 12 Mar 2015) Changed paths: M lib/Volkszaehler/Util/JSON.php Log Message: --- Use native pretty-printing on PHP 5.4 Commit: 4692e35374645066703d7aee886a7235c7efba10 https://github.com/volkszaehler/volkszaehler.org/commit/4692e35374645066703d7aee886a7235c7efba10 Author: andig cpui...@gmx.de Date: 2015-03-14 (Sat, 14 Mar 2015) Changed paths: M lib/Volkszaehler/Util/JSON.php Log Message: --- Merge pull request #273 from andig/fix-json Use native pretty-printing on PHP 5.4 Compare: https://github.com/volkszaehler/volkszaehler.org/compare/2920432e9c46...4692e3537464
[vz-dev] [volkszaehler/volkszaehler.org] 4a7edf: Add raw context for access to uninterpreted meter ...
Branch: refs/heads/development Home: https://github.com/volkszaehler/volkszaehler.org Commit: 4a7edf405d9ca6b9e4c553f47973e9a450b093a8 https://github.com/volkszaehler/volkszaehler.org/commit/4a7edf405d9ca6b9e4c553f47973e9a450b093a8 Author: andig cpui...@gmx.de Date: 2015-03-08 (Sun, 08 Mar 2015) Changed paths: M lib/Volkszaehler/Controller/DataController.php A lib/Volkszaehler/Controller/RawController.php M lib/Volkszaehler/Interpreter/DataIterator.php A lib/Volkszaehler/Interpreter/RawInterpreter.php M lib/Volkszaehler/Router.php M test/Tests/Data.php A test/Tests/RawTest.php Log Message: --- Add raw context for access to uninterpreted meter data Commit: 6ccdd64e780e891358aaa2069bff53be601d8178 https://github.com/volkszaehler/volkszaehler.org/commit/6ccdd64e780e891358aaa2069bff53be601d8178 Author: andig cpui...@gmx.de Date: 2015-03-11 (Wed, 11 Mar 2015) Changed paths: M lib/Volkszaehler/Controller/DataController.php R lib/Volkszaehler/Controller/RawController.php M lib/Volkszaehler/Interpreter/CounterInterpreter.php M lib/Volkszaehler/Interpreter/Interpreter.php M lib/Volkszaehler/Interpreter/MeterInterpreter.php R lib/Volkszaehler/Interpreter/RawInterpreter.php M lib/Volkszaehler/Interpreter/SensorInterpreter.php M lib/Volkszaehler/Router.php M test/Tests/RawTest.php Log Message: --- Replace raw context by data context and options=raw Commit: d6eccabb328f34d4d34d78cad3f0dceff60449de https://github.com/volkszaehler/volkszaehler.org/commit/d6eccabb328f34d4d34d78cad3f0dceff60449de Author: andig cpui...@gmx.de Date: 2015-03-11 (Wed, 11 Mar 2015) Changed paths: M lib/Volkszaehler/View/JSON.php M test/Tests/AggregationTest.php M test/Tests/Data.php Log Message: --- Test infrastructure/ error handling fixes Commit: 8e150a02bd79b8efccb48d65aa539d90480fc1ff https://github.com/volkszaehler/volkszaehler.org/commit/8e150a02bd79b8efccb48d65aa539d90480fc1ff Author: andig cpui...@gmx.de Date: 2015-03-11 (Wed, 11 Mar 2015) Changed paths: M lib/Volkszaehler/Controller/DataController.php M lib/Volkszaehler/Interpreter/CounterInterpreter.php M lib/Volkszaehler/Interpreter/Interpreter.php M lib/Volkszaehler/Interpreter/MeterInterpreter.php M lib/Volkszaehler/Interpreter/SensorInterpreter.php M lib/Volkszaehler/View/JSON.php M test/Tests/AggregationTest.php M test/Tests/Data.php M test/Tests/RawTest.php Log Message: --- Merge branch 'add-raw-context' into development Conflicts: test/Tests/RawTest.php Compare: https://github.com/volkszaehler/volkszaehler.org/compare/9714811b4529...8e150a02bd79
[vz-dev] [volkszaehler/vzlogger] 4c4a24: made MeterD0 parsing more fault tolerant. fix delt...
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: 4c4a24adf717314aba02a677c0de3b683f8eebd4 https://github.com/volkszaehler/vzlogger/commit/4c4a24adf717314aba02a677c0de3b683f8eebd4 Author: Matthias Behr mb...@mcbehr.de Date: 2015-03-12 (Thu, 12 Mar 2015) Changed paths: M src/protocols/MeterD0.cpp Log Message: --- made MeterD0 parsing more fault tolerant. fix delta timestamp in logdump Commit: 3942ca20211bc6d8a848509950a8a14915fecafc https://github.com/volkszaehler/vzlogger/commit/3942ca20211bc6d8a848509950a8a14915fecafc Author: andig cpui...@gmx.de Date: 2015-03-13 (Fri, 13 Mar 2015) Changed paths: M src/protocols/MeterD0.cpp Log Message: --- Merge pull request #142 from mbehr1/fix_as1440 made MeterD0 parsing more fault tolerant. fix delta timestamp in logdump Compare: https://github.com/volkszaehler/vzlogger/compare/fbe834fc0fec...3942ca20211b
[vz-dev] [volkszaehler/vzlogger] 1867b2: changed repo for libsml to volkszaehler and branch...
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: 1867b2f55e8ad83025021b85da434534a9ac85ee https://github.com/volkszaehler/vzlogger/commit/1867b2f55e8ad83025021b85da434534a9ac85ee Author: Matthias Behr mb...@mcbehr.de Date: 2015-03-11 (Wed, 11 Mar 2015) Changed paths: M .travis.yml Log Message: --- changed repo for libsml to volkszaehler and branch to master Commit: fbe834fc0fece86dd8201761fede19a21ccf9a4e https://github.com/volkszaehler/vzlogger/commit/fbe834fc0fece86dd8201761fede19a21ccf9a4e Author: andig cpui...@gmx.de Date: 2015-03-12 (Thu, 12 Mar 2015) Changed paths: M .travis.yml Log Message: --- Merge pull request #141 from mbehr1/change_libsml_repo changed repo for libsml to volkszaehler and branch to master Compare: https://github.com/volkszaehler/vzlogger/compare/69aed4b6f536...fbe834fc0fec
[vz-dev] [volkszaehler/volkszaehler.org] 899eae: Speedup build process
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: 899eae41f5235eaf2a9e735e95077fcbf666d9f7 https://github.com/volkszaehler/volkszaehler.org/commit/899eae41f5235eaf2a9e735e95077fcbf666d9f7 Author: andig cpui...@gmx.de Date: 2015-03-23 (Mon, 23 Mar 2015) Changed paths: M .travis.yml Log Message: --- Speedup build process Commit: 485fd297ca6d93bc543677f7f5e53e36783f6a2d https://github.com/volkszaehler/volkszaehler.org/commit/485fd297ca6d93bc543677f7f5e53e36783f6a2d Author: andig cpui...@gmx.de Date: 2015-03-23 (Mon, 23 Mar 2015) Changed paths: M lib/Volkszaehler/Model/Aggregate.php M lib/Volkszaehler/Model/Data.php Log Message: --- Fix sqlite build Commit: 028e20747677dc9bfb2ada5abf2267c9f29b8b28 https://github.com/volkszaehler/volkszaehler.org/commit/028e20747677dc9bfb2ada5abf2267c9f29b8b28 Author: andig cpui...@gmx.de Date: 2015-03-24 (Tue, 24 Mar 2015) Changed paths: M .travis.yml Log Message: --- Remove composer self-update and debug statement Commit: a8d4e74715bc10b3883ff44213e971c5be106b1b https://github.com/volkszaehler/volkszaehler.org/commit/a8d4e74715bc10b3883ff44213e971c5be106b1b Author: andig cpui...@gmx.de Date: 2015-03-30 (Mon, 30 Mar 2015) Changed paths: M .travis.yml M lib/Volkszaehler/Model/Aggregate.php M lib/Volkszaehler/Model/Data.php Log Message: --- Merge pull request #278 from andig/build-infrastructure Build infrastructure Compare: https://github.com/volkszaehler/volkszaehler.org/compare/1e11b09a678d...a8d4e74715bc
[vz-dev] [volkszaehler/vzlogger] 877314: Fix schema not updated on loading and hide schema ...
Branch: refs/heads/gh-pages Home: https://github.com/volkszaehler/vzlogger Commit: 87731459cb8ec947bec680f56025ba57a6b03f09 https://github.com/volkszaehler/vzlogger/commit/87731459cb8ec947bec680f56025ba57a6b03f09 Author: andig cpui...@gmx.de Date: 2015-04-01 (Wed, 01 Apr 2015) Changed paths: M index.html Log Message: --- Fix schema not updated on loading and hide schema from ui Commit: 9d902bb0755489f3454cda0a4bd6c6a43dedcaf0 https://github.com/volkszaehler/vzlogger/commit/9d902bb0755489f3454cda0a4bd6c6a43dedcaf0 Author: andig cpui...@gmx.de Date: 2015-04-01 (Wed, 01 Apr 2015) Changed paths: M index.html Log Message: --- Merge pull request #152 from andig/gh-pages Fix schema not updated on loading and hide schema from ui Compare: https://github.com/volkszaehler/vzlogger/compare/2a0b246aa0a3...9d902bb07554
[vz-dev] [volkszaehler/vzlogger] 073cee: Added config editor skeleton
Branch: refs/heads/gh-pages Home: https://github.com/volkszaehler/vzlogger Commit: 073ceecfe58a3a13c71a46a3c80e1f11bef3f68d https://github.com/volkszaehler/vzlogger/commit/073ceecfe58a3a13c71a46a3c80e1f11bef3f68d Author: andig cpui...@gmx.de Date: 2015-03-31 (Tue, 31 Mar 2015) Changed paths: A index.html A js/jsoneditor.min.js A js/xregexp-min.js A schema.json Log Message: --- Added config editor skeleton Commit: 2a0b246aa0a349121343d7b7409dd77fdb165f22 https://github.com/volkszaehler/vzlogger/commit/2a0b246aa0a349121343d7b7409dd77fdb165f22 Author: andig cpui...@gmx.de Date: 2015-03-31 (Tue, 31 Mar 2015) Changed paths: A index.html A js/jsoneditor.min.js A js/xregexp-min.js A schema.json Log Message: --- Merge pull request #151 from andig/gh-pages Add online config editor Compare: https://github.com/volkszaehler/vzlogger/compare/53d14ce7b74c...2a0b246aa0a3
[vz-dev] [volkszaehler/vzlogger]
Branch: refs/heads/gh-pages Home: https://github.com/volkszaehler/vzlogger
[vz-dev] [volkszaehler/vzlogger] c09290: Fix invalid json
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: c09290c1ea3f7b01bbd793fc14646850665c346e https://github.com/volkszaehler/vzlogger/commit/c09290c1ea3f7b01bbd793fc14646850665c346e Author: andig cpui...@gmx.de Date: 2015-03-28 (Sat, 28 Mar 2015) Changed paths: M etc/vzlogger.conf Log Message: --- Fix invalid json
[vz-dev] [volkszaehler/volkszaehler.org] 099c68: Implement Symfony HTTPKernelInterface
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: 099c68ecf7079a82568703143fb588849712fb31 https://github.com/volkszaehler/volkszaehler.org/commit/099c68ecf7079a82568703143fb588849712fb31 Author: andig cpui...@gmx.de Date: 2015-02-25 (Wed, 25 Feb 2015) Changed paths: A .editorconfig M composer.json M htdocs/middleware.php M lib/Volkszaehler/Controller/AggregatorController.php M lib/Volkszaehler/Controller/ChannelController.php M lib/Volkszaehler/Controller/Controller.php M lib/Volkszaehler/Controller/DataController.php M lib/Volkszaehler/Controller/EntityController.php M lib/Volkszaehler/Router.php M lib/Volkszaehler/View/CSV.php R lib/Volkszaehler/View/HTTP/Request.php R lib/Volkszaehler/View/HTTP/Response.php M lib/Volkszaehler/View/JSON.php M lib/Volkszaehler/View/JpGraph.php M lib/Volkszaehler/View/View.php M lib/Volkszaehler/View/XML.php M test/Tests/AggregationPerformanceTest.php M test/Tests/AggregationTest.php M test/Tests/ChannelTest.php A test/Tests/CounterTest.php A test/Tests/Data.php R test/Tests/DataContext.php R test/Tests/DataContextPerformance.php R test/Tests/DataCounterTest.php R test/Tests/DataMeterTest.php A test/Tests/DataPerformance.php R test/Tests/DataSensorTest.php R test/Tests/Entity.php A test/Tests/EntityTest.php A test/Tests/FormatTest.php M test/Tests/GroupTest.php A test/Tests/MeterTest.php M test/Tests/Middleware.php A test/Tests/ProtocolTest.php A test/Tests/SensorTest.php M test/Tests/SetupPerformanceData.php R test/Wrapper/Router.php R test/Wrapper/View/HTTP/Request.php R test/Wrapper/View/HTTP/Response.php M test/phpunit.xml Log Message: --- Implement Symfony HTTPKernelInterface Commit: 5bc087a250a681ed8065cc45c69066942cb091d3 https://github.com/volkszaehler/volkszaehler.org/commit/5bc087a250a681ed8065cc45c69066942cb091d3 Author: andig cpui...@gmx.de Date: 2015-03-28 (Sat, 28 Mar 2015) Changed paths: M lib/Volkszaehler/Router.php Log Message: --- Workaround for mod_rewrite issue with HttpFoundation\Request-getPathInfo Commit: 4e56f549c1b451e31944153635ad685d796f9009 https://github.com/volkszaehler/volkszaehler.org/commit/4e56f549c1b451e31944153635ad685d796f9009 Author: andig cpui...@gmx.de Date: 2015-03-28 (Sat, 28 Mar 2015) Changed paths: A .editorconfig M composer.json M htdocs/middleware.php M lib/Volkszaehler/Controller/AggregatorController.php M lib/Volkszaehler/Controller/ChannelController.php M lib/Volkszaehler/Controller/Controller.php M lib/Volkszaehler/Controller/DataController.php M lib/Volkszaehler/Controller/EntityController.php M lib/Volkszaehler/Router.php M lib/Volkszaehler/View/CSV.php R lib/Volkszaehler/View/HTTP/Request.php R lib/Volkszaehler/View/HTTP/Response.php M lib/Volkszaehler/View/JSON.php M lib/Volkszaehler/View/JpGraph.php M lib/Volkszaehler/View/View.php M lib/Volkszaehler/View/XML.php M test/Tests/AggregationPerformanceTest.php M test/Tests/AggregationTest.php M test/Tests/ChannelTest.php A test/Tests/CounterTest.php A test/Tests/Data.php R test/Tests/DataContext.php R test/Tests/DataContextPerformance.php R test/Tests/DataCounterTest.php R test/Tests/DataMeterTest.php A test/Tests/DataPerformance.php R test/Tests/DataSensorTest.php R test/Tests/Entity.php A test/Tests/EntityTest.php A test/Tests/FormatTest.php M test/Tests/GroupTest.php A test/Tests/MeterTest.php M test/Tests/Middleware.php A test/Tests/ProtocolTest.php A test/Tests/SensorTest.php M test/Tests/SetupPerformanceData.php R test/Wrapper/Router.php R test/Wrapper/View/HTTP/Request.php R test/Wrapper/View/HTTP/Response.php M test/phpunit.xml Log Message: --- Merge pull request #254 from andig/httpkernelinterface Implement Symfony HTTPKernelInterface Compare: https://github.com/volkszaehler/volkszaehler.org/compare/a2ef5894d774...4e56f549c1b4
[vz-dev] [volkszaehler/volkszaehler.org] 3e500f: Fix PATH_INFO being empty
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: 3e500f3e5bbd6f7eff807ff16936d2a822f402e6 https://github.com/volkszaehler/volkszaehler.org/commit/3e500f3e5bbd6f7eff807ff16936d2a822f402e6 Author: andig cpui...@gmx.de Date: 2015-03-28 (Sat, 28 Mar 2015) Changed paths: M lib/Volkszaehler/Router.php Log Message: --- Fix PATH_INFO being empty Commit: 1e11b09a678d10a6d670e873180ad4912a93ac71 https://github.com/volkszaehler/volkszaehler.org/commit/1e11b09a678d10a6d670e873180ad4912a93ac71 Author: andig cpui...@gmx.de Date: 2015-03-28 (Sat, 28 Mar 2015) Changed paths: M lib/Volkszaehler/Router.php Log Message: --- Merge pull request #282 from andig/fix-httpkernel Fix PATH_INFO being empty Compare: https://github.com/volkszaehler/volkszaehler.org/compare/4e56f549c1b4...1e11b09a678d
[vz-dev] [volkszaehler/vzlogger] ad1bac: Removed INSTALL from install make target
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: ad1bac8f23d54611e5ef9702e75e5f58a9a59eb8 https://github.com/volkszaehler/vzlogger/commit/ad1bac8f23d54611e5ef9702e75e5f58a9a59eb8 Author: andig cpui...@gmx.de Date: 2015-03-02 (Mon, 02 Mar 2015) Changed paths: M CMakeLists.txt Log Message: --- Removed INSTALL from install make target Commit: 1453077a1be04855992d4c9b01361c49e0d20584 https://github.com/volkszaehler/vzlogger/commit/1453077a1be04855992d4c9b01361c49e0d20584 Author: andig cpui...@gmx.de Date: 2015-03-02 (Mon, 02 Mar 2015) Changed paths: M CMakeLists.txt Log Message: --- Merge pull request #136 from volkszaehler/andig-patch-1 Removed INSTALL from install make target Compare: https://github.com/volkszaehler/vzlogger/compare/efd38e988a60...1453077a1be0
[vz-dev] [volkszaehler/vzlogger]
Branch: refs/heads/revert-113-meterD0_autoackseq Home: https://github.com/volkszaehler/vzlogger
[vz-dev] [volkszaehler/vzlogger]
Branch: refs/heads/andig-patch-1 Home: https://github.com/volkszaehler/vzlogger
[vz-dev] [volkszaehler/vzlogger]
Branch: refs/heads/install-2 Home: https://github.com/volkszaehler/vzlogger
[vz-dev] [volkszaehler/volkszaehler.org] b7ca82: Fix typos
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: b7ca82821089dd3fce5efbbd1b1ac77538431967 https://github.com/volkszaehler/volkszaehler.org/commit/b7ca82821089dd3fce5efbbd1b1ac77538431967 Author: andig cpui...@gmx.de Date: 2015-02-23 (Mon, 23 Feb 2015) Changed paths: M misc/tools/vzclient Log Message: --- Fix typos Commit: f16fa56a48c26ae67e8b26f09e1af4768d084e83 https://github.com/volkszaehler/volkszaehler.org/commit/f16fa56a48c26ae67e8b26f09e1af4768d084e83 Author: andig cpui...@gmx.de Date: 2015-02-23 (Mon, 23 Feb 2015) Changed paths: A misc/tools/jsonclient Log Message: --- Add jsonclient for HTTP access to json datasources Commit: b51a081783e5e0b4fec72a2d07bbe2a2efe18293 https://github.com/volkszaehler/volkszaehler.org/commit/b51a081783e5e0b4fec72a2d07bbe2a2efe18293 Author: andig cpui...@gmx.de Date: 2015-02-28 (Sat, 28 Feb 2015) Changed paths: A misc/tools/jsonclient M misc/tools/vzclient Log Message: --- Merge pull request #252 from andig/jsonclient Added jsonclient Compare: https://github.com/volkszaehler/volkszaehler.org/compare/2455d725aa3e...b51a081783e5
[vz-dev] [volkszaehler/volkszaehler.org] feeb92: Update build status link
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: feeb928ecf12d9168d42ec8f1abef9c78d04fd26 https://github.com/volkszaehler/volkszaehler.org/commit/feeb928ecf12d9168d42ec8f1abef9c78d04fd26 Author: andig cpui...@gmx.de Date: 2015-02-28 (Sat, 28 Feb 2015) Changed paths: M README.md Log Message: --- Update build status link
[vz-dev] [volkszaehler/volkszaehler.org] dc5af3: Fix install fail on missing prerequisite
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: dc5af3639c754c7966bc628ed3917963dfc2d3e9 https://github.com/volkszaehler/volkszaehler.org/commit/dc5af3639c754c7966bc628ed3917963dfc2d3e9 Author: andig cpui...@gmx.de Date: 2015-02-28 (Sat, 28 Feb 2015) Changed paths: M misc/tools/install.sh Log Message: --- Fix install fail on missing prerequisite Commit: cc9a5a8de096de2ba07039a1c2dfcdbfd996f05d https://github.com/volkszaehler/volkszaehler.org/commit/cc9a5a8de096de2ba07039a1c2dfcdbfd996f05d Author: andig cpui...@gmx.de Date: 2015-02-28 (Sat, 28 Feb 2015) Changed paths: M misc/tools/install.sh Log Message: --- Merge pull request #259 from andig/master Fix install failing on missing prerequisite Compare: https://github.com/volkszaehler/volkszaehler.org/compare/7b02f78a4317...cc9a5a8de096
[vz-dev] [volkszaehler/vzlogger] 1bd4f3: Updated readme with installation instructions
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: 1bd4f36ea3ceb775000d294b9a2b3a6607cf7933 https://github.com/volkszaehler/vzlogger/commit/1bd4f36ea3ceb775000d294b9a2b3a6607cf7933 Author: andig cpui...@gmx.de Date: 2015-03-02 (Mon, 02 Mar 2015) Changed paths: M README Log Message: --- Updated readme with installation instructions Commit: c081ce41e22c217037ab33dee73790c13f43e7a1 https://github.com/volkszaehler/vzlogger/commit/c081ce41e22c217037ab33dee73790c13f43e7a1 Author: andig cpui...@gmx.de Date: 2015-03-02 (Mon, 02 Mar 2015) Changed paths: M README Log Message: --- Merge pull request #135 from andig/readme Updated readme with installation instructions Compare: https://github.com/volkszaehler/vzlogger/compare/6a0609bda886...c081ce41e22c
[vz-dev] [volkszaehler/vzlogger]
Branch: refs/heads/mbehr-libmicrohttpd Home: https://github.com/volkszaehler/vzlogger
[vz-dev] [volkszaehler/vzlogger] efd38e: Updated link to install.sh
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: efd38e988a601515ace6f9a54fd71d369147a436 https://github.com/volkszaehler/vzlogger/commit/efd38e988a601515ace6f9a54fd71d369147a436 Author: andig cpui...@gmx.de Date: 2015-03-02 (Mon, 02 Mar 2015) Changed paths: M README Log Message: --- Updated link to install.sh
[vz-dev] [volkszaehler/vzlogger] ad1bac: Removed INSTALL from install make target
Branch: refs/heads/andig-patch-1 Home: https://github.com/volkszaehler/vzlogger Commit: ad1bac8f23d54611e5ef9702e75e5f58a9a59eb8 https://github.com/volkszaehler/vzlogger/commit/ad1bac8f23d54611e5ef9702e75e5f58a9a59eb8 Author: andig cpui...@gmx.de Date: 2015-03-02 (Mon, 02 Mar 2015) Changed paths: M CMakeLists.txt Log Message: --- Removed INSTALL from install make target
[vz-dev] [volkszaehler/vzlogger] 6fb4a5: Fix install issues with libjson compile and folder...
Branch: refs/heads/install-2 Home: https://github.com/volkszaehler/vzlogger Commit: 6fb4a54de9c017ea174e5fc226b82d67b8c6f19c https://github.com/volkszaehler/vzlogger/commit/6fb4a54de9c017ea174e5fc226b82d67b8c6f19c Author: andig cpui...@gmx.de Date: 2015-03-02 (Mon, 02 Mar 2015) Changed paths: M install.sh Log Message: --- Fix install issues with libjson compile and folder detection
[vz-dev] [volkszaehler/vzlogger] b8a730: Added install script
Branch: refs/heads/install Home: https://github.com/volkszaehler/vzlogger Commit: b8a730d85c142183ecb1ebc83062a500863ad3f6 https://github.com/volkszaehler/vzlogger/commit/b8a730d85c142183ecb1ebc83062a500863ad3f6 Author: andig cpui...@gmx.de Date: 2015-03-01 (Sun, 01 Mar 2015) Changed paths: A install.sh Log Message: --- Added install script
[vz-dev] [volkszaehler/vzlogger]
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger
[vz-dev] [volkszaehler/vzlogger] c79a46: Added install script
Branch: refs/heads/install Home: https://github.com/volkszaehler/vzlogger Commit: c79a4602d9fc58100b7f4c7bc0e7657e559f86fb https://github.com/volkszaehler/vzlogger/commit/c79a4602d9fc58100b7f4c7bc0e7657e559f86fb Author: andig cpui...@gmx.de Date: 2015-03-01 (Sun, 01 Mar 2015) Changed paths: A install.sh Log Message: --- Added install script
[vz-dev] [volkszaehler/vzlogger] 0c7ccc: use LOCAL_SUPPORT to check whether local.c... shou...
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: 0c7ccce10342f774a4552fb1bee055909642d48d https://github.com/volkszaehler/vzlogger/commit/0c7ccce10342f774a4552fb1bee055909642d48d Author: Matthias Behr mb...@mcbehr.de Date: 2015-03-01 (Sun, 01 Mar 2015) Changed paths: M CMakeLists.txt M src/CMakeLists.txt M src/threads.cpp M tests/mocks/CMakeLists.txt Log Message: --- use LOCAL_SUPPORT to check whether local.c... should be used Commit: f6bf8f6c8ee087c0fa65c7a70b706caa7b8a4ce9 https://github.com/volkszaehler/vzlogger/commit/f6bf8f6c8ee087c0fa65c7a70b706caa7b8a4ce9 Author: andig cpui...@gmx.de Date: 2015-03-01 (Sun, 01 Mar 2015) Changed paths: M CMakeLists.txt M src/CMakeLists.txt M src/threads.cpp M tests/mocks/CMakeLists.txt Log Message: --- Merge pull request #133 from mbehr1/libmicrohttpd_131 use LOCAL_SUPPORT to check whether local.c... should be used Compare: https://github.com/volkszaehler/vzlogger/compare/53fa67a9be2b...f6bf8f6c8ee0
[vz-dev] [volkszaehler/volkszaehler.org] f5a93c: Update demo middleware scheme to //
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: f5a93c4d2785238947f878f4b8713e579bf65470 https://github.com/volkszaehler/volkszaehler.org/commit/f5a93c4d2785238947f878f4b8713e579bf65470 Author: andig cpui...@gmx.de Date: 2015-02-25 (Wed, 25 Feb 2015) Changed paths: M htdocs/frontend/javascripts/options.js Log Message: --- Update demo middleware scheme to // Switch to HTTPS if frontend is served on HTTPS. Finally half-fixes https://github.com/volkszaehler/volkszaehler.org/issues/231 after chat with@justinotherguy Commit: 4902f6552f1282dd69c25cc22a0ba73fa027ae40 https://github.com/volkszaehler/volkszaehler.org/commit/4902f6552f1282dd69c25cc22a0ba73fa027ae40 Author: andig cpui...@gmx.de Date: 2015-02-25 (Wed, 25 Feb 2015) Changed paths: M htdocs/frontend/javascripts/options.js Log Message: --- Merge pull request #257 from volkszaehler/andig-patch-2 Update demo middleware scheme to // Compare: https://github.com/volkszaehler/volkszaehler.org/compare/8f06aad3ac12...4902f6552f12
[vz-dev] [volkszaehler/volkszaehler.org]
Branch: refs/heads/andig-patch-2 Home: https://github.com/volkszaehler/volkszaehler.org
[vz-dev] [volkszaehler/volkszaehler.org] 294d2d: Delete CHANGELOG
Branch: refs/heads/andig-patch-1 Home: https://github.com/volkszaehler/volkszaehler.org Commit: 294d2dc367c3fbd6b80f90dccc90076989fa2092 https://github.com/volkszaehler/volkszaehler.org/commit/294d2dc367c3fbd6b80f90dccc90076989fa2092 Author: andig cpui...@gmx.de Date: 2015-02-25 (Wed, 25 Feb 2015) Changed paths: R CHANGELOG Log Message: --- Delete CHANGELOG Entirely outdated
[vz-dev] [volkszaehler/volkszaehler.org] 099c68: Implement Symfony HTTPKernelInterface
Branch: refs/heads/development Home: https://github.com/volkszaehler/volkszaehler.org Commit: 099c68ecf7079a82568703143fb588849712fb31 https://github.com/volkszaehler/volkszaehler.org/commit/099c68ecf7079a82568703143fb588849712fb31 Author: andig cpui...@gmx.de Date: 2015-02-25 (Wed, 25 Feb 2015) Changed paths: A .editorconfig M composer.json M htdocs/middleware.php M lib/Volkszaehler/Controller/AggregatorController.php M lib/Volkszaehler/Controller/ChannelController.php M lib/Volkszaehler/Controller/Controller.php M lib/Volkszaehler/Controller/DataController.php M lib/Volkszaehler/Controller/EntityController.php M lib/Volkszaehler/Router.php M lib/Volkszaehler/View/CSV.php R lib/Volkszaehler/View/HTTP/Request.php R lib/Volkszaehler/View/HTTP/Response.php M lib/Volkszaehler/View/JSON.php M lib/Volkszaehler/View/JpGraph.php M lib/Volkszaehler/View/View.php M lib/Volkszaehler/View/XML.php M test/Tests/AggregationPerformanceTest.php M test/Tests/AggregationTest.php M test/Tests/ChannelTest.php A test/Tests/CounterTest.php A test/Tests/Data.php R test/Tests/DataContext.php R test/Tests/DataContextPerformance.php R test/Tests/DataCounterTest.php R test/Tests/DataMeterTest.php A test/Tests/DataPerformance.php R test/Tests/DataSensorTest.php R test/Tests/Entity.php A test/Tests/EntityTest.php A test/Tests/FormatTest.php M test/Tests/GroupTest.php A test/Tests/MeterTest.php M test/Tests/Middleware.php A test/Tests/ProtocolTest.php A test/Tests/SensorTest.php M test/Tests/SetupPerformanceData.php R test/Wrapper/Router.php R test/Wrapper/View/HTTP/Request.php R test/Wrapper/View/HTTP/Response.php M test/phpunit.xml Log Message: --- Implement Symfony HTTPKernelInterface Commit: d02f2451498690475f3be99f868d5710054113e2 https://github.com/volkszaehler/volkszaehler.org/commit/d02f2451498690475f3be99f868d5710054113e2 Author: andig cpui...@gmx.de Date: 2015-03-08 (Sun, 08 Mar 2015) Changed paths: A .editorconfig M composer.json M htdocs/middleware.php M lib/Volkszaehler/Controller/AggregatorController.php M lib/Volkszaehler/Controller/ChannelController.php M lib/Volkszaehler/Controller/Controller.php M lib/Volkszaehler/Controller/DataController.php M lib/Volkszaehler/Controller/EntityController.php M lib/Volkszaehler/Router.php M lib/Volkszaehler/View/CSV.php R lib/Volkszaehler/View/HTTP/Request.php R lib/Volkszaehler/View/HTTP/Response.php M lib/Volkszaehler/View/JSON.php M lib/Volkszaehler/View/JpGraph.php M lib/Volkszaehler/View/View.php M lib/Volkszaehler/View/XML.php M test/Tests/AggregationPerformanceTest.php M test/Tests/AggregationTest.php M test/Tests/ChannelTest.php A test/Tests/CounterTest.php A test/Tests/Data.php R test/Tests/DataContext.php R test/Tests/DataContextPerformance.php R test/Tests/DataCounterTest.php R test/Tests/DataMeterTest.php A test/Tests/DataPerformance.php R test/Tests/DataSensorTest.php R test/Tests/Entity.php A test/Tests/EntityTest.php A test/Tests/FormatTest.php M test/Tests/GroupTest.php A test/Tests/MeterTest.php M test/Tests/Middleware.php A test/Tests/ProtocolTest.php A test/Tests/SensorTest.php M test/Tests/SetupPerformanceData.php R test/Wrapper/Router.php R test/Wrapper/View/HTTP/Request.php R test/Wrapper/View/HTTP/Response.php M test/phpunit.xml Log Message: --- Merge pull request #264 from andig/httpkernelinterface Implement Symfony HTTPKernelInterface Compare: https://github.com/volkszaehler/volkszaehler.org/compare/2920432e9c46...d02f24514986
[vz-dev] [volkszaehler/vzlogger]
Branch: refs/heads/kk-dev Home: https://github.com/volkszaehler/vzlogger
[vz-dev] [volkszaehler/volkszaehler.org] ca9768: Make jpgraph optional
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: ca9768c3937d4aba8597558d0602b67716d1f529 https://github.com/volkszaehler/volkszaehler.org/commit/ca9768c3937d4aba8597558d0602b67716d1f529 Author: andig cpui...@gmx.de Date: 2015-03-23 (Mon, 23 Mar 2015) Changed paths: M composer.json M misc/tools/install.sh Log Message: --- Make jpgraph optional Commit: a2ef5894d7741d0ac02d73cc97c12c203e9f020b https://github.com/volkszaehler/volkszaehler.org/commit/a2ef5894d7741d0ac02d73cc97c12c203e9f020b Author: andig cpui...@gmx.de Date: 2015-03-23 (Mon, 23 Mar 2015) Changed paths: M composer.json M misc/tools/install.sh Log Message: --- Merge pull request #279 from andig/remove-jpgraph Make jpgraph optional Compare: https://github.com/volkszaehler/volkszaehler.org/compare/4e0f04cf3016...a2ef5894d774
[vz-dev] [volkszaehler/volkszaehler.org] de3e62: Use native pretty-printing on PHP 5.4
Branch: refs/heads/development Home: https://github.com/volkszaehler/volkszaehler.org Commit: de3e62aac344729e7be7d9dd3f45f61e9b092f5c https://github.com/volkszaehler/volkszaehler.org/commit/de3e62aac344729e7be7d9dd3f45f61e9b092f5c Author: andig cpui...@gmx.de Date: 2015-03-12 (Thu, 12 Mar 2015) Changed paths: M lib/Volkszaehler/Util/JSON.php Log Message: --- Use native pretty-printing on PHP 5.4 Commit: 4692e35374645066703d7aee886a7235c7efba10 https://github.com/volkszaehler/volkszaehler.org/commit/4692e35374645066703d7aee886a7235c7efba10 Author: andig cpui...@gmx.de Date: 2015-03-14 (Sat, 14 Mar 2015) Changed paths: M lib/Volkszaehler/Util/JSON.php Log Message: --- Merge pull request #273 from andig/fix-json Use native pretty-printing on PHP 5.4 Commit: 37eba771edc50b539a05aecb2b075c2af0689df6 https://github.com/volkszaehler/volkszaehler.org/commit/37eba771edc50b539a05aecb2b075c2af0689df6 Author: Andreas Goetz cpui...@gmx.de Date: 2015-03-15 (Sun, 15 Mar 2015) Changed paths: M misc/controller/README A misc/controller/digitalstrom/dss.sh Log Message: --- Added digitalstrom example Commit: 4e0f04cf30161ab2d9e9da9a8a426a558fa39119 https://github.com/volkszaehler/volkszaehler.org/commit/4e0f04cf30161ab2d9e9da9a8a426a558fa39119 Author: andig cpui...@gmx.de Date: 2015-03-15 (Sun, 15 Mar 2015) Changed paths: M misc/controller/README A misc/controller/digitalstrom/dss.sh Log Message: --- Merge pull request #265 from andig/digitalstrom Added digitalstrom example Commit: 899eae41f5235eaf2a9e735e95077fcbf666d9f7 https://github.com/volkszaehler/volkszaehler.org/commit/899eae41f5235eaf2a9e735e95077fcbf666d9f7 Author: andig cpui...@gmx.de Date: 2015-03-23 (Mon, 23 Mar 2015) Changed paths: M .travis.yml Log Message: --- Speedup build process Commit: 485fd297ca6d93bc543677f7f5e53e36783f6a2d https://github.com/volkszaehler/volkszaehler.org/commit/485fd297ca6d93bc543677f7f5e53e36783f6a2d Author: andig cpui...@gmx.de Date: 2015-03-23 (Mon, 23 Mar 2015) Changed paths: M lib/Volkszaehler/Model/Aggregate.php M lib/Volkszaehler/Model/Data.php Log Message: --- Fix sqlite build Commit: ca9768c3937d4aba8597558d0602b67716d1f529 https://github.com/volkszaehler/volkszaehler.org/commit/ca9768c3937d4aba8597558d0602b67716d1f529 Author: andig cpui...@gmx.de Date: 2015-03-23 (Mon, 23 Mar 2015) Changed paths: M composer.json M misc/tools/install.sh Log Message: --- Make jpgraph optional Commit: a2ef5894d7741d0ac02d73cc97c12c203e9f020b https://github.com/volkszaehler/volkszaehler.org/commit/a2ef5894d7741d0ac02d73cc97c12c203e9f020b Author: andig cpui...@gmx.de Date: 2015-03-23 (Mon, 23 Mar 2015) Changed paths: M composer.json M misc/tools/install.sh Log Message: --- Merge pull request #279 from andig/remove-jpgraph Make jpgraph optional Commit: 028e20747677dc9bfb2ada5abf2267c9f29b8b28 https://github.com/volkszaehler/volkszaehler.org/commit/028e20747677dc9bfb2ada5abf2267c9f29b8b28 Author: andig cpui...@gmx.de Date: 2015-03-24 (Tue, 24 Mar 2015) Changed paths: M .travis.yml Log Message: --- Remove composer self-update and debug statement Commit: 5bc087a250a681ed8065cc45c69066942cb091d3 https://github.com/volkszaehler/volkszaehler.org/commit/5bc087a250a681ed8065cc45c69066942cb091d3 Author: andig cpui...@gmx.de Date: 2015-03-28 (Sat, 28 Mar 2015) Changed paths: M lib/Volkszaehler/Router.php Log Message: --- Workaround for mod_rewrite issue with HttpFoundation\Request-getPathInfo Commit: 4e56f549c1b451e31944153635ad685d796f9009 https://github.com/volkszaehler/volkszaehler.org/commit/4e56f549c1b451e31944153635ad685d796f9009 Author: andig cpui...@gmx.de Date: 2015-03-28 (Sat, 28 Mar 2015) Changed paths: A .editorconfig M composer.json M htdocs/middleware.php M lib/Volkszaehler/Controller/AggregatorController.php M lib/Volkszaehler/Controller/ChannelController.php M lib/Volkszaehler/Controller/Controller.php M lib/Volkszaehler/Controller/DataController.php M lib/Volkszaehler/Controller/EntityController.php M lib/Volkszaehler/Router.php M lib/Volkszaehler/View/CSV.php R lib/Volkszaehler/View/HTTP/Request.php R lib/Volkszaehler/View/HTTP/Response.php M lib/Volkszaehler/View/JSON.php M lib/Volkszaehler/View/JpGraph.php M lib/Volkszaehler/View/View.php M lib/Volkszaehler/View/XML.php M test/Tests/AggregationPerformanceTest.php M test/Tests/AggregationTest.php M test/Tests/ChannelTest.php A test/Tests/CounterTest.php A test/Tests/Data.php R test/Tests/DataContext.php R test/Tests/DataContextPerformance.php R
[vz-dev] [volkszaehler/volkszaehler.org] 505ae1: Remove test wrapper
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: 505ae13d50d59fdbcc4dceb97699e5b39d6997e7 https://github.com/volkszaehler/volkszaehler.org/commit/505ae13d50d59fdbcc4dceb97699e5b39d6997e7 Author: andig cpui...@gmx.de Date: 2015-04-02 (Thu, 02 Apr 2015) Changed paths: M composer.json Log Message: --- Remove test wrapper
[vz-dev] [volkszaehler/vzlogger] d62f4c: first version of ocr meter based on schema configu...
Branch: refs/heads/master Home: https://github.com/volkszaehler/vzlogger Commit: d62f4cfc385748fce9c1084c524ec405e5ca4d61 https://github.com/volkszaehler/vzlogger/commit/d62f4cfc385748fce9c1084c524ec405e5ca4d61 Author: Matthias Behr mb...@mcbehr.de Date: 2015-04-18 (Sat, 18 Apr 2015) Changed paths: M .travis.yml M CMakeLists.txt M config.hpp.in A etc/vzlogger.conf.meterOCR M etc/vzlogger_generic.schema.json M include/Options.hpp M include/meter_protocol.hpp A include/protocols/MeterOCR.hpp M modules/CompilerFlags.cmake A modules/FindLeptonica.cmake M src/CMakeLists.txt M src/Config_Options.cpp M src/Meter.cpp M src/Options.cpp M src/Reading.cpp M src/protocols/CMakeLists.txt M src/protocols/MeterD0.cpp A src/protocols/MeterOCR.cpp A src/protocols/MeterOCRTesseract.cpp M src/threads.cpp M tests/CMakeLists.txt A tests/meterOCR/emh_test2.png A tests/meterOCR/img.png A tests/meterOCR/img2.png A tests/meterOCR/img2_blue.png A tests/meterOCR/sensus_test1.png A tests/meterOCR/sensus_test1_digonly1.png A tests/meterOCR/sensus_test1_nronly1.png A tests/meterOCR/sensus_test1_nronly2.png M tests/mocks/CMakeLists.txt A tests/mocks/protocols/MeterOCR.hpp A tests/ut_MeterOCR.cpp A tests/ut_MeterOCRTesseract.cpp M tests/ut_api_volkszaehler.cpp Log Message: --- first version of ocr meter based on schema configuration Commit: 19eb2d0ebfdd58352731f4ba8008e2cdb634d7a6 https://github.com/volkszaehler/vzlogger/commit/19eb2d0ebfdd58352731f4ba8008e2cdb634d7a6 Author: Matthias Behr mb...@mcbehr.de Date: 2015-04-19 (Sun, 19 Apr 2015) Changed paths: M .travis.yml M CMakeLists.txt M config.hpp.in A etc/vzlogger.conf.meterOCR M etc/vzlogger_generic.schema.json M include/Options.hpp M include/meter_protocol.hpp A include/protocols/MeterOCR.hpp M modules/CompilerFlags.cmake A modules/FindLeptonica.cmake M src/CMakeLists.txt M src/Config_Options.cpp M src/Meter.cpp M src/Options.cpp M src/Reading.cpp M src/protocols/CMakeLists.txt M src/protocols/MeterD0.cpp A src/protocols/MeterOCR.cpp A src/protocols/MeterOCRTesseract.cpp M src/threads.cpp M tests/CMakeLists.txt A tests/meterOCR/emh_test2.png A tests/meterOCR/img.png A tests/meterOCR/img2.png A tests/meterOCR/img2_blue.png A tests/meterOCR/sensus_test1.png A tests/meterOCR/sensus_test1_digonly1.png A tests/meterOCR/sensus_test1_nronly1.png A tests/meterOCR/sensus_test1_nronly2.png M tests/mocks/CMakeLists.txt A tests/mocks/protocols/MeterOCR.hpp A tests/ut_MeterOCR.cpp A tests/ut_MeterOCRTesseract.cpp M tests/ut_api_volkszaehler.cpp Log Message: --- Merge pull request #157 from mbehr1/meterOCRv03 first version of ocr meter based on schema configuration Compare: https://github.com/volkszaehler/vzlogger/compare/1e9c78a3b408...19eb2d0ebfdd
[vz-dev] [volkszaehler/volkszaehler.org] 13aaeb: Add 15m grouping option to MySQLOptimizer
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: 13aaeb982b35c0a46a1ebf2afdc4dc6831ac9c5d https://github.com/volkszaehler/volkszaehler.org/commit/13aaeb982b35c0a46a1ebf2afdc4dc6831ac9c5d Author: andig cpui...@gmx.de Date: 2015-04-19 (Sun, 19 Apr 2015) Changed paths: M etc/volkszaehler.conf.template.php M lib/Volkszaehler/Interpreter/SQL/MySQLOptimizer.php M lib/Volkszaehler/Interpreter/SQL/SQLOptimizer.php Log Message: --- Add 15m grouping option to MySQLOptimizer Commit: 4f8bf897bd60cebd74feba023bf15f8062dce253 https://github.com/volkszaehler/volkszaehler.org/commit/4f8bf897bd60cebd74feba023bf15f8062dce253 Author: andig cpui...@gmx.de Date: 2015-04-21 (Tue, 21 Apr 2015) Changed paths: M etc/volkszaehler.conf.template.php M lib/Volkszaehler/Interpreter/SQL/MySQLOptimizer.php M lib/Volkszaehler/Interpreter/SQL/SQLOptimizer.php Log Message: --- Merge pull request #294 from andig/demo-for-justin Add 15m grouping option to MySQLOptimizer Compare: https://github.com/volkszaehler/volkszaehler.org/compare/504213af4d80...4f8bf897bd60
[vz-dev] [volkszaehler/vzlogger] bc99e8: Remove master tree
Branch: refs/heads/gh-pages Home: https://github.com/volkszaehler/vzlogger Commit: bc99e8b82c609801c0e23335e40d23e4dbd3ab64 https://github.com/volkszaehler/vzlogger/commit/bc99e8b82c609801c0e23335e40d23e4dbd3ab64 Author: andig cpui...@gmx.de Date: 2015-04-21 (Tue, 21 Apr 2015) Changed paths: R .editorconfig R .gitignore R .travis.yml R AUTHORS R CMakeLists.txt R COPYING R Dashboards/CTestConfigVZlogger.cmake R Dashboards/KDECTestNightly.cmake R Dashboards/Tools.cmake R Dashboards/VZLoggerCoverage.cmake R Dashboards/VZLoggerNightly.cmake R Dashboards/run_nightly R README.mysmartgrid R config.hpp.in R debian/changelog R debian/compat R debian/control R debian/copyright R debian/rules R debian/source/format R debian/vzlogger.init R debian/vzlogger.manpages R debian/vzlogger.postinst R docs/vzlogger.1 R etc/vzlogger.conf R etc/vzlogger_generic.schema.json R etc/vzlogger_generic.schema.json.todo R gmock/CMakeLists.txt R gtest/CMakeLists.txt R include/ApiIF.hpp R include/Buffer.hpp R include/Channel.hpp R include/Config_Options.hpp R include/CurlSessionProvider.hpp R include/Json.hpp R include/Meter.hpp R include/MeterMap.hpp R include/Obis.hpp R include/Options.hpp R include/Reading.hpp R include/VZException.hpp R include/api.h R include/api/CurlCallback.hpp R include/api/CurlIF.hpp R include/api/CurlResponse.hpp R include/api/MySmartGrid.hpp R include/api/Null.hpp R include/api/Volkszaehler.hpp R include/common.h R include/exception.h R include/gitSha1.h R include/list.h R include/local.h R include/meter_protocol.hpp R include/protocols/MeterD0.hpp R include/protocols/MeterExec.hpp R include/protocols/MeterFile.hpp R include/protocols/MeterFluksoV2.hpp R include/protocols/MeterRandom.hpp R include/protocols/MeterS0.hpp R include/protocols/MeterSML.hpp R include/protocols/Protocol.hpp R include/shared_ptr.hpp R include/threads.h R include/unit.h R include/vzlogger.h R install.sh R modules/CompilerFlags.cmake R modules/ConfigureMacro.cmake R modules/DebDependencies.cmake R modules/FindCURL_WIN32.cmake R modules/FindGnutls.cmake R modules/FindJson.cmake R modules/FindMicroHttpd.cmake R modules/FindSML.cmake R modules/GetGitRevisionDescription.cmake R modules/GetGitRevisionDescription.cmake.in R modules/OpenWRT.cmake R modules/UseCodeCoverage.cmake R schema.json R src/Buffer.cpp R src/CMakeLists.txt R src/Channel.cpp R src/Config_Options.cpp R src/CurlSessionProvider.cpp R src/Meter.cpp R src/MeterMap.cpp R src/Obis.cpp R src/Options.cpp R src/Reading.cpp R src/api.cpp R src/api/CMakeLists.txt R src/api/CurlCallback.cpp R src/api/CurlIF.cpp R src/api/CurlResponse.cpp R src/api/MySmartGrid.cpp R src/api/Null.cpp R src/api/Volkszaehler.cpp R src/exception.cpp R src/gitSha1.cpp.in R src/local.cpp R src/ltqnorm.cpp R src/protocols/CMakeLists.txt R src/protocols/MeterD0.cpp R src/protocols/MeterExec.cpp R src/protocols/MeterFile.cpp R src/protocols/MeterFluksoV2.cpp R src/protocols/MeterRandom.cpp R src/protocols/MeterS0.cpp R src/protocols/MeterSML.cpp R src/test.cpp R src/threads.cpp R src/vzlogger.cpp R tests/CMakeLists.txt R tests/MeterD0.cpp R tests/MeterSML.cpp R tests/example_test.cpp R tests/main.cpp R tests/mocks/CMakeLists.txt R tests/mocks/Channel.hpp R tests/mocks/mock_metermap.cpp R tests/ut_CurlSessionProvider.cpp R tests/ut_MeterFile.cpp R tests/ut_api_volkszaehler.cpp R tests/ut_buffer.cpp R tests/ut_meter.cpp R tests/ut_obis.cpp Log Message: --- Remove master tree Commit: 0d2a6bc29895db2901f67aff043970c1bd0532b4 https://github.com/volkszaehler/vzlogger/commit/0d2a6bc29895db2901f67aff043970c1bd0532b4 Author: andig cpui...@gmx.de Date: 2015-04-21 (Tue, 21 Apr 2015) Changed paths: R .editorconfig R .gitignore R .travis.yml R AUTHORS R CMakeLists.txt R COPYING R Dashboards/CTestConfigVZlogger.cmake R Dashboards/KDECTestNightly.cmake R Dashboards/Tools.cmake R Dashboards/VZLoggerCoverage.cmake R Dashboards/VZLoggerNightly.cmake R Dashboards/run_nightly R README.mysmartgrid R config.hpp.in R debian/changelog R debian/compat R debian/control R debian/copyright R debian/rules R debian/source/format R debian/vzlogger.init R debian/vzlogger.manpages R debian/vzlogger.postinst R docs/vzlogger.1 R etc/vzlogger.conf R etc/vzlogger_generic.schema.json R etc/vzlogger_generic.schema.json.todo R gmock/CMakeLists.txt R gtest/CMakeLists.txt R
[vz-dev] [volkszaehler/volkszaehler.org] 320a3f: Add httpd server suggested dependency and upgrade ...
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: 320a3fed71feae0228f4874d70026bea3421c3a6 https://github.com/volkszaehler/volkszaehler.org/commit/320a3fed71feae0228f4874d70026bea3421c3a6 Author: andig cpui...@gmx.de Date: 2015-04-09 (Thu, 09 Apr 2015) Changed paths: M composer.json M lib/Volkszaehler/Router.php M lib/Volkszaehler/Util/Configuration.php M lib/Volkszaehler/Util/Debug.php M test/Tests/Middleware.php M test/phpunit.xml Log Message: --- Add httpd server suggested dependency and upgrade middleware infrastructure and tests Commit: 9be076a52972ee708dc8fbd986924e10b1474d8d https://github.com/volkszaehler/volkszaehler.org/commit/9be076a52972ee708dc8fbd986924e10b1474d8d Author: andig cpui...@gmx.de Date: 2015-04-09 (Thu, 09 Apr 2015) Changed paths: M composer.json M test/Tests/Middleware.php Log Message: --- Allow unstable child packages for httpd Commit: 5d97953345f6298d448f6c3a8655710ab6ed8c7b https://github.com/volkszaehler/volkszaehler.org/commit/5d97953345f6298d448f6c3a8655710ab6ed8c7b Author: andig cpui...@gmx.de Date: 2015-04-16 (Thu, 16 Apr 2015) Changed paths: M .travis.yml M composer.json Log Message: --- Add tests on httpd Commit: d3cdda4b70f93bf17ae03b95005ccf48eaee41c8 https://github.com/volkszaehler/volkszaehler.org/commit/d3cdda4b70f93bf17ae03b95005ccf48eaee41c8 Author: andig cpui...@gmx.de Date: 2015-04-20 (Mon, 20 Apr 2015) Changed paths: M test/Tests/Middleware.php M test/Tests/ProtocolTest.php Log Message: --- Fix mixed GET/POST parameters Commit: 229d348d95fcc66570ded0bd057b13f6dcf5ce2d https://github.com/volkszaehler/volkszaehler.org/commit/229d348d95fcc66570ded0bd057b13f6dcf5ce2d Author: andig cpui...@gmx.de Date: 2015-04-24 (Fri, 24 Apr 2015) Changed paths: M .travis.yml M test/bin/apc.ini R test/bin/install-apcu.sh Log Message: --- Restart httpd after config changes, re-add apc caching Commit: 8840d90e18a7865e6fca5e9a6ff1b78eb884adb0 https://github.com/volkszaehler/volkszaehler.org/commit/8840d90e18a7865e6fca5e9a6ff1b78eb884adb0 Author: andig cpui...@gmx.de Date: 2015-04-26 (Sun, 26 Apr 2015) Changed paths: M .travis.yml M composer.json M lib/Volkszaehler/Router.php M lib/Volkszaehler/Util/Configuration.php M lib/Volkszaehler/Util/Debug.php M test/Tests/Middleware.php M test/Tests/ProtocolTest.php M test/bin/apc.ini R test/bin/install-apcu.sh M test/phpunit.xml Log Message: --- Merge pull request #281 from andig/react-server Add httpd server suggested dependency Compare: https://github.com/volkszaehler/volkszaehler.org/compare/4f8bf897bd60...8840d90e18a7
[vz-dev] [volkszaehler/volkszaehler.org] 504213: reworked parts of the install script
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: 504213af4d80a076b6d919f66951cf63967ef3b8 https://github.com/volkszaehler/volkszaehler.org/commit/504213af4d80a076b6d919f66951cf63967ef3b8 Author: Jakob Hirsch j...@plonk.de Date: 2015-04-20 (Mon, 20 Apr 2015) Changed paths: M misc/tools/install.sh Log Message: --- reworked parts of the install script - allow to specify vz target dir on command line (handy for testing, but also handy fo real world usage) - clone directly into the target dir instead of a temp dir and cp to target. this way, we have a fully working clone, i.e. you can later use git pull to update - get_* functions now directly update the vz config - check for php module pdo_mysql, we need this - use dedicated php version check function - fixed composer check (and output) - only copy sample vz config if there is not already one
[vz-dev] [volkszaehler/volkszaehler.org] 13ffdc: Fix speedupFactor always null
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: 13ffdcd7b0f90ca1437ec57eb71c94e44156d648 https://github.com/volkszaehler/volkszaehler.org/commit/13ffdcd7b0f90ca1437ec57eb71c94e44156d648 Author: andig cpui...@gmx.de Date: 2015-05-03 (Sun, 03 May 2015) Changed paths: M htdocs/frontend/javascripts/entities.js Log Message: --- Fix speedupFactor always null
[vz-dev] [volkszaehler/volkszaehler.org] 64f1c6: Added fail-safe shell_exec
Branch: refs/heads/master Home: https://github.com/volkszaehler/volkszaehler.org Commit: 64f1c6608c9c4ee903d9efbbfb8d373b441205b8 https://github.com/volkszaehler/volkszaehler.org/commit/64f1c6608c9c4ee903d9efbbfb8d373b441205b8 Author: andig cpui...@gmx.de Date: 2015-05-06 (Wed, 06 May 2015) Changed paths: M lib/Volkszaehler/Util/Debug.php M lib/Volkszaehler/View/CSV.php M lib/Volkszaehler/View/JSON.php M lib/Volkszaehler/View/XML.php Log Message: --- Added fail-safe shell_exec Commit: fb71017cb4bece3c212254643201bbab4010dd7b https://github.com/volkszaehler/volkszaehler.org/commit/fb71017cb4bece3c212254643201bbab4010dd7b Author: andig cpui...@gmx.de Date: 2015-05-06 (Wed, 06 May 2015) Changed paths: M lib/Volkszaehler/Util/Debug.php M lib/Volkszaehler/View/CSV.php M lib/Volkszaehler/View/JSON.php M lib/Volkszaehler/View/XML.php Log Message: --- Merge pull request #301 from andig/debug-cleanup Added fail-safe shell_exec Compare: https://github.com/volkszaehler/volkszaehler.org/compare/6aa91d0c56a2...fb71017cb4be