[vz-dev] [volkszaehler/volkszaehler.org] 46fcd3: Simplify directory structure
GitHub
noreply at github.com
Mon Jun 29 11:06:33 CEST 2015
Branch: refs/heads/development
Home: https://github.com/volkszaehler/volkszaehler.org
Commit: 46fcd33c781daf396397b358b4414c32c7750201
https://github.com/volkszaehler/volkszaehler.org/commit/46fcd33c781daf396397b358b4414c32c7750201
Author: andig <cpuidle at gmx.de>
Date: 2015-06-15 (Mon, 15 Jun 2015)
Changed paths:
M .travis.yml
M composer.json
A lib/Controller/AggregatorController.php
A lib/Controller/CapabilitiesController.php
A lib/Controller/ChannelController.php
A lib/Controller/Controller.php
A lib/Controller/DataController.php
A lib/Controller/EntityController.php
A lib/Definition/Definition.php
A lib/Definition/EntityDefinition.json
A lib/Definition/EntityDefinition.php
A lib/Definition/PropertyDefinition.json
A lib/Definition/PropertyDefinition.php
A lib/Definition/README.md
A lib/Interpreter/AggregatorInterpreter.php
A lib/Interpreter/CounterInterpreter.php
A lib/Interpreter/DataIterator.php
A lib/Interpreter/Interpreter.php
A lib/Interpreter/MeterInterpreter.php
A lib/Interpreter/SQL/MySQLAggregateOptimizer.php
A lib/Interpreter/SQL/MySQLOptimizer.php
A lib/Interpreter/SQL/PostgreSQLOptimizer.php
A lib/Interpreter/SQL/SQLOptimizer.php
A lib/Interpreter/SQL/SQLiteOptimizer.php
A lib/Interpreter/SensorInterpreter.php
A lib/Model/Aggregate.php
A lib/Model/Aggregator.php
A lib/Model/Channel.php
A lib/Model/Data.php
A lib/Model/Entity.php
A lib/Model/Property.php
A lib/Router.php
A lib/Util/Aggregation.php
A lib/Util/Configuration.php
A lib/Util/ConsoleApplication.php
A lib/Util/Debug.php
A lib/Util/JSON.php
A lib/Util/Random.php
A lib/Util/UUID.php
A lib/View/CSV.php
A lib/View/JSON.php
A lib/View/JpGraph.php
A lib/View/View.php
A lib/View/XML.php
R lib/Volkszaehler/Controller/AggregatorController.php
R lib/Volkszaehler/Controller/CapabilitiesController.php
R lib/Volkszaehler/Controller/ChannelController.php
R lib/Volkszaehler/Controller/Controller.php
R lib/Volkszaehler/Controller/DataController.php
R lib/Volkszaehler/Controller/EntityController.php
R lib/Volkszaehler/Definition/Definition.php
R lib/Volkszaehler/Definition/EntityDefinition.json
R lib/Volkszaehler/Definition/EntityDefinition.php
R lib/Volkszaehler/Definition/PropertyDefinition.json
R lib/Volkszaehler/Definition/PropertyDefinition.php
R lib/Volkszaehler/Definition/README.md
R lib/Volkszaehler/Interpreter/AggregatorInterpreter.php
R lib/Volkszaehler/Interpreter/CounterInterpreter.php
R lib/Volkszaehler/Interpreter/DataIterator.php
R lib/Volkszaehler/Interpreter/Interpreter.php
R lib/Volkszaehler/Interpreter/MeterInterpreter.php
R lib/Volkszaehler/Interpreter/SQL/MySQLAggregateOptimizer.php
R lib/Volkszaehler/Interpreter/SQL/MySQLOptimizer.php
R lib/Volkszaehler/Interpreter/SQL/PostgreSQLOptimizer.php
R lib/Volkszaehler/Interpreter/SQL/SQLOptimizer.php
R lib/Volkszaehler/Interpreter/SQL/SQLiteOptimizer.php
R lib/Volkszaehler/Interpreter/SensorInterpreter.php
R lib/Volkszaehler/Model/Aggregate.php
R lib/Volkszaehler/Model/Aggregator.php
R lib/Volkszaehler/Model/Channel.php
R lib/Volkszaehler/Model/Data.php
R lib/Volkszaehler/Model/Entity.php
R lib/Volkszaehler/Model/Property.php
R lib/Volkszaehler/Router.php
R lib/Volkszaehler/Util/Aggregation.php
R lib/Volkszaehler/Util/Configuration.php
R lib/Volkszaehler/Util/ConsoleApplication.php
R lib/Volkszaehler/Util/Debug.php
R lib/Volkszaehler/Util/JSON.php
R lib/Volkszaehler/Util/Random.php
R lib/Volkszaehler/Util/UUID.php
R lib/Volkszaehler/View/CSV.php
R lib/Volkszaehler/View/JSON.php
R lib/Volkszaehler/View/JpGraph.php
R lib/Volkszaehler/View/View.php
R lib/Volkszaehler/View/XML.php
M misc/tools/doctrine.php
A phpunit.xml
A test/AggregationPerformanceTest.php
A test/AggregationTest.php
A test/ChannelTest.php
A test/CounterTest.php
A test/Data.php
A test/DataPerformance.php
A test/EntityTest.php
A test/FormatTest.php
A test/GroupTest.php
A test/MeterTest.php
A test/Middleware.php
A test/ProtocolTest.php
R test/README.md
A test/RawTest.php
A test/SensorTest.php
A test/SetupPerformanceData.php
R test/Tests/AggregationPerformanceTest.php
R test/Tests/AggregationTest.php
R test/Tests/ChannelTest.php
R test/Tests/CounterTest.php
R test/Tests/Data.php
R test/Tests/DataPerformance.php
R test/Tests/EntityTest.php
R test/Tests/FormatTest.php
R test/Tests/GroupTest.php
R test/Tests/MeterTest.php
R test/Tests/Middleware.php
R test/Tests/ProtocolTest.php
R test/Tests/RawTest.php
R test/Tests/SensorTest.php
R test/Tests/SetupPerformanceData.php
R test/phpunit.xml
Log Message:
-----------
Simplify directory structure
Commit: 50632dfb1c54766bf8fb9506a7e1ba9024db9fc2
https://github.com/volkszaehler/volkszaehler.org/commit/50632dfb1c54766bf8fb9506a7e1ba9024db9fc2
Author: andig <cpuidle at gmx.de>
Date: 2015-06-16 (Tue, 16 Jun 2015)
Changed paths:
M htdocs/frontend/stylesheets/style.css
Log Message:
-----------
Remove outer margin
Commit: ea1052f305cc877df59effe7ece3861401c1e226
https://github.com/volkszaehler/volkszaehler.org/commit/ea1052f305cc877df59effe7ece3861401c1e226
Author: andig <cpuidle at gmx.de>
Date: 2015-06-22 (Mon, 22 Jun 2015)
Changed paths:
M htdocs/frontend/javascripts/functions.js
M htdocs/frontend/javascripts/wui.js
Log Message:
-----------
Better network error messages
Commit: 2b59b44df798f186ad46c7a381a7a7e562e7f34e
https://github.com/volkszaehler/volkszaehler.org/commit/2b59b44df798f186ad46c7a381a7a7e562e7f34e
Author: andig <cpuidle at gmx.de>
Date: 2015-06-22 (Mon, 22 Jun 2015)
Changed paths:
M htdocs/frontend/stylesheets/style.css
Log Message:
-----------
Merge pull request #320 from volkszaehler/content-css
Remove outer margin
Commit: da51339a0fb308e254bd38aa9c8013dff0e3f60d
https://github.com/volkszaehler/volkszaehler.org/commit/da51339a0fb308e254bd38aa9c8013dff0e3f60d
Author: andig <cpuidle at gmx.de>
Date: 2015-06-23 (Tue, 23 Jun 2015)
Changed paths:
M htdocs/frontend/javascripts/functions.js
M htdocs/frontend/javascripts/wui.js
Log Message:
-----------
Merge pull request #326 from andig/network-error
Better network error messages
Commit: 3fdd40ba6738d6092deca2059d7cc23871356c25
https://github.com/volkszaehler/volkszaehler.org/commit/3fdd40ba6738d6092deca2059d7cc23871356c25
Author: andig <cpuidle at gmx.de>
Date: 2015-06-26 (Fri, 26 Jun 2015)
Changed paths:
M .travis.yml
Log Message:
-----------
Verbose composer output
Commit: e85ae93aeb1440b527d3de9e245ae3bf2cb0955f
https://github.com/volkszaehler/volkszaehler.org/commit/e85ae93aeb1440b527d3de9e245ae3bf2cb0955f
Author: andig <cpuidle at gmx.de>
Date: 2015-06-27 (Sat, 27 Jun 2015)
Changed paths:
M lib/Volkszaehler/Controller/DataController.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
Log Message:
-----------
Expose raw tuple conversion logic
Commit: 103da775be6320282571401ed45649ee359e0460
https://github.com/volkszaehler/volkszaehler.org/commit/103da775be6320282571401ed45649ee359e0460
Author: andig <cpuidle at gmx.de>
Date: 2015-06-27 (Sat, 27 Jun 2015)
Changed paths:
M .travis.yml
M composer.json
M etc/volkszaehler.conf.template.php
M htdocs/frontend/index.html
M htdocs/frontend/javascripts/entities.js
M htdocs/frontend/javascripts/entity.js
M htdocs/frontend/javascripts/functions.js
M htdocs/frontend/javascripts/helper.js
M htdocs/frontend/javascripts/init.js
M htdocs/frontend/javascripts/options.js
M htdocs/frontend/javascripts/wui.js
A htdocs/frontend/vendor/autobahn.min.js
A lib/Volkszaehler/Server/PushHub.php
A misc/tools/push-server.php
Log Message:
-----------
Live updates via web sockets
Commit: 59db4885025e83707d17f0aa89314f9951634ae7
https://github.com/volkszaehler/volkszaehler.org/commit/59db4885025e83707d17f0aa89314f9951634ae7
Author: andig <cpuidle at gmx.de>
Date: 2015-06-27 (Sat, 27 Jun 2015)
Changed paths:
M .travis.yml
M composer.json
M lib/Volkszaehler/Controller/DataController.php
M lib/Volkszaehler/Util/JSON.php
M lib/Volkszaehler/View/JSON.php
M lib/Volkszaehler/View/XML.php
A test/Tests/CapabilitiesTest.php
M test/Tests/ChannelTest.php
M test/Tests/CounterTest.php
M test/Tests/Data.php
M test/Tests/EntityTest.php
M test/Tests/FormatTest.php
M test/Tests/GroupTest.php
M test/Tests/MeterTest.php
M test/Tests/Middleware.php
M test/Tests/ProtocolTest.php
M test/Tests/SensorTest.php
Log Message:
-----------
Reduce data to json memory usage
Commit: 303576d668a0b4a871a4432f085e4896a52abaea
https://github.com/volkszaehler/volkszaehler.org/commit/303576d668a0b4a871a4432f085e4896a52abaea
Author: andig <cpuidle at gmx.de>
Date: 2015-06-29 (Mon, 29 Jun 2015)
Changed paths:
M .travis.yml
M composer.json
M htdocs/frontend/javascripts/functions.js
M htdocs/frontend/javascripts/wui.js
M htdocs/frontend/stylesheets/style.css
M lib/Volkszaehler/Controller/DataController.php
M lib/Volkszaehler/Util/JSON.php
M lib/Volkszaehler/View/JSON.php
M lib/Volkszaehler/View/XML.php
A test/Tests/CapabilitiesTest.php
M test/Tests/ChannelTest.php
M test/Tests/CounterTest.php
M test/Tests/Data.php
M test/Tests/EntityTest.php
M test/Tests/FormatTest.php
M test/Tests/GroupTest.php
M test/Tests/MeterTest.php
M test/Tests/Middleware.php
M test/Tests/ProtocolTest.php
M test/Tests/SensorTest.php
Log Message:
-----------
Implement streamed json response
Commit: 6558315b67809b0a42ec5a0a57266c0ee2f62562
https://github.com/volkszaehler/volkszaehler.org/commit/6558315b67809b0a42ec5a0a57266c0ee2f62562
Author: andig <cpuidle at gmx.de>
Date: 2015-06-29 (Mon, 29 Jun 2015)
Changed paths:
M composer.json
M etc/volkszaehler.conf.template.php
M htdocs/frontend/index.html
M htdocs/frontend/javascripts/entities.js
M htdocs/frontend/javascripts/entity.js
M htdocs/frontend/javascripts/functions.js
M htdocs/frontend/javascripts/helper.js
M htdocs/frontend/javascripts/init.js
M htdocs/frontend/javascripts/options.js
M htdocs/frontend/javascripts/wui.js
A htdocs/frontend/vendor/autobahn.min.js
M lib/Volkszaehler/Controller/DataController.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
A lib/Volkszaehler/Server/PushHub.php
A misc/tools/push-server.php
Log Message:
-----------
Live updates for frontend
Commit: a1a156c1cd2d9521558143995a1ae10f13f9ec79
https://github.com/volkszaehler/volkszaehler.org/commit/a1a156c1cd2d9521558143995a1ae10f13f9ec79
Author: andig <cpuidle at gmx.de>
Date: 2015-06-29 (Mon, 29 Jun 2015)
Changed paths:
M .travis.yml
M composer.json
A lib/Controller/AggregatorController.php
A lib/Controller/CapabilitiesController.php
A lib/Controller/ChannelController.php
A lib/Controller/Controller.php
A lib/Controller/DataController.php
A lib/Controller/EntityController.php
A lib/Definition/Definition.php
A lib/Definition/EntityDefinition.json
A lib/Definition/EntityDefinition.php
A lib/Definition/PropertyDefinition.json
A lib/Definition/PropertyDefinition.php
A lib/Definition/README.md
A lib/Interpreter/AggregatorInterpreter.php
A lib/Interpreter/CounterInterpreter.php
A lib/Interpreter/DataIterator.php
A lib/Interpreter/Interpreter.php
A lib/Interpreter/MeterInterpreter.php
A lib/Interpreter/SQL/MySQLAggregateOptimizer.php
A lib/Interpreter/SQL/MySQLOptimizer.php
A lib/Interpreter/SQL/PostgreSQLOptimizer.php
A lib/Interpreter/SQL/SQLOptimizer.php
A lib/Interpreter/SQL/SQLiteOptimizer.php
A lib/Interpreter/SensorInterpreter.php
A lib/Model/Aggregate.php
A lib/Model/Aggregator.php
A lib/Model/Channel.php
A lib/Model/Data.php
A lib/Model/Entity.php
A lib/Model/Property.php
A lib/Router.php
A lib/Util/Aggregation.php
A lib/Util/Configuration.php
A lib/Util/ConsoleApplication.php
A lib/Util/Debug.php
A lib/Util/JSON.php
A lib/Util/Random.php
A lib/Util/UUID.php
A lib/View/CSV.php
A lib/View/JSON.php
A lib/View/JpGraph.php
A lib/View/View.php
A lib/View/XML.php
R lib/Volkszaehler/Controller/AggregatorController.php
R lib/Volkszaehler/Controller/CapabilitiesController.php
R lib/Volkszaehler/Controller/ChannelController.php
R lib/Volkszaehler/Controller/Controller.php
R lib/Volkszaehler/Controller/DataController.php
R lib/Volkszaehler/Controller/EntityController.php
R lib/Volkszaehler/Definition/Definition.php
R lib/Volkszaehler/Definition/EntityDefinition.json
R lib/Volkszaehler/Definition/EntityDefinition.php
R lib/Volkszaehler/Definition/PropertyDefinition.json
R lib/Volkszaehler/Definition/PropertyDefinition.php
R lib/Volkszaehler/Definition/README.md
R lib/Volkszaehler/Interpreter/AggregatorInterpreter.php
R lib/Volkszaehler/Interpreter/CounterInterpreter.php
R lib/Volkszaehler/Interpreter/DataIterator.php
R lib/Volkszaehler/Interpreter/Interpreter.php
R lib/Volkszaehler/Interpreter/MeterInterpreter.php
R lib/Volkszaehler/Interpreter/SQL/MySQLAggregateOptimizer.php
R lib/Volkszaehler/Interpreter/SQL/MySQLOptimizer.php
R lib/Volkszaehler/Interpreter/SQL/PostgreSQLOptimizer.php
R lib/Volkszaehler/Interpreter/SQL/SQLOptimizer.php
R lib/Volkszaehler/Interpreter/SQL/SQLiteOptimizer.php
R lib/Volkszaehler/Interpreter/SensorInterpreter.php
R lib/Volkszaehler/Model/Aggregate.php
R lib/Volkszaehler/Model/Aggregator.php
R lib/Volkszaehler/Model/Channel.php
R lib/Volkszaehler/Model/Data.php
R lib/Volkszaehler/Model/Entity.php
R lib/Volkszaehler/Model/Property.php
R lib/Volkszaehler/Router.php
R lib/Volkszaehler/Util/Aggregation.php
R lib/Volkszaehler/Util/Configuration.php
R lib/Volkszaehler/Util/ConsoleApplication.php
R lib/Volkszaehler/Util/Debug.php
R lib/Volkszaehler/Util/JSON.php
R lib/Volkszaehler/Util/Random.php
R lib/Volkszaehler/Util/UUID.php
R lib/Volkszaehler/View/CSV.php
R lib/Volkszaehler/View/JSON.php
R lib/Volkszaehler/View/JpGraph.php
R lib/Volkszaehler/View/View.php
R lib/Volkszaehler/View/XML.php
M misc/tools/doctrine.php
A phpunit.xml
A test/AggregationPerformanceTest.php
A test/AggregationTest.php
A test/ChannelTest.php
A test/CounterTest.php
A test/Data.php
A test/DataPerformance.php
A test/EntityTest.php
A test/FormatTest.php
A test/GroupTest.php
A test/MeterTest.php
A test/Middleware.php
A test/ProtocolTest.php
R test/README.md
A test/RawTest.php
A test/SensorTest.php
A test/SetupPerformanceData.php
R test/Tests/AggregationPerformanceTest.php
R test/Tests/AggregationTest.php
R test/Tests/ChannelTest.php
R test/Tests/CounterTest.php
R test/Tests/Data.php
R test/Tests/DataPerformance.php
R test/Tests/EntityTest.php
R test/Tests/FormatTest.php
R test/Tests/GroupTest.php
R test/Tests/MeterTest.php
R test/Tests/Middleware.php
R test/Tests/ProtocolTest.php
R test/Tests/RawTest.php
R test/Tests/SensorTest.php
R test/Tests/SetupPerformanceData.php
R test/phpunit.xml
Log Message:
-----------
Merge branch 'psr4' of https://github.com/andig/volkszaehler.org into upstream-development-merge
Commit: b6ab25491a87c93b08209a72cafd0be3ad55f769
https://github.com/volkszaehler/volkszaehler.org/commit/b6ab25491a87c93b08209a72cafd0be3ad55f769
Author: andig <cpuidle at gmx.de>
Date: 2015-06-29 (Mon, 29 Jun 2015)
Changed paths:
A lib/Server/PushHub.php
M lib/View/JSON.php
R lib/Volkszaehler/Server/PushHub.php
Log Message:
-----------
Resolve merge errors
Compare: https://github.com/volkszaehler/volkszaehler.org/compare/634ee32be147...b6ab25491a87
More information about the volkszaehler-dev
mailing list