[vz-dev] [volkszaehler/volkszaehler.org] fc5054: Add timezone support

2014-12-29 Diskussionsfäden GitHub
  Branch: refs/heads/master
  Home:   https://github.com/volkszaehler/volkszaehler.org
  Commit: fc5054f5158abac59f45460774832be4121bbd12
  
https://github.com/volkszaehler/volkszaehler.org/commit/fc5054f5158abac59f45460774832be4121bbd12
  Author: andig 
  Date:   2014-12-29 (Mon, 29 Dec 2014)

  Changed paths:
M htdocs/frontend/index.html
A htdocs/frontend/javascripts/flot/date.js
M htdocs/frontend/javascripts/init.js
M htdocs/frontend/javascripts/wui.js

  Log Message:
  ---
  Add timezone support


  Commit: 794cbe6e9356f99cce217744164cf30f5f43c98c
  
https://github.com/volkszaehler/volkszaehler.org/commit/794cbe6e9356f99cce217744164cf30f5f43c98c
  Author: andig 
  Date:   2014-12-30 (Tue, 30 Dec 2014)

  Changed paths:
M htdocs/frontend/index.html
A htdocs/frontend/javascripts/flot/date.js
M htdocs/frontend/javascripts/init.js
M htdocs/frontend/javascripts/wui.js

  Log Message:
  ---
  Merge pull request #202 from andig/fix-timezone

Add timezone support


Compare: 
https://github.com/volkszaehler/volkszaehler.org/compare/dc37fb937700...794cbe6e9356

[vz-dev] [volkszaehler/vzlogger] 3e59e4: add git version info

2014-12-29 Diskussionsfäden GitHub
  Branch: refs/heads/master
  Home:   https://github.com/volkszaehler/vzlogger
  Commit: 3e59e4c3f409ae7e051b7c5a8ddc50eb1ac9db0b
  
https://github.com/volkszaehler/vzlogger/commit/3e59e4c3f409ae7e051b7c5a8ddc50eb1ac9db0b
  Author: Matthias Behr 
  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 
  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/vzlogger] bf8c31: added unit tests for Volkszaehler api_parse_except...

2014-12-29 Diskussionsfäden GitHub
  Branch: refs/heads/master
  Home:   https://github.com/volkszaehler/vzlogger
  Commit: bf8c318a36add7dc5307ad89a6a4bc7a9c7cd530
  
https://github.com/volkszaehler/vzlogger/commit/bf8c318a36add7dc5307ad89a6a4bc7a9c7cd530
  Author: Matthias Behr 
  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 
  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- 
  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/volkszaehler.org] 7a180e: Parse URL Options and use this for retrieving data...

2014-12-29 Diskussionsfäden GitHub
  Branch: refs/heads/master
  Home:   https://github.com/volkszaehler/volkszaehler.org
  Commit: 7a180e9e259f81089f167afbcead20928ea8ea10
  
https://github.com/volkszaehler/volkszaehler.org/commit/7a180e9e259f81089f167afbcead20928ea8ea10
  Author: schoby 
  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 
  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/volkszaehler.org] 6ae36e: inherit protocol for jquery inclusion, don't force...

2014-12-29 Diskussionsfäden GitHub
  Branch: refs/heads/master
  Home:   https://github.com/volkszaehler/volkszaehler.org
  Commit: 6ae36ea3ae5c499e598c213028d3c75feed8
  
https://github.com/volkszaehler/volkszaehler.org/commit/6ae36ea3ae5c499e598c213028d3c75feed8
  Author: Thorben Thuermer 
  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 
  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/vzlogger] d8ddf0: fix cmake -DENABLE_LOCAL=on (to generate "#define ...

2014-12-29 Diskussionsfäden GitHub
  Branch: refs/heads/master
  Home:   https://github.com/volkszaehler/vzlogger
  Commit: d8ddf05cb0f04afb20d049eceabeb20bbc5b04ec
  
https://github.com/volkszaehler/vzlogger/commit/d8ddf05cb0f04afb20d049eceabeb20bbc5b04ec
  Author: r00t- 
  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 
  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