github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-08-19 12:59:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'dev'

Browse source
This commit is contained in:
JonnyWong16 2016-03-29 08:16:25 -07:00
commit 786a374233
4 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -1,5 +1,11 @@
# Changelog # Changelog
## v1.3.14 (2016-03-29)
* Fix: Regression for missing notify_action for script notifications.
* Fix: Typo for home stats cards in the settings.
## v1.3.13 (2016-03-27) ## v1.3.13 (2016-03-27)
* Fix: Only mask strings longer than 5 characters in logs. * Fix: Only mask strings longer than 5 characters in logs.

4
data/interfaces/default/settings.html
View file

@ -269,13 +269,13 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
<li class="card card-sortable"> <li class="card card-sortable">
<div class="card-handle"><i class="fa fa-bars"></i></div> <div class="card-handle"><i class="fa fa-bars"></i></div>
<label> <label>
<input type="checkbox" id="hscard-top_music" name="hscard-top_music" value="top_music"> Most Listened Music <input type="checkbox" id="hscard-top_music" name="hscard-top_music" value="top_music"> Most Listened to Artist
</label> </label>
</li> </li>
<li class="card card-sortable"> <li class="card card-sortable">
<div class="card-handle"><i class="fa fa-bars"></i></div> <div class="card-handle"><i class="fa fa-bars"></i></div>
<label> <label>
<input type="checkbox" id="hscard-popular_music" name="hscard-popular_music" value="popular_music"> Most Popular Music <input type="checkbox" id="hscard-popular_music" name="hscard-popular_music" value="popular_music"> Most Popular Artist
</label> </label>
</li> </li>
<li class="card card-sortable"> <li class="card card-sortable">

2
plexpy/notifiers.py
View file

@ -487,7 +487,7 @@ def send_notification(agent_id, subject, body, notify_action, **kwargs):
slackClient.notify(message=body, event=subject) slackClient.notify(message=body, event=subject)
elif agent_id == 15: elif agent_id == 15:
scripts = Scripts() scripts = Scripts()
scripts.notify(message=body, subject=subject, **kwargs) scripts.notify(message=body, subject=subject, notify_action=notify_action, **kwargs)
elif agent_id == 16: elif agent_id == 16:
facebook = FacebookNotifier() facebook = FacebookNotifier()
facebook.notify(subject=subject, message=body, **kwargs) facebook.notify(subject=subject, message=body, **kwargs)

2
plexpy/version.py
View file

@ -1,2 +1,2 @@
PLEXPY_VERSION = "master" PLEXPY_VERSION = "master"
PLEXPY_RELEASE_VERSION = "1.3.13" PLEXPY_RELEASE_VERSION = "1.3.14"