Update emoncms.... remote: Enumerating objects: 237, done. remote: Counting objects: 100% (237/237), done. remote: Total 389 (delta 237), reused 237 (delta 237), pack-reused 152 Receiving objects: 100% (389/389), 111.59 KiB | 656.00 KiB/s, done. Resolving deltas: 100% (293/293), completed with 71 local objects. From https://github.com/emoncms/emoncms 3448336c..0767740f stable -> origin/stable * [new branch] emoncms_component_table -> origin/emoncms_component_table * [new branch] kwh_hh -> origin/kwh_hh 3448336c..33d32f3a master -> origin/master * [new branch] timezone_support_csv_export -> origin/timezone_support_csv_export * [new tag] 10.2.2 -> 10.2.2 Updating 3448336c..0767740f Fast-forward Lib/dbschemasetup.php | 20 ++++++++++++--- Lib/misc/sidebar.css | 10 ++++++++ Modules/admin/admin_main_view.php | 10 +++----- Modules/admin/admin_menu.php | 2 +- Modules/admin/userlist_view.php | 4 ++- Modules/feed/Views/feedlist_view.php | 2 +- Modules/feed/feed_controller.php | 8 +++--- Modules/input/Views/input_view.php | 2 +- Modules/input/Views/schedule.php | 8 +++--- Modules/input/input_model.php | 3 ++- Modules/process/process_processlist.php | 6 ----- Modules/vis/vis_object.php | 44 ++++++++++++++++----------------- Theme/basic/emon-blue.css | 4 +-- Theme/basic/emon-standard.css | 4 +-- Theme/basic/emon-sun.css | 4 +-- locale.php | 2 -- process_settings.php | 2 +- version.txt | 2 +- 18 files changed, 75 insertions(+), 62 deletions(-) Update emoncms/app.... remote: Enumerating objects: 187, done. remote: Counting objects: 100% (187/187), done. remote: Compressing objects: 100% (129/129), done. remote: Total 187 (delta 87), reused 143 (delta 58), pack-reused 0 Receiving objects: 100% (187/187), 61.18 KiB | 673.00 KiB/s, done. Resolving deltas: 100% (87/87), completed with 6 local objects. From https://github.com/emoncms/app 90a3dc4..c64c46f stable -> origin/stable b7d1c66..c64c46f master -> origin/master Updating 90a3dc4..c64c46f Fast-forward Readme.md | 29 +- Views/css/app.css | 6 +- app_controller.php | 19 +- app_model.php | 2 +- apps/OpenEnergyMonitor/graph-nav.php | 3 +- apps/OpenEnergyMonitor/myelectric2/myelectric2.php | 2 + apps/OpenEnergyMonitor/myenergy/myenergy.php | 1 + apps/OpenEnergyMonitor/mysolarpv/mysolarpv.php | 2 + apps/OpenEnergyMonitor/mysolarpvbattery/app.json | 5 + .../mysolarpvbattery/mysolarpvbattery.php | 1195 ++++++++++++++++++++ .../mysolarpvdivert/mysolarpvdivert.php | 39 +- apps/OpenEnergyMonitor/octopus/octopus.php | 303 +++-- apps/template/app.json | 6 +- apps/template/template.php | 20 +- composer.json | 5 +- module.json | 2 +- 16 files changed, 1496 insertions(+), 143 deletions(-) create mode 100644 apps/OpenEnergyMonitor/mysolarpvbattery/app.json create mode 100644 apps/OpenEnergyMonitor/mysolarpvbattery/mysolarpvbattery.php On branch stable Your branch is up to date with 'origin/stable'. nothing to commit, working tree clean 2.1.1-38-gc64c46f Update emoncms/config.... remote: Enumerating objects: 15, done. remote: Counting objects: 100% (15/15), done. remote: Compressing objects: 100% (13/13), done. remote: Total 15 (delta 5), reused 10 (delta 2), pack-reused 0 Unpacking objects: 100% (15/15), done. From https://github.com/emoncms/config 8d278bc..d28ff1e master -> origin/master Already up to date. On branch stable Your branch is up to date with 'origin/stable'. nothing to commit, working tree clean 2.0.5 Update emoncms/dashboard.... remote: Enumerating objects: 106, done. remote: Counting objects: 100% (106/106), done. remote: Compressing objects: 100% (45/45), done. remote: Total 106 (delta 51), reused 84 (delta 40), pack-reused 0 Receiving objects: 100% (106/106), 35.40 KiB | 442.00 KiB/s, done. Resolving deltas: 100% (51/51), completed with 15 local objects. From https://github.com/emoncms/dashboard 29ff998..7c73b21 master -> origin/master * [new branch] stability_testing -> origin/stability_testing Already up to date. On branch stable Your branch is up to date with 'origin/stable'. nothing to commit, working tree clean 2.0.7 Update emoncms/device.... remote: Enumerating objects: 21, done. remote: Counting objects: 100% (21/21), done. remote: Compressing objects: 100% (16/16), done. remote: Total 21 (delta 9), reused 15 (delta 5), pack-reused 0 Unpacking objects: 100% (21/21), done. From https://github.com/emoncms/device 8b803d8..bfc5de3 master -> origin/master Already up to date. On branch stable Your branch is up to date with 'origin/stable'. nothing to commit, working tree clean 2.0.5 Update emoncms/graph.... remote: Enumerating objects: 71, done. remote: Counting objects: 100% (71/71), done. remote: Compressing objects: 100% (49/49), done. remote: Total 71 (delta 40), reused 48 (delta 22), pack-reused 0 Unpacking objects: 100% (71/71), done. From https://github.com/emoncms/graph 7df046d..5124499 stable -> origin/stable 5cf8080..2635583 master -> origin/master * [new branch] mobile -> origin/mobile * [new tag] 2.0.9 -> 2.0.9 Updating 7df046d..5124499 Fast-forward .travis.yml | 14 ++ LICENSE.txt | 619 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ composer.json | 17 ++ embed.php | 25 ++- graph.css | 41 +++- graph.js | 345 ++++++++++++++++---------------- module.json | 2 +- view.php | 130 +++++------- vis.helper.js | 61 +++--- 9 files changed, 968 insertions(+), 286 deletions(-) create mode 100644 .travis.yml create mode 100644 LICENSE.txt create mode 100644 composer.json On branch stable Your branch is up to date with 'origin/stable'. nothing to commit, working tree clean 2.0.9 Update emoncms/setup.... remote: Enumerating objects: 15, done. remote: Counting objects: 100% (15/15), done. remote: Compressing objects: 100% (10/10), done. remote: Total 14 (delta 6), reused 9 (delta 4), pack-reused 0 Unpacking objects: 100% (14/14), done. From https://github.com/emoncms/setup 5e525a2..ee65e22 master -> origin/master Already up to date. On branch stable Your branch is up to date with 'origin/stable'. nothing to commit, working tree clean fatal: No names found, cannot describe anything. Update emoncms/wifi.... remote: Enumerating objects: 11, done. remote: Counting objects: 100% (11/11), done. remote: Compressing objects: 100% (7/7), done. remote: Total 11 (delta 4), reused 7 (delta 4), pack-reused 0 Unpacking objects: 100% (11/11), done. From https://github.com/emoncms/wifi 274bcd5..2b69da7 master -> origin/master Already up to date. On branch stable Your branch is up to date with 'origin/stable'. nothing to commit, working tree clean 2.0.0-29-g274bcd5