Frits
(Frits Erasmus)
22 January 2019 09:19
1
I wanted to sync readings from another emonCMS DB on my network.
I have two emonCMS databases on my network and wanted to combine readings for combined dashboards!
I tried to use the Sync function on the menu under setup.
So I entered the credentials of the other system for input and dashboard and when I tapped on “Connect” Chrome reports an error/notice in the first lines of the browser, and whatever I try to do like entering incorrect credentials, I can no longer get rid of it. Seems like this function is not yet working properly but I cannot get rid of the error messages so I cannot edit dashboards.
Screen with error messages: ip…105
Screen if I logout:
Screen of the feeds other environment. ip…104
If that SYNC function is not working, how can I get rid of this error messages, so I can edit the dashboards as the webpage slides UNDER the error messages.
Any help or pointers will be appreciated.
Frits
pb66
(Paul)
22 January 2019 11:25
2
Are the instances the same setup and versions etc? (not that they need to be, just wondering what the difference might be)
Have you tried clearing the browser cache?
Frits
(Frits Erasmus)
22 January 2019 15:19
3
The versions are different.
I have cleared the cache and rebooted and did a alt+F5 browser refresh.
Frits
Shouldn’t that be a CTRL-F5
for a browser refresh?
Frits
(Frits Erasmus)
22 January 2019 16:10
5
Bill,
You are correct.
I did not focus when I typed.
Doing it comes automatic.
pb66
(Paul)
22 January 2019 16:21
7
So which one is failing? new or old?
If old, any reason you cannot update?
What version is failing?
Is it stock or custom install?
What versions are the sync module?
Have you tried updating?
Frits
(Frits Erasmus)
22 January 2019 16:22
8
Thinking out load here:
The login credentials must be recorded in some kind of file.
If I know what file it is, I can perhaps try and remove the entry.
Any takers?
Oh yes, I will make a back-up of the file first, before I edit it.
Frits
(Frits Erasmus)
23 January 2019 07:17
9
So which one is failing? new or old?: It is the newer most recent version
What version is failing? Powered by OpenEnergyMonitor.org | low-write 9.9.5
Is it stock or custom install ? It is part and parcel of my emonPi
What versions are the sync module?
Have you tried updating? From the Administration Menu I did a “emonPi Update” and a “emonBase Update”
See screen copy below.
pb66
(Paul)
23 January 2019 09:43
10
The fault says it’s in the Theme/menu_view.php and the issue definitely looks like a menu error the way your navbar has rendered, so I doubt it is directly linked to the credentials you’ve entered (although stranger things have happened). Any settings saved by emoncms will be held in the mySQL tables and if manually edited, it could have a negative if the settings are also held in redis etc, so I wouldn’t recommend going there until your sure it’s that.
The line of code it points too is
$subactive = false;
if (isset($item['dropdown']) && count($item['dropdown']) > 0) {
usort($item['dropdown'], "menu_sort");
$outdrop="";
foreach ($item['dropdown'] as $dropdownitem) {
if (!isset($dropdownitem['session']) || (isset($dropdownitem['session']) && $session[$dropdownitem['session']]==1)) {
$i++;
if (is_active($dropdownitem)) { $subactive = true; }
if (isset($dropdownitem['divider']) && $dropdownitem['divider']) { $outdrop .= '<li class="divider"></li>'; }
// TODO: Remove dependency of index position on APPs module
$outdrop .= '<li class="'. (is_active($dropdownitem) ? ' active' : '') . '"><a href="' . $path . (isset($dropdownitem['path']) ? $dropdownitem['path']:$dropdownitem['1']) . '">' . (isset($dropdownitem['name']) ? drawNameIcon($dropdownitem,true) : $dropdownitem['0']) . '</a></li>';
}
}
}
$show = true; if (isset($item['hideinactive']) && $item['hideinactive']) $show = false;
if (is_active($item)) $show = true;
if ($i > 0) {
$out .= '<li class="dropdown' . ($subactive ? " active" : "") . (isset($item['class']) ? " ".$item['class'] : "") . '">';
$out .= '<a href="#" class="dropdown-toggle" data-toggle="dropdown">' . drawNameIcon($item,false) . '<b class="caret"></b></a>';
but I see no recent changes in that version or obvious reason for it to fail., so I’m afraid we’re still in the dark.
Frits
(Frits Erasmus)
23 January 2019 14:03
11
Paul,
Thank you for your thorough explanation.
I have to admit, it goes straight over my head.
Allow me to put it in layman’s terms to see if I understand:
The credentials should be help in the mySQL database and even somewhere else, so by editing the mySQL database might have unpredictable results.
The error most likely is in the Theme/menu view that resides with the developer and I can not do anything about it to fix it.
emonCMS still has no handle on the error and therefore no way to resolve it.
Up until then a fix is available I cannot edit dashboards.
I will try other browsers to see it that makes a difference.
Thanks Paul for your efforts
Frits
Frits
(Frits Erasmus)
23 January 2019 14:07
12
I tried Firefox and Internet Explorer and it troughs the same error.
Should it server any purpose if I were to post this issue in:
“Sign in to GitHub · GitHub ”
or are the same team monitoring both?
borpin
(Brian Orpin)
24 January 2019 19:44
13
Are they both on Raspberry Pis?
Why have you got 2 instances on one network? Is it 2x EmonPis?
You could simply pass all the data to one of the emoncms instances.
Frits
(Frits Erasmus)
24 January 2019 20:27
14
Good question Brian,
I will explain:
No it is not two emonPi’s.
The one is a emonPi and the second is ICC. iccsoftware.co.za
ICC Software read and control my Axpert Inverter and as a bonus log data in emonCMS:
On this screen you will see it posts to the inbuilt emoncms
As you can see this APP will record PV generation from PV panels attached to the Axpert and also show consumption that goes through the inverter.
emonPi records PV generation going through SMA inverters, All consumption (The inverter - essentials) plus not essentials, then electricity consumed by white goods in the house, water warmers.
Now you should also understand why I try to combine these readings.
Regards
Frits
Frits
(Frits Erasmus)
24 January 2019 20:36
15
I could perhaps try and pass ICC readings to the emonPi database, as that would be good.
I then need to create dashboards on the emonPi - agree
How do I edit a dashboard with the blue covering it?
Either way I am stuck with the undefinedoffset …messages
Hello @Frits would you mind trying the emoncms master branch to see if the problem is still present?
cd /var/www/emoncms
git checkout master
git pull
I can then add a check for the undefined offset if the master branch does not fix it. Im not able to replicate the issue here unfortunately with either branches…
borpin
(Brian Orpin)
24 January 2019 22:11
17
I suspect if you change the information in the emoncms setup screen, it will post the data direct to the other instance. I suspect it may stop the pvoutput though.
Replace ‘localhost’ with the IP address and change the API key.
The other way would be to post to the EmonPi MQTT broker.although it seems you cannot change the base topic so you will either need to use node-red to translate it or change the ‘base topic’ setting in Emoncms (on the pi) to match what this system is sending out.
Frits
(Frits Erasmus)
27 January 2019 18:35
18
TrystanLea:
git pull
pi@emonpi(ro):~$ cd /var/www/emoncms
pi@emonpi(ro):emoncms$ git checkout master
fatal: Unable to create '/var/www/emoncms/.git/index.lock': Read-only file system
pi@emonpi(ro):emoncms$ rpi-rw
Filesystem is unlocked - Write access
type ' rpi-ro ' to lock
pi@emonpi(rw):emoncms$ git checkout master
Switched to branch 'master'
Your branch is behind 'origin/master' by 1654 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
pi@emonpi(rw):emoncms$ git pull
Then MANY lines
(And my test results below)
remote: Enumerating objects: 103, done.
remote: Counting objects: 100% (103/103), done.
remote: Compressing objects: 100% (34/34), done.
remote: Total 109 (delta 74), reused 96 (delta 67), pack-reused 6
Receiving objects: 100% (109/109), 41.62 KiB | 0 bytes/s, done.
Resolving deltas: 100% (74/74), completed with 26 local objects.
From https://github.com/emoncms/emoncms
ecc533e..c206e21 master -> origin/master
* [new branch] feature/issue-1139-virtual-feed-self-input -> origin/feature/issue-1139-virtual-feed-self-input
6cc7ffd..6888804 hierarchical_settings_php -> origin/hierarchical_settings_php
Updating 8871d60..c206e21
Fast-forward
.gitignore | 7 +
.htaccess | 20 +-
.travis.yml | 91 +
Lib/EmonLogger.php | 6 +
.../js/bootstrap-datepicker.js | 474 +++++
Lib/bootstrap/css/bootstrap-responsive.css | 6 +-
Lib/bootstrap/css/bootstrap-responsive.min.css | 6 +-
Lib/bootstrap/css/bootstrap.css | 15 +-
Lib/bootstrap/css/bootstrap.min.css | 8 +-
Lib/bootstrap/js/bootstrap.js | 98 +-
Lib/bootstrap/js/bootstrap.min.js | 4 +-
Lib/dbschemasetup.php | 391 +++-
Lib/email.php | 13 +-
Lib/enum.php | 31 +
Lib/flot/jquery.flot.merged.js | 879 ++++++++
Lib/flot/merge.php | 27 +
Lib/flot/plugin/saveAsImage/README.md | 51 +
.../plugin/saveAsImage/jquery.flot.saveAsImage.js | 169 ++
Lib/flot/plugin/saveAsImage/lib/base64.js | 111 +
Lib/flot/plugin/saveAsImage/lib/canvas2image.js | 235 +++
Lib/hammer.min.js | 7 +
Lib/listjs/list.js | 9 +-
Lib/misc/autocomplete.css | 34 +
Lib/misc/autocomplete.js | 86 +
Lib/misc/clipboard.js | 63 +
Lib/misc/qrcode.js | 614 ++++++
Lib/misc/sidebar.css | 69 +
Lib/misc/sidebar.js | 62 +
Lib/moment.min.js | 1 +
Lib/momentjs-locales/cy.js | 79 +
Lib/momentjs-locales/da.js | 59 +
Lib/momentjs-locales/de.js | 75 +
Lib/momentjs-locales/en-gb.js | 66 +
Lib/momentjs-locales/es.js | 91 +
Lib/momentjs-locales/et.js | 79 +
Lib/momentjs-locales/fr.js | 82 +
Lib/momentjs-locales/it.js | 68 +
Lib/momentjs-locales/nl-be.js | 86 +
Lib/momentjs-locales/nl.js | 86 +
Lib/phpMQTT.php | 412 ----
Lib/responsive-linked-tables.js | 358 ++++
Lib/tablejs/COPYRIGHT.txt | 5 +-
Lib/tablejs/custom-table-fields.js | 195 +-
Lib/tablejs/expandtables.html | 91 +
Lib/tablejs/table.js | 350 +++-
Lib/travis-CI/emoncms.conf | 7 +
Lib/travis-CI/travis-ci-apache | 25 +
Lib/units.php | 33 +
Modules/admin/admin_controller.php | 266 ++-
Modules/admin/admin_main_view.php | 574 +++++-
Modules/admin/admin_menu.php | 2 +-
.../{en_EN => en_GB}/LC_MESSAGES/messages.mo | Bin
.../{en_EN => en_GB}/LC_MESSAGES/messages.po | 0
Modules/admin/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 2132 -> 3710 bytes
Modules/admin/locale/fr_FR/LC_MESSAGES/messages.po | 304 ++-
Modules/admin/module.json | 4 +
Modules/admin/pi-model.json | 251 +++
Modules/admin/update_view.php | 7 +
Modules/admin/userlist_view.php | 175 +-
Modules/eventp/eventp_processlist.php | 127 +-
.../locale/fr_FR/LC_MESSAGES/eventp_messages.mo | Bin 0 -> 3747 bytes
.../locale/fr_FR/LC_MESSAGES/eventp_messages.po | 1159 +++++++++++
Modules/eventp/module.json | 4 +
Modules/feed/Views/feedapi_view.php | 35 +-
Modules/feed/Views/feedlist_view.php | 371 +++-
Modules/feed/Views/feedlist_view_v2.php | 1326 ++++++++++++
Modules/feed/engine/CassandraEngine.php | 288 +++
Modules/feed/engine/Histogram.php | 10 +-
Modules/feed/engine/MysqlTimeSeries.php | 370 +++-
Modules/feed/engine/PHPFina.php | 597 ++++--
Modules/feed/engine/PHPFinaTest.php | 164 ++
Modules/feed/engine/PHPFiwa.php | 32 +-
Modules/feed/engine/PHPTimeSeries.php | 144 +-
Modules/feed/engine/RedisBuffer.php | 24 +-
Modules/feed/engine/TemplateEngine.php | 14 +-
Modules/feed/engine/VirtualFeed.php | 60 +-
Modules/feed/engine/shared_helper.php | 112 ++
Modules/feed/feed.js | 57 +-
Modules/feed/feed_controller.php | 263 ++-
Modules/feed/feed_model.php | 527 ++++-
Modules/feed/feed_schema.php | 10 +-
.../{en_EN => en_GB}/LC_MESSAGES/messages.mo | Bin
.../{en_EN => en_GB}/LC_MESSAGES/messages.po | 0
Modules/feed/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 3537 -> 12939 bytes
Modules/feed/locale/fr_FR/LC_MESSAGES/messages.po | 2120 ++++++++++++--------
Modules/feed/module.json | 4 +
Modules/input/Views/device_view.php | 654 ++++++
Modules/input/Views/input.js | 27 +-
Modules/input/Views/input_api.php | 161 +-
Modules/input/Views/input_dialog.js | 33 +
Modules/input/Views/input_dialog.php | 54 +
Modules/input/Views/input_view.php | 202 +-
Modules/input/Views/schedule.php | 96 +
Modules/input/input_controller.php | 381 ++--
Modules/input/input_menu.php | 2 +-
Modules/input/input_methods.php | 339 ++++
Modules/input/input_model.php | 525 ++++-
Modules/input/input_schema.php | 6 +-
.../{en_EN => en_GB}/LC_MESSAGES/messages.mo | Bin
.../{en_EN => en_GB}/LC_MESSAGES/messages.po | 0
Modules/input/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 7444 -> 14290 bytes
Modules/input/locale/fr_FR/LC_MESSAGES/messages.po | 825 +++++---
Modules/input/module.json | 4 +
Modules/input/que_input_controller.php | 7 +-
Modules/input/readme.md | 9 +-
Modules/process/Views/process_api.php | 34 +-
Modules/process/Views/process_ui.js | 735 ++++---
Modules/process/Views/process_ui.php | 129 +-
.../locale/fr_FR/LC_MESSAGES/process_messages.mo | Bin 0 -> 26277 bytes
.../locale/fr_FR/LC_MESSAGES/process_messages.po | 1415 +++++++++++++
Modules/process/module.json | 4 +
Modules/process/process_langjs.php | 45 +
Modules/process/process_model.php | 98 +-
Modules/process/process_processlist.php | 933 +++++++--
Modules/schedule/Views/schedule_api.php | 63 +-
Modules/schedule/Views/schedule_view.php | 70 +-
.../LC_MESSAGES/schedule_messages.mo} | Bin
.../LC_MESSAGES/schedule_messages.po} | 0
.../{messages.mo => schedule_messages.mo} | Bin
.../{messages.po => schedule_messages.po} | 0
.../locale/et_EE/LC_MESSAGES/schedule_messages.mo | Bin 0 -> 2817 bytes
.../locale/et_EE/LC_MESSAGES/schedule_messages.po | 167 ++
.../locale/fr_FR/LC_MESSAGES/schedule_messages.mo | Bin 0 -> 9072 bytes
.../locale/fr_FR/LC_MESSAGES/schedule_messages.po | 355 ++++
Modules/schedule/module.json | 4 +
Modules/schedule/schedule_menu.php | 4 +-
Modules/schedule/schedule_model.php | 47 +-
Modules/schedule/schedule_processlist.php | 73 +-
Modules/schedule/schedule_schema.php | 4 +-
Modules/time/module.json | 4 +
Modules/time/time_controller.php | 16 +-
Modules/user/deleteuser.php | 90 +
Modules/user/images/appstore.png | Bin 0 -> 8888 bytes
Modules/user/images/en-play-badge.png | Bin 0 -> 4290 bytes
.../{en_EN => en_GB}/LC_MESSAGES/messages.mo | Bin
.../{en_EN => en_GB}/LC_MESSAGES/messages.po | 0
Modules/user/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 4393 -> 7664 bytes
Modules/user/locale/fr_FR/LC_MESSAGES/messages.po | 1929 ++++++++++--------
Modules/user/login_block.php | 108 +-
Modules/user/module.json | 4 +
Modules/user/profile/profile.php | 303 ++-
Modules/user/rememberme_model.php | 413 +++-
Modules/user/user.js | 64 +-
Modules/user/user_controller.php | 103 +-
Modules/user/user_menu.php | 2 +-
Modules/user/user_model.php | 705 +++++--
Modules/user/user_schema.php | 15 +-
Modules/vis/Views/multigraph_edit.js | 547 +++--
Modules/vis/Views/vis_main_view.php | 63 +-
.../LC_MESSAGES/{messages.mo => vis_messages.mo} | Bin
.../LC_MESSAGES/{messages.po => vis_messages.po} | 0
.../LC_MESSAGES/{messages.mo => vis_messages.mo} | Bin
.../LC_MESSAGES/{messages.po => vis_messages.po} | 0
.../LC_MESSAGES/vis_messages.mo} | Bin
.../LC_MESSAGES/vis_messages.po} | 0
.../LC_MESSAGES/{messages.mo => vis_messages.mo} | Bin
.../LC_MESSAGES/{messages.po => vis_messages.po} | 0
Modules/vis/locale/fr_FR/LC_MESSAGES/messages.mo | Bin 2236 -> 0 bytes
Modules/vis/locale/fr_FR/LC_MESSAGES/messages.po | 809 --------
.../vis/locale/fr_FR/LC_MESSAGES/vis_messages.mo | Bin 0 -> 11922 bytes
.../vis/locale/fr_FR/LC_MESSAGES/vis_messages.po | 1484 ++++++++++++++
.../LC_MESSAGES/{messages.mo => vis_messages.mo} | Bin
.../LC_MESSAGES/{messages.po => vis_messages.po} | 0
.../LC_MESSAGES/{messages.mo => vis_messages.mo} | Bin
.../LC_MESSAGES/{messages.po => vis_messages.po} | 0
.../LC_MESSAGES/{messages.mo => vis_messages.mo} | Bin
.../LC_MESSAGES/{messages.po => vis_messages.po} | 0
Modules/vis/module.json | 4 +
Modules/vis/multigraph_model.php | 42 +-
Modules/vis/vis_controller.php | 28 +-
Modules/vis/vis_langjs.php | 132 ++
Modules/vis/vis_menu.php | 8 +-
Modules/vis/vis_object.php | 160 +-
Modules/vis/vis_schema.php | 4 +-
Modules/vis/visualisations/bargraph.php | 54 +-
Modules/vis/visualisations/common/vis.helper.js | 51 +-
Modules/vis/visualisations/compare.php | 12 +-
.../vis/visualisations/comparison/comparison.php | 9 +-
.../dailyhistogram/dailyhistogram.php | 16 +-
.../vis/visualisations/dailyhistogram/graphs.js | 1 +
Modules/vis/visualisations/editdaily.php | 10 +-
Modules/vis/visualisations/editrealtime.php | 9 +-
Modules/vis/visualisations/graph.js | 1 +
Modules/vis/visualisations/graph.php | 4 +-
Modules/vis/visualisations/histgraph.php | 7 +-
Modules/vis/visualisations/multigraph.php | 23 +-
.../vis/visualisations/multigraph/multigraph.js | 349 +++-
Modules/vis/visualisations/orderbars.php | 7 +-
Modules/vis/visualisations/orderthreshold.php | 10 +-
Modules/vis/visualisations/rawdata.php | 15 +-
Modules/vis/visualisations/realtime.php | 25 +-
Modules/vis/visualisations/simplezoom.php | 13 +-
Modules/vis/visualisations/smoothie.php | 12 +-
Modules/vis/visualisations/stacked.php | 14 +-
Modules/vis/visualisations/stackedsolar.php | 16 +-
Modules/vis/visualisations/threshold.php | 14 +-
Modules/vis/visualisations/timecompare.php | 8 +-
.../vis/visualisations/timecompare/timecompare.js | 3 +-
Modules/vis/visualisations/timestoredaily.php | 11 +-
Modules/vis/visualisations/zoom.php | 8 +-
Modules/vis/visualisations/zoom/graphs.js | 1 +
Modules/vis/widget/vis_render.js | 101 +-
Modules/vis/widget/vis_widget.php | 6 +-
Theme/basic/ajax-loader.gif | Bin 0 -> 4663 bytes
Theme/basic/embed.php | 8 +-
Theme/basic/emon-blue.css | 300 +++
Theme/basic/emon-standard.css | 300 +++
Theme/basic/emon-sun.css | 313 +++
Theme/basic/emon.css | 95 -
Theme/basic/{emoncms_logo.png => logo_login.png} | Bin
Theme/basic/menu_view.php | 241 +--
Theme/basic/theme.php | 325 ++-
composer.json | 8 +
composer.lock | 120 ++
core.php | 72 +-
default.emonpi.settings.php | 30 +-
default.settings.php | 28 +-
docs/Cassandra.md | 38 +
docs/LinuxInstall.md | 161 +-
docs/RaspberryPi/Low-write-mode.md | 21 +-
docs/RaspberryPi/MQTT.md | 76 +-
docs/RaspberryPi/USB_HDD.md | 8 +-
docs/RaspberryPi/general.md | 26 +-
docs/RaspberryPi/jessie.md | 189 ++
docs/RaspberryPi/read-only.md | 34 +-
docs/RaspberryPi/readme.md | 138 +-
docs/Upgrading.md | 24 +-
docs/gettext.md | 17 +-
docs/input_encrypted.md | 52 +
index.php | 129 +-
locale.php | 65 +-
param.php | 113 ++
php-info.php | 3 +
process_settings.php | 50 +-
readme.md | 191 +-
route.php | 113 +-
scripts/.htaccess | 1 +
scripts/examples/mqtt_feed_subscriber.php | 81 +-
scripts/examples/mqtt_input_publisher.php | 75 +-
scripts/feedwriter.php | 2 +-
scripts/input_queue_processor.php | 2 +-
scripts/logger/install.sh | 29 +-
scripts/logger/logrotate.conf | 4 +-
scripts/logger/rc.local | 2 +-
scripts/logger/readme.md | 4 +-
scripts/mqtt_input.service | 56 +
scripts/old.phpmqtt_input.php | 163 --
scripts/phpmqtt_input.php | 317 ++-
scripts/process_langjs_builder.php | 57 +
scripts/services/feedwriter/feedwriter.service | 62 +
scripts/services/install-service-feedwriter.md | 26 +
scripts/services/install-service-runner-update.md | 37 +
scripts/services/service-runner/service-runner.py | 83 +
.../services/service-runner/service-runner.service | 68 +
scripts/vis_langjs_builder.php | 57 +
tests/.gitignore | 4 +
tests/Lib/emonCMS-travis-setup.js | 29 +
tests/Lib/emoncms_tests_helper.js | 47 +
tests/Lib/start_selenium_server.sh | 2 +
tests/Lib/travis_login_details.js | 12 +
tests/package.json | 18 +
tests/readme.md | 46 +
tests/specs/emonCMS-first-login.js | 19 +
tests/wdio.conf.js | 277 +++
version.txt | 1 +
265 files changed, 28184 insertions(+), 7272 deletions(-)
create mode 100644 .travis.yml
create mode 100644 Lib/bootstrap-datetimepicker-0.0.11/js/bootstrap-datepicker.js
create mode 100644 Lib/flot/jquery.flot.merged.js
create mode 100644 Lib/flot/merge.php
create mode 100644 Lib/flot/plugin/saveAsImage/README.md
create mode 100644 Lib/flot/plugin/saveAsImage/jquery.flot.saveAsImage.js
create mode 100644 Lib/flot/plugin/saveAsImage/lib/base64.js
create mode 100644 Lib/flot/plugin/saveAsImage/lib/canvas2image.js
create mode 100644 Lib/hammer.min.js
create mode 100644 Lib/misc/autocomplete.css
create mode 100644 Lib/misc/autocomplete.js
create mode 100644 Lib/misc/clipboard.js
create mode 100644 Lib/misc/qrcode.js
create mode 100644 Lib/misc/sidebar.css
create mode 100644 Lib/misc/sidebar.js
create mode 100644 Lib/moment.min.js
create mode 100644 Lib/momentjs-locales/cy.js
create mode 100644 Lib/momentjs-locales/da.js
create mode 100644 Lib/momentjs-locales/de.js
create mode 100644 Lib/momentjs-locales/en-gb.js
create mode 100644 Lib/momentjs-locales/es.js
create mode 100644 Lib/momentjs-locales/et.js
create mode 100644 Lib/momentjs-locales/fr.js
create mode 100644 Lib/momentjs-locales/it.js
create mode 100644 Lib/momentjs-locales/nl-be.js
create mode 100644 Lib/momentjs-locales/nl.js
delete mode 100644 Lib/phpMQTT.php
create mode 100644 Lib/responsive-linked-tables.js
create mode 100644 Lib/tablejs/expandtables.html
create mode 100644 Lib/travis-CI/emoncms.conf
create mode 100644 Lib/travis-CI/travis-ci-apache
create mode 100644 Lib/units.php
rename Modules/admin/locale/{en_EN => en_GB}/LC_MESSAGES/messages.mo (100%)
rename Modules/admin/locale/{en_EN => en_GB}/LC_MESSAGES/messages.po (100%)
create mode 100644 Modules/admin/module.json
create mode 100644 Modules/admin/pi-model.json
create mode 100644 Modules/eventp/locale/fr_FR/LC_MESSAGES/eventp_messages.mo
create mode 100644 Modules/eventp/locale/fr_FR/LC_MESSAGES/eventp_messages.po
create mode 100644 Modules/eventp/module.json
create mode 100644 Modules/feed/Views/feedlist_view_v2.php
create mode 100644 Modules/feed/engine/CassandraEngine.php
create mode 100644 Modules/feed/engine/PHPFinaTest.php
rename Modules/feed/locale/{en_EN => en_GB}/LC_MESSAGES/messages.mo (100%)
rename Modules/feed/locale/{en_EN => en_GB}/LC_MESSAGES/messages.po (100%)
create mode 100644 Modules/feed/module.json
create mode 100644 Modules/input/Views/device_view.php
create mode 100644 Modules/input/Views/input_dialog.js
create mode 100644 Modules/input/Views/input_dialog.php
create mode 100644 Modules/input/Views/schedule.php
create mode 100644 Modules/input/input_methods.php
rename Modules/input/locale/{en_EN => en_GB}/LC_MESSAGES/messages.mo (100%)
rename Modules/input/locale/{en_EN => en_GB}/LC_MESSAGES/messages.po (100%)
create mode 100644 Modules/input/module.json
create mode 100644 Modules/process/locale/fr_FR/LC_MESSAGES/process_messages.mo
create mode 100644 Modules/process/locale/fr_FR/LC_MESSAGES/process_messages.po
create mode 100644 Modules/process/module.json
create mode 100644 Modules/process/process_langjs.php
rename Modules/schedule/locale/{en_EN/LC_MESSAGES/messages.mo => en_GB/LC_MESSAGES/schedule_messages.mo} (100%)
rename Modules/schedule/locale/{en_EN/LC_MESSAGES/messages.po => en_GB/LC_MESSAGES/schedule_messages.po} (100%)
rename Modules/schedule/locale/es_ES/LC_MESSAGES/{messages.mo => schedule_messages.mo} (100%)
rename Modules/schedule/locale/es_ES/LC_MESSAGES/{messages.po => schedule_messages.po} (100%)
create mode 100644 Modules/schedule/locale/et_EE/LC_MESSAGES/schedule_messages.mo
create mode 100644 Modules/schedule/locale/et_EE/LC_MESSAGES/schedule_messages.po
create mode 100644 Modules/schedule/locale/fr_FR/LC_MESSAGES/schedule_messages.mo
create mode 100644 Modules/schedule/locale/fr_FR/LC_MESSAGES/schedule_messages.po
create mode 100644 Modules/schedule/module.json
create mode 100644 Modules/time/module.json
create mode 100644 Modules/user/deleteuser.php
create mode 100644 Modules/user/images/appstore.png
create mode 100644 Modules/user/images/en-play-badge.png
rename Modules/user/locale/{en_EN => en_GB}/LC_MESSAGES/messages.mo (100%)
rename Modules/user/locale/{en_EN => en_GB}/LC_MESSAGES/messages.po (100%)
create mode 100644 Modules/user/module.json
rename Modules/vis/locale/da_DK/LC_MESSAGES/{messages.mo => vis_messages.mo} (100%)
rename Modules/vis/locale/da_DK/LC_MESSAGES/{messages.po => vis_messages.po} (100%)
rename Modules/vis/locale/de_DE/LC_MESSAGES/{messages.mo => vis_messages.mo} (100%)
rename Modules/vis/locale/de_DE/LC_MESSAGES/{messages.po => vis_messages.po} (100%)
rename Modules/vis/locale/{en_EN/LC_MESSAGES/messages.mo => en_GB/LC_MESSAGES/vis_messages.mo} (100%)
rename Modules/vis/locale/{en_EN/LC_MESSAGES/messages.po => en_GB/LC_MESSAGES/vis_messages.po} (100%)
rename Modules/vis/locale/es_ES/LC_MESSAGES/{messages.mo => vis_messages.mo} (100%)
rename Modules/vis/locale/es_ES/LC_MESSAGES/{messages.po => vis_messages.po} (100%)
delete mode 100644 Modules/vis/locale/fr_FR/LC_MESSAGES/messages.mo
delete mode 100644 Modules/vis/locale/fr_FR/LC_MESSAGES/messages.po
create mode 100644 Modules/vis/locale/fr_FR/LC_MESSAGES/vis_messages.mo
create mode 100644 Modules/vis/locale/fr_FR/LC_MESSAGES/vis_messages.po
rename Modules/vis/locale/it_IT/LC_MESSAGES/{messages.mo => vis_messages.mo} (100%)
rename Modules/vis/locale/it_IT/LC_MESSAGES/{messages.po => vis_messages.po} (100%)
rename Modules/vis/locale/nl_BE/LC_MESSAGES/{messages.mo => vis_messages.mo} (100%)
rename Modules/vis/locale/nl_BE/LC_MESSAGES/{messages.po => vis_messages.po} (100%)
rename Modules/vis/locale/nl_NL/LC_MESSAGES/{messages.mo => vis_messages.mo} (100%)
rename Modules/vis/locale/nl_NL/LC_MESSAGES/{messages.po => vis_messages.po} (100%)
create mode 100644 Modules/vis/module.json
create mode 100644 Modules/vis/vis_langjs.php
create mode 100644 Theme/basic/ajax-loader.gif
create mode 100644 Theme/basic/emon-blue.css
create mode 100644 Theme/basic/emon-standard.css
create mode 100644 Theme/basic/emon-sun.css
delete mode 100644 Theme/basic/emon.css
rename Theme/basic/{emoncms_logo.png => logo_login.png} (100%)
create mode 100644 composer.json
create mode 100644 composer.lock
create mode 100644 docs/Cassandra.md
create mode 100644 docs/RaspberryPi/jessie.md
create mode 100644 docs/input_encrypted.md
create mode 100644 param.php
create mode 100755 php-info.php
create mode 100644 scripts/.htaccess
create mode 100644 scripts/mqtt_input.service
delete mode 100644 scripts/old.phpmqtt_input.php
create mode 100644 scripts/process_langjs_builder.php
create mode 100644 scripts/services/feedwriter/feedwriter.service
create mode 100644 scripts/services/install-service-feedwriter.md
create mode 100644 scripts/services/install-service-runner-update.md
create mode 100755 scripts/services/service-runner/service-runner.py
create mode 100644 scripts/services/service-runner/service-runner.service
create mode 100644 scripts/vis_langjs_builder.php
create mode 100644 tests/.gitignore
create mode 100644 tests/Lib/emonCMS-travis-setup.js
create mode 100644 tests/Lib/emoncms_tests_helper.js
create mode 100755 tests/Lib/start_selenium_server.sh
create mode 100644 tests/Lib/travis_login_details.js
create mode 100644 tests/package.json
create mode 100644 tests/readme.md
create mode 100644 tests/specs/emonCMS-first-login.js
create mode 100644 tests/wdio.conf.js
create mode 100644 version.txt
I then did a browser cache clear
CTRL+F5
Back to that site and as soon as I click on anything that needs my login credentials. I get this:
I really thought the “git pull” is going to fix it.
Frits
(Frits Erasmus)
27 January 2019 19:44
19
Brian,
I did all of that, but I am still not successful.
borpin
(Brian Orpin)
27 January 2019 23:14
20
Can you open the admin page? If so, and you have that in one window, if you click on one of the pages that are not working in a second window, is there anything in the log (set it to auto scroll) that might point to the problem?