Merge branch 'release/2.13.0'

KKoPV · Aug 6, 2016 · 6116a58 · 6116a58
2 parents 9e8e2bc + d6e7d70
commit 6116a58
Show file tree

Hide file tree

Showing 679 changed files with 58,131 additions and 20,601 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,10 +3,15 @@ prepend.php
 append.php
 config.php
 config.cron.php
-*.conf.php
 *.conf
 run/*
 tmp/*
 custom/
 description.md
 !.githold
+
+info.php
+composer.lock
+/tests
+/vendor
+/nbproject
diff --git a/.version b/.version
@@ -1,2 +1,2 @@
-2.12.1
-2014-09-13
+2.13.0
+2016-08-06
diff --git a/CHANGELOG b/CHANGELOG
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/README.md b/README.md
@@ -1,28 +1,49 @@
 # PVLng
 
-[![Join the chat at https://gitter.im/KKoPV/PVLng](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/KKoPV/PVLng?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
 PhotoVoltaic Logger new generation
 
-Please see http://pvlng.com for details
+Please see http://pvlng.com for details.
+
+A [demo installation](http://demo.pvlng.com/) is also available.
 
 # Installation
 
-If you want to use git für installing PVLng, you can simply execute from a shell in the directory to install PVLng into:
+If you want to use git für installing PVLng (recommended), you can simply execute from a shell
+in the directory to install PVLng into:
 
-```
-wget -qO - https://raw.github.com/KKoPV/PVLng/master/install | bash
+``` bash
+wget -qO - https://raw.githubusercontent.com/KKoPV/PVLng/master/tools/install | bash
 ```
 
-The installer will ask for your MySQL credentials, install the basic SQL script and create a basic configuration file with this credentials.
+The installer will ask for your MySQL credentials, install the basic SQL script and create
+a basic configuration file with this credentials.
 
-If you are interested in the latest development version, you can also direct install the development branch with:
+If you are interested in the latest development version, you can also direct install the development
+branch with:
 
+``` bash
+wget -qO - https://raw.githubusercontent.com/KKoPV/PVLng/develop/tools/install | bash
 ```
-wget -qO - https://raw.github.com/KKoPV/PVLng/develop/install | bash
+
+Answer to checkout development branch with yes
+
+## Upgrade
+
+If a new master (or development) release is out, you can upgrade your repository and database with
+
+``` bash
+tools/upgrade.git master
 ```
 
-# Scripts for data acquisition
+from your installation directory. This will checkout the latest changes from GitHub and
+apply all outstanding database patches. (The script will work also with the develop branch.)
+
+## Git hook
+
+To make sure to clear the temp. directory after each `git pull`, put this
+[Gist](https://gist.github.com/K-Ko/e7c01e0c7490ee4352fb) into `.git/hooks/post-merge` and make executable.
+
+## Scripts for data acquisition
 
 The scripts for data acquisition resides in its own repository: [PVLng-scripts](https://github.com/KKoPV/PVLng-scripts)
 
@@ -38,6 +59,13 @@ All code contributions and bug reports are much appreciated.
  - Please use soft tabs (four spaces) instead of hard tabs
  - Include commenting where appropriate and add a descriptive pull request message
 
-# Git hook
+## Branches
+
+- `master` is the latest deployed version
+- `develop` is the primary development branch
+
+## Publishing
+
+Release version numbers will follow the format:
 
-To make sure to clear the temp. directory after each `git pull`, put this [Gist](https://gist.github.com/K-Ko/e7c01e0c7490ee4352fb) into `.git/hooks/post-merge` and make executable.
+`<major>.<minor>.<patch>`
diff --git a/RELEASENOTES b/RELEASENOTES
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
diff --git a/api/.gitignore b/api/.gitignore
@@ -1,2 +1,11 @@
-route.custom.php
 next/
+r/
+.r1/
+.r2/
+.r3/
+.r4/
+.r5/
+
+route.custom.php
+
+.latest
diff --git a/api/.latest b/api/.latest
@@ -0,0 +1 @@
+Edit latest/index.php
diff --git a/api/latest/index.php b/api/latest/index.php
@@ -1,19 +1,13 @@
 <?php
 /**
- * Detect latest API version and run it
+ * Run latest API version
  *
  * @author     Knut Kohl <[email protected]>
  * @copyright  2012-2014 Knut Kohl
  * @license    MIT License (MIT) http://opensource.org/licenses/MIT
  * @version    1.0.0
  */
 
-// Search version directories
-$version = glob('..'.DIRECTORY_SEPARATOR.'r*', GLOB_ONLYDIR);
+$latest = 'r6';
 
-// Get last one ...
-$version = array_pop($version);
-// and split
-$version = explode(DIRECTORY_SEPARATOR, $version);
-
-include '..'.DIRECTORY_SEPARATOR.array_pop($version).DIRECTORY_SEPARATOR.'index.php';
+include '..' . DIRECTORY_SEPARATOR . $latest . DIRECTORY_SEPARATOR . 'index.php';
diff --git a/api/r2/View.php b/api/r2/View.php
diff --git a/api/r2/custom.dist.php b/api/r2/custom.dist.php