Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-23 12:18:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,953 Commits 19 Branches 112 Tags
33b660d4fa0e333d1166cfe1bf76845fc692f256
Commit Graph

58 Commits

Author SHA1 Message Date
Adam Warner
33b660d4fa Merge pull request #1610 from pi-hole/fix/query_retries 
Add new query status 12 and 13 (retried queries)
 2020-11-08 15:23:00 +00:00
XhmikosR
274c196e42 Lint. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-10-26 06:16:04 +00:00
DL6ER
6fcd137ed9 Add new query status 12 and 13 (retried queries). 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-10-22 22:30:38 +02:00
Adam Warner
acfc29004d Merge pull request #1529 from yubiuser/tweak/24hTimeRangePicker 
Change timePicker to 24h format in dateragepicker
 2020-08-15 10:35:59 +01:00
yubiuser
5565d00617 Change timePicker to 24h format in dateragepicker 
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2020-07-26 12:47:32 +02:00
Adam Warner
3a68efc4b0 fix a complaint from the CI 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-16 18:44:00 +01:00
Adam Warner
606568054a enable IP sorting on the query/long-term query pages. Appears to work with a mixture of hostnames/IP's 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-07 11:09:20 +01:00
XhmikosR
68297b14b6 Merge pull request #1374 from pi-hole/radix 
Enable radix ESLint rule
 2020-06-05 10:28:03 +03:00
DL6ER
4bf018b52c Add missing radix information in parseInt(). 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-04 16:57:55 +02:00
DL6ER
ffbeba4ad5 Extend warning shown on server-side data processing errors. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-04 14:55:55 +02:00
DL6ER
e7eec95ba4 Use all the new Pi-hole v5.0 blocking status code also in the long-term data where it was forgotten to add them. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 10:03:32 +02:00
XhmikosR
cecb5aa88c Use $(fn) 
This is the recommended way in jQuery 3.x.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-30 10:24:55 +03:00
DL6ER
cce92ccde4 Remove obsolete add.php script, use groups.php everywhere instead. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-26 23:07:20 +02:00
DL6ER
c86515e028 Merge pull request #1372 from pi-hole/indexOf 
Always use `!== -1` to check for a string's existence
 2020-05-25 20:42:02 +02:00
XhmikosR
4356bd5f04 Always use !== -1 to check for a string's existence 
`String.indexOf()` returns -1 if the string isn't found so this is consistent with the rest of the codebase.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-25 09:38:47 +03:00
XhmikosR
623087346a Enable no-zero-fractions rule 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-17 15:03:52 +03:00
DL6ER
73ee91a024 Merge branch 'master' into master-to-development-v5.0 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-10 22:00:07 +02:00
DL6ER
cc4e3c9a95 Query Log and long-term data Query Log: Substitute empty domains by "." 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-07 09:17:47 +02:00
XhmikosR
ae13014565 Adapt to the new rules. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-04-10 18:34:47 +00:00
DL6ER
2fdc676979 Add new CNAME-specific blocking modes [QUERY_GRAVITY_CNAME, QUERY_REGEX_CNAME, QUERY_BLACKLIST_CNAME] and show domain that was the reason for blocking during a CNAME inspection 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-01-29 22:19:26 +00:00
XhmikosR
704c352277 Format JS code 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-01-02 19:42:18 +02:00
Adam Warner
73236e8ada Merge pull request #1094 from pi-hole/buttons 
Fix buttons appearance
 2020-01-02 17:26:28 +00:00
DL6ER
03b3a1d604 Merge pull request #1088 from pi-hole/location 
Be explicit about `window.location`
 2019-12-28 16:58:27 +01:00
XhmikosR
d017c57f84 Fix buttons appearance 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2019-12-17 17:50:50 +02:00
XhmikosR
f96d6cc0f0 Remove more unused variables 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2019-12-17 17:15:59 +02:00
DL6ER
aad00db5b6 Merge pull request #1085 from pi-hole/reuse-dateformat 
Reuse the `dateformat` variable
 2019-12-17 15:55:41 +01:00
DL6ER
f084fa1991 Merge pull request #1091 from pi-hole/text 
Use `text()` for the token
 2019-12-17 15:49:05 +01:00
XhmikosR
f486935eb8 Use text() for the token 
We don't need any HTML.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2019-12-17 15:57:50 +02:00
XhmikosR
2ba18a1b58 Be explicit about window.location 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2019-12-17 12:14:37 +02:00
XhmikosR
7d9e32bac6 Reuse the dateformat variable 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2019-12-17 09:59:01 +02:00
XhmikosR
9c1846885a Clean up JS 
* remove unused variables/functions
* use the dot notation
* use explicit coercion
* remove unneeded else
* use `textContent` instead of `innerHTML`
* cache a few `getElementById` calls
* fix a couple of undefined variables
* various assorted lint tweaks

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2019-12-16 20:36:40 +02:00
XhmikosR
d65b5be5e2 A few CSS tweaks. 
Add utilities classes and fix a few CSS issues.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2019-12-09 21:36:58 +02:00
TheME
5ea4e6d185 fix broken Icons 
Signed-off-by: Th3M3 <the_me@hotmail.de>
 2019-08-04 21:11:32 +02:00
DL6ER
468cd0ccfd Move dataIndex definition into dataSrc function 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-10 22:02:52 +02:00
DL6ER
6d896f9892 Use Array.map() instead of looping over elements and pushing the content to a new array 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-09 20:10:32 +02:00
DL6ER
1d5b212d93 Apply the same changes also for the database query list 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-06 07:44:11 +02:00
DL6ER
e0947d69ab Long-term queries: Request all externally blocked variants when the checkbox is enabled 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-22 21:26:36 +01:00
DL6ER
8796583818 Implement finer grained external blocking displaying 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-04 17:45:30 +01:00
Mcat12
2ba8787261 Merge branch 'release/v4.2' into devel 
# Conflicts:
#	scripts/pi-hole/js/db_graph.js
 2019-02-03 11:24:19 -08:00
DL6ER
a975576616 Long-term data: Show date range only after user chose a valid range. Fixes #897 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-01-22 23:30:36 +01:00
DL6ER
8ae36a0dcb Fill daterange field with initialization (now-6d -> now) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-01-20 11:36:39 +01:00
DL6ER
26ab341669 Remove debug statement 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-30 15:37:04 +02:00
DL6ER
d2ecf1c70a Use comma-separated list of type integers instead of byte-coded integer. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-30 15:02:33 +02:00
DL6ER
2d1aae3078 Merge branch 'devel' into new/longterm/select_query_type 2018-08-29 20:35:47 +02:00
Mcat12
b1549f1da8 Fix whitelisting from the query log (and DB query log) 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-08-26 12:38:50 -04:00
DL6ER
7ee1874672 Optimize HTML and JS 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-24 14:25:02 +02:00
DL6ER
318179d82d Merge branch 'devel' into new/longterm/select_query_type 2018-08-24 14:09:46 +02:00
DL6ER
3169b5ba88 Add selection for query types on long term DB query log page 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-24 14:09:08 +02:00
Mcat12
9367e8115e Add support for new query statuses in long term query log 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-08-20 16:28:02 -04:00
Mcat12
9bc09564ba Improve readability of long term summary stats 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-06-25 19:44:22 -04:00