Dashticz v3.7 master

[Lokonli]

I've just released v3.7 master.

It contains all functionality from v3.6.9 beta.

Main changes compared to v3.6 master:

Garbage

• Update of quite some garbage providers
• New representation as table layout.
• Customize styling via trashtoday and trashtomorrow css classes
• Date separator configurable

Dials

• Dials now enabled for most devices
• Set the block parameter ``animation`` to ``true`` or ``false`` to enable/disable dial animations.
• Combine data from several devices

Enhancements

• Stationclock: new configuration options
• Graphs: Customize the button icons in custom graphs
• Colorpicker: Support for WW dimmers (Philips Hue for instance)
• Configure Dashticz configuration settings in the url. For instance, to start Dashticz with an alternative configuration script use 'http://dashticz ip:port/?cfg=CONFIG.new.js
• The css class 'timeout' is added to blocks for devices in Domoticz timeout state
• Button, special blocks: Initiate the 'url' parameter as POST request by setting 'newwindow: 4'
• Set config setting 'security_panel_lock' to '2' to activate security panel lock in 'Armed Home' mode as well.

New functionality

• Graph as moving time chart
• Custom html block

Fixes

• X10 security motion device
• Scenes will switch always to on
• New Covid-19 server
• PV Output temp device
• Remove scroll bar of the modal security panel (security panel lock)

For the release notes, check:
https://dashticz.readthedocs.io/en/mast ... notes.html

[Jimster]

Great work!

[Afterburner]

Hi,

I tried to upgrade to 3.7 from 3.6. I used the git pull command but get a list of merge issues. I'am on ubuntu server that's uptodate. How to solve this?

[Lokonli]

Hi,

I tried to upgrade to 3.7 from 3.6. I used the git pull command but get a list of merge issues. I'am on ubuntu server that's uptodate. How to solve this?

First, make a backup of your config files (custom/CONFIG.js, custom/custom.js, custom/custom.css) and store them outside the dashticz folder.

You did not make any local changes that you want to keep?
Then:

Code: Select all

git fetch origin
git reset --hard origin

This will overwrite your local changes! (including custom.css and custom.js)

Then restore the config files to the custom folder.

If you used the automatic install script, then I recommend to recreate the Docker image with:

Code: Select all

make stop
make start

[Afterburner]

Thanks for the quick respons and making this wonderfull software work.

Your solution did the job. Something for the manual?

I made a backup already from the custom directory. Appearently however the 'old' files are still there after the update. So a restore is not needed....or do I miss something?

[kiddigital]

Although there is a nice Beta branch next to the 'stable' Master branch, I noticed that 3.7 isn't tagged/released in the Master branch. Any specific reason? For people modifying things, having a fixed/tagged commit is a good reference to work with