-------------------------------------------------------------<br />
Update Emoncms Core<br />
-------------------------------------------------------------<br />
Updating /var/www/emoncms<br />
- current branch: stable<br />
- local changes: no<br />
From https://github.com/emoncms/emoncms<br />
52ede43c..ac40c4ab stable -> origin/stable<br />
fe932061..d16f9517 master -> origin/master<br />
* [new tag] 11.10.2 -> 11.10.2<br />
* [new tag] 11.10.1 -> 11.10.1<br />
- git fetch: <br />
Already on 'stable'<br />
- git checkout: Your branch is behind 'origin/stable' by 19 commits, and can be fast-forwarded.<br />
(use "git pull" to update your local branch)<br />
- git pull: Updating 52ede43c..ac40c4ab<br />
Fast-forward<br />
.github/workflows/PHP.yml | 1 +<br />
Lib/EmonLogger.php | 2 +-<br />
Modules/admin/Views/update_view.php | 7 +-<br />
Modules/admin/admin_controller.php | 2 +-<br />
Modules/eventp/locale/eventp_messages.pot | 2 +-<br />
.../locale/fr_FR/LC_MESSAGES/eventp_messages.po | 2 +-<br />
.../locale/it_IT/LC_MESSAGES/eventp_messages.po | 2 +-<br />
Modules/feed/Views/feedlist_view.php | 2 +-<br />
Modules/feed/locale/cy_GB.json | 2 +-<br />
Modules/feed/locale/da_DK.json | 2 +-<br />
Modules/feed/locale/de_DE.json | 2 +-<br />
Modules/feed/locale/es_ES.json | 2 +-<br />
Modules/feed/locale/es_ES/LC_MESSAGES/messages.po | 2 +-<br />
Modules/feed/locale/es_ES_removed.json | 2 +-<br />
Modules/feed/locale/et_EE.json | 2 +-<br />
Modules/feed/locale/fr_FR.json | 2 +-<br />
Modules/feed/locale/fr_FR/LC_MESSAGES/messages.po | 2 +-<br />
Modules/feed/locale/it_IT.json | 2 +-<br />
Modules/feed/locale/it_IT/LC_MESSAGES/messages.po | 2 +-<br />
Modules/feed/locale/messages.pot | 2 +-<br />
Modules/feed/locale/nl_BE.json | 2 +-<br />
Modules/feed/locale/nl_NL.json | 2 +-<br />
Modules/input/Views/input_api.php | 12 +++<br />
Modules/user/user_model.php | 94 ++++++++++++++++++----<br />
Modules/user/user_schema.php | 9 ++-<br />
Theme/svg_icons.svg | 6 +-<br />
Theme/theme.php | 5 +-<br />
core.php | 5 +-<br />
docs/input_encrypted.md | 18 +++--<br />
version.json | 2 +-<br />
30 files changed, 148 insertions(+), 51 deletions(-)<br />
./update_component.sh: line 33: [: too many arguments<br />
- database update: no changes<br />
- component updated<br />
-------------------------------------------------------------<br />
Update Emoncms Modules<br />
-------------------------------------------------------------<br />
Updating /var/www/emoncms/Modules/app<br />
- current branch: stable<br />
- local changes: no<br />
From https://github.com/emoncms/app<br />
- [deleted] (none) -> origin/daily_cooling_support<br />
- [deleted] (none) -> origin/fixed_export<br />
- [deleted] (none) -> origin/heatpump_app_cooling<br />
- [deleted] (none) -> origin/json_i18n<br />
- [deleted] (none) -> origin/myheatpump_url_search<br />
- [deleted] (none) -> origin/new_detail_stats_section<br />
- [deleted] (none) -> origin/new_tariff_app<br />
- [deleted] (none) -> origin/octopus_go<br />
- [deleted] (none) -> origin/optimise_feed_load<br />
- [deleted] (none) -> origin/process_daily<br />
- [deleted] (none) -> origin/public_data_view_improvements<br />
- [deleted] (none) -> origin/use_server_side_delta_calc<br />
- [deleted] (none) -> origin/volume_calc2<br />
81b0d1b..19da1a9 stable -> origin/stable<br />
8853740..19da1a9 master -> origin/master<br />
* [new branch] mysolarpvbatteryfix -> origin/mysolarpvbatteryfix<br />
* [new tag] 3.1.6 -> 3.1.6<br />
- git fetch: <br />
Already on 'stable'<br />
- git checkout: Your branch is behind 'origin/stable' by 19 commits, and can be fast-forwarded.<br />
(use "git pull" to update your local branch)<br />
- git pull: Updating 81b0d1b..19da1a9<br />
Fast-forward<br />
app_controller.php | 2 +-<br />
apps/OpenEnergyMonitor/myheatpump/myheatpump.js | 16 +-<br />
apps/OpenEnergyMonitor/myheatpump/myheatpump.php | 73 +-<br />
.../myheatpump/myheatpump_bargraph.js | 45 +-<br />
.../myheatpump/myheatpump_controller.php | 7 +-<br />
.../myheatpump/myheatpump_model.php | 115 +-<br />
.../myheatpump/myheatpump_powergraph.js | 3 +<br />
.../myheatpump/myheatpump_process.js | 19 +-<br />
.../myheatpump/myheatpump_process.php | 60 +-<br />
.../myheatpump/myheatpump_schema.php | 1 +<br />
apps/OpenEnergyMonitor/mysolarpv/mysolarpv.php | 3 +<br />
.../mysolarpvbattery/mysolarpvbattery.php | 4 +-<br />
apps/OpenEnergyMonitor/octopus/octopus.php | 10 +-<br />
apps/OpenEnergyMonitor/octopus/profile.js | 99 ++<br />
apps/OpenEnergyMonitor/octopus/tariff_explorer.js | 1337 ++++++++++----------<br />
module.json | 2 +-<br />
16 files changed, 1016 insertions(+), 780 deletions(-)<br />
create mode 100644 apps/OpenEnergyMonitor/octopus/profile.js<br />
./update_component.sh: line 33: [: too many arguments<br />
- database update: no changes<br />
- component updated<br />
and