Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Link #21

Open
wants to merge 27 commits into
base: master
Choose a base branch
from
Open

Link #21

Changes from 4 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
fd6d2a4
Remove ancient extendoutput option and limit from login.
wdoekes Sep 7, 2017
8ddea32
Alex wants more info in popup
wdoekes Sep 12, 2017
e6ffc26
Merge branch 'fix-login-in-zabbix3_4'
wdoekes Sep 12, 2017
ee38fb1
Merge branch 'add-more-info-in-popup'
wdoekes Sep 12, 2017
2b9cb07
new version: 1.7.2
wdoekes Sep 12, 2017
a21d5e6
Updated plugin to work with Firefox
rsanting Oct 6, 2017
505b6b6
Replaces ember by non minified version
rsanting Nov 6, 2017
071eee8
Had to update the version number for mozilla
rsanting Jan 10, 2018
0dd9bba
Default to no sound
Feb 11, 2018
dbb4d09
Convert dropdown to multiselect with multiple-select.js. Also fix ico…
Feb 11, 2018
3112795
Merge pull request #1 from mchugh19/multi-select
mchugh19 Feb 11, 2018
10f4071
add filter on results
Feb 11, 2018
ef73696
Merge pull request #2 from mchugh19/search
mchugh19 Feb 11, 2018
8354ac5
Add .DS_Store
Feb 11, 2018
a36ec8a
Merge branch 'master' of github.com:mchugh19/zabbixwatcher into link
Feb 11, 2018
ab9fcc9
Merge pull request #2 from mchugh19/search
rsanting Feb 12, 2018
be3b9d7
Updated manifest.json and fixed a slight alignment issues in the popu…
rsanting Feb 12, 2018
9043a85
formatting cleanup
Feb 12, 2018
e27a0a1
template.js cleanup
Feb 12, 2018
7b7d282
add advanced row with link below results, and arrow toggle to display.
Feb 13, 2018
451bebb
Merge pull request #4 from mchugh19/link
rsanting Feb 16, 2018
0f1057f
Add event links
Feb 16, 2018
5d59c2c
hand cursor over event link buttons
Feb 17, 2018
26c1484
Merge branch 'master' into link
mchugh19 Feb 17, 2018
5d6b4f7
Merge branch 'master' into link
Feb 17, 2018
49a127b
fix click on header toggles showing the following row
Feb 20, 2018
ca107ba
Merge branch 'link' of github.com:mchugh19/zabbixwatcher into link
Feb 20, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Zabbix Watcher",
"version": "1.7.6",
"version": "1.7.7",
"manifest_version": 2,
"description": "Watcher for Zabbix.",

@@ -24,6 +24,6 @@
"http://*/",
"https://*/"
],
"content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'"
"content_security_policy": "script-src 'self'; object-src 'self'"

}
4 changes: 2 additions & 2 deletions src/popup.js
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ $(document).ready(function() {
$content.find('#groupid').multipleSelect({
placeholder: "All Hosts",
filter: true,
width: 360,
width: 320,
selectAll: false
});

@@ -177,4 +177,4 @@ function getEvent(config, triggerid, cb) {
eventZab.sendAjaxRequest('event.get', params, parseEvent);
})
});
}
}