Skip to content

Commit

Permalink
Merge pull request #814 from Jakeler/master
Browse files Browse the repository at this point in the history
Update copyright everywhere to 2020
  • Loading branch information
andig authored Aug 2, 2020
2 parents e99faab + 31d5764 commit 0e82505
Show file tree
Hide file tree
Showing 100 changed files with 100 additions and 100 deletions.
2 changes: 1 addition & 1 deletion bin/aggregate
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* 0 0 * * * /usr/bin/php aggregate.php run -m delta -l hour -l day
*
* @author Andreas Goetz <[email protected]>
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion bin/calert
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# @author Peer Janssen
# @author Justin Otherguy <[email protected]>
# @author Henrik Wellschmidt <[email protected]>
# @copyright Copyright (c) 2011-2018, The volkszaehler.org project
# @copyright Copyright (c) 2011-2020, The volkszaehler.org project
# @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
#
#/*
Expand Down
2 changes: 1 addition & 1 deletion bin/doctrine
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Doctrine cli configuration
*
* @author Steffen Vogel <[email protected]>
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion bin/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# and configuration of of the PHP interpreter/webserver
#
# @author Jakob Hirsch
# @copyright Copyright (c) 2011-2018, The volkszaehler.org project
# @copyright Copyright (c) 2011-2020, The volkszaehler.org project
# @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
#
##
Expand Down
2 changes: 1 addition & 1 deletion bin/jsonclient
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-

# @author Andreas Götz <[email protected]> 2015
# @copyright Copyright (c) 2011-2018, The volkszaehler.org project
# @copyright Copyright (c) 2011-2020, The volkszaehler.org project
# @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3

#
Expand Down
2 changes: 1 addition & 1 deletion bin/model-helper
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
/**
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion bin/push-server
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* WebSockets push server for realtime updates from middleware
*
* @author Andreas Goetz <[email protected]>
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion bin/vzclient
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# @author Andreas Götz <[email protected]>
# @author Sven Anders <[email protected]> 2011
# @copyright Copyright (c) 2011-2018, The volkszaehler.org project
# @copyright Copyright (c) 2011-2020, The volkszaehler.org project
# @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3

#
Expand Down
2 changes: 1 addition & 1 deletion bin/vzcompress2
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
*
* @author Florian Knodt <[email protected]>
* @author Andreas Goetz <[email protected]>
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/

Expand Down
2 changes: 1 addition & 1 deletion bin/vzmonitor
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# @author Peer Janssen
# @author Justin Otherguy <[email protected]>
# @copyright Copyright (c) 2011-2018, The volkszaehler.org project
# @copyright Copyright (c) 2011-2020, The volkszaehler.org project
# @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
#
#/*
Expand Down
2 changes: 1 addition & 1 deletion htdocs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ <h3><img src="img/blank.png" class="icon-wrench" alt="" /> Optionen</h3>
</div>
</div>
<div id="footer">
&copy; 2011-2018 - <a href="http://volkszaehler.org/">volkszaehler.org</a> - the open smartmeter platform
&copy; 2011-2020 - <a href="http://volkszaehler.org/">volkszaehler.org</a> - the open smartmeter platform
</div>

<!-- dialogs -->
Expand Down
2 changes: 1 addition & 1 deletion htdocs/js/entities.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Justin Otherguy <[email protected]>
* @author Steffen Vogel <[email protected]>
* @author Andreas Götz <[email protected]>
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion htdocs/js/entity.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @author Justin Otherguy <[email protected]>
* @author Steffen Vogel <[email protected]>
* @author Andreas Götz <[email protected]>
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion htdocs/js/functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @author Florian Ziegler <[email protected]>
* @author Justin Otherguy <[email protected]>
* @author Steffen Vogel <[email protected]>
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion htdocs/js/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @author Florian Ziegler <[email protected]>
* @author Justin Otherguy <[email protected]>
* @author Steffen Vogel <[email protected]>
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion htdocs/js/middleware.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Middleware handling
*
* @author Andreas Götz <[email protected]>
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion htdocs/js/options.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @author Florian Ziegler <[email protected]>
* @author Justin Otherguy <[email protected]>
* @author Steffen Vogel <[email protected]>
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion htdocs/js/plot.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Justin Otherguy <[email protected]>
* @author Steffen Vogel <[email protected]>
* @author Andreas Götz <[email protected]>
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion htdocs/js/wui.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Justin Otherguy <[email protected]>
* @author Steffen Vogel <[email protected]>
* @author Andreas Götz <[email protected]>
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion htdocs/middleware.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* middleware bootstrap entrypoint
*
* @author Steffen Vogel <[email protected]>
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion lib/Controller/AggregatorController.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion lib/Controller/CapabilitiesController.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion lib/Controller/ChannelController.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion lib/Controller/Controller.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion lib/Controller/DataController.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion lib/Controller/EntityController.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion lib/Controller/IotController.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion lib/Definition/Definition.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion lib/Definition/EntityDefinition.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Format is specified in EntityDefinition model
*
* @author Steffen Vogel <[email protected]>
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion lib/Definition/EntityDefinition.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion lib/Definition/PropertyDefinition.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Format is specified in PropertyDefinition class
*
* @author Steffen Vogel <[email protected]>
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion lib/Definition/PropertyDefinition.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion lib/Interpreter/AccumulatorInterpreter.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion lib/Interpreter/AggregatorInterpreter.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion lib/Interpreter/DataIterator.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion lib/Interpreter/ImpulseInterpreter.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion lib/Interpreter/Interpreter.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion lib/Interpreter/SQL/MySQLAggregateOptimizer.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* @author Andreas Goetz <[email protected]>
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion lib/Interpreter/SQL/MySQLOptimizer.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* @author Andreas Goetz <[email protected]>
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion lib/Interpreter/SQL/PostgreSQLOptimizer.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* @author Andreas Goetz <[email protected]>
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion lib/Interpreter/SQL/SQLOptimizer.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* @author Andreas Goetz <[email protected]>
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion lib/Interpreter/SQL/SQLiteOptimizer.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* @author Andreas Goetz <[email protected]>
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion lib/Interpreter/SQL/SensorInterpreterAverageTrait.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* @author Andreas Goetz <[email protected]>
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion lib/Interpreter/SensorInterpreter.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion lib/Interpreter/Virtual/DelayedIterator.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* @author Andreas Goetz <[email protected]>
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
2 changes: 1 addition & 1 deletion lib/Interpreter/Virtual/GroupedTimestampIterator.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* @author Andreas Goetz <[email protected]>
* @copyright Copyright (c) 2011-2018, The volkszaehler.org project
* @copyright Copyright (c) 2011-2020, The volkszaehler.org project
* @license https://www.gnu.org/licenses/gpl-3.0.txt GNU General Public License version 3
*/
/*
Expand Down
Loading

0 comments on commit 0e82505

Please sign in to comment.