pi-hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2024-12-06 19:36:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,461 Commits 16 Branches 105 Tags
acc327af5a21396878b7ab47aa620ac0093e418b
Commit Graph

1219 Commits

Author SHA1 Message Date
XhmikosR bfd944e41c Switch to the plain chart.js build and moment.js to v2.24 
This avoids including moment.js twice since chart.js bundle included moment.js

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-12 23:05:59 +03:00
DL6ER 08d2676489 Review comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 21:14:18 +02:00
DL6ER 257f6ce55e Log number of imported group assignments. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 20:36:00 +02:00
DL6ER ac3c178ce9 Add import for Local DNS Records. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 20:23:26 +02:00
DL6ER 67b68b4400 Add pihole-FTL.conf ans custom.list (Local DNS Records) to Teleporter Backup 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 20:23:26 +02:00
DL6ER ad4a10c01e Add import for missing tables: group, client + the group linking tables. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 20:23:26 +02:00
DL6ER cb48efff19 Add export for missing tables: group, client + the group linking tables. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 20:23:26 +02:00
Adam Warner 3d6a54ff97 Add hold-transition to body tag 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-12 16:33:07 +01:00
Adam Warner 9bf9e3b81a Use AdminLTE 2.4.18 - include CSS, too. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-12 16:20:08 +01:00
DL6ER 2314a60d5b Get an endless array of colors without altering the colors array itself. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 17:16:55 +02:00
XhmikosR 7001a1b3a1 Update index.js 2020-05-12 17:58:34 +03:00
Adam Warner d10f1905cc fix prettier complaints 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-12 13:21:30 +01:00
Adam Warner 3e94ff0f43 Update adminLTE to 2.4. 
- Change a few references per upgrade guide
 - define colors[] at the top of index.js as AdminLTE.options does not appear to exist. (there may be a better way of doing this)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-12 12:58:45 +01:00
DL6ER e96acc415d Merge pull request #1262 from pi-hole/xmr-button-type 
Add `type="button"` to all buttons.
 2020-05-11 22:05:34 +02:00
DL6ER 54715b7117 Merge pull request #1261 from pi-hole/rm-glyphicons 
groups-common.js: use FontAwesome for consistency
 2020-05-11 21:53:29 +02:00
DL6ER d8671dc6b0 Merge pull request #1260 from pi-hole/xmr-var 
Minor tweaks and cleanup
 2020-05-11 21:50:06 +02:00
DL6ER 963ec6bde1 Merge pull request #1254 from pi-hole/XhmikosR-patch-3 
Update groups-common.js
 2020-05-11 21:36:32 +02:00
XhmikosR 8db0957a28 Minor tweaks 
* use the background-color property instead of the background shorthand
* add multiple classes with one `addClass` call
* rename `underline` to `text-underline`
* use the CSS class `pointer` instead of adding CSS via JS
* change `border-color: transparent` to `border: 0` in the navbar right dropdown image
* add image dimensions in the dropdown donate image
* remove the obsolete and unneeded `center` element from network.php
* remove commented out PHP code from header.php
* fix wrong `form-control` class used in buttons

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-11 21:49:48 +03:00
XhmikosR 43151d3c43 Add type="button" to all buttons. 
The default is `type="submit"`.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-11 21:40:26 +03:00
XhmikosR ed528c00e6 groups-common.js: use FontAwesome for consistency 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-11 16:59:55 +03:00
XhmikosR e02df5467a Fix lint errors. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-11 09:20:32 +03:00
XhmikosR ba31df2602 Update groups-common.js 
Remove unused assignment

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-11 08:27:29 +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
Adam Warner d8706620de Replace paypal link with link to pi-hole.net donate page 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-09 12:57:15 +01: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
DL6ER b86ff763c0 Address xo complaints. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-07 07:52:18 +02:00
Adam Warner 68ce56fc56 show a clickable "." when there is a blank domain in the top domain lists 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-06 23:19:50 +01:00
XhmikosR bdde1e6667 Use text() when retrieving the token. (#1237) 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-04 10:52:00 +03:00
XhmikosR 0e35b415ea JS: test for length explicitly. (#1240) 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-04 10:50:13 +03:00
Adam Warner 6e5bbfb68a Check IP addresses read in from dns-server.conf are valid before adding them to the array. 
Fix for CVE-2020-12620

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-03 22:47:33 +01:00
DL6ER 81a2932f6a Merge branch 'release/v5.0' into tweak/trim_domains_input 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-28 21:12:45 +02:00
Dan Schaper eaf2d7ed62 Merge pull request #1226 from pi-hole/tweak/allow_()_in_urls 
Allow ( and ) in adlist URLs.
 2020-04-28 11:46:32 -07:00
DL6ER 527c2f114b Merge pull request #1229 from pi-hole/tweak/custom_dns 
Custom DNS page -> Local DNS Records
 2020-04-28 20:30:23 +02:00
DL6ER 9cf73959fd Rename Custom DNS page. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-28 18:23:13 +00:00
DL6ER abf6e9f7a2 Merge pull request #1210 from pi-hole/fix/regex_link_multiple_tabs 
Prevent multiple tabs from being opened when clicking on a regex link on the Query Log page
 2020-04-28 20:06:03 +02:00
DL6ER 4889350038 Merge branch 'release/v5.0' into tweak/trim_domains_input 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-28 17:30:13 +00:00
DL6ER 79539bdd6c Merge pull request #1121 from pi-hole/fix/queries_over_time 
Fix tooltip percentage computation and more...
 2020-04-28 04:36:02 +02:00
DL6ER 84046528bf Allow ( and ) in adlist URLs. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-26 09:31:45 +02:00
DL6ER f17b216b6b As of ICU 55.1 (released 2015-04-01) the IDNA2003 APIs are deprecated, because UTS #46 should be preferred over the obsolete IDNA 2003 variant. Implement this change. Fixes #1223 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-25 07:02:37 +02:00
DL6ER 77b421b133 Show how many domains have been added in case of an error. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-23 13:47:50 +02:00
DL6ER 7d1163ff9c Try to be clearer with the "failed to add domain" message by showing the original input when idn_to_ascii() failed and by showing both, the original and the converted domain when the conversion result itself is invalid. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-23 11:39:57 +02:00
DL6ER 14dd1350df Strip whitespaces from the beginning and end of user input to prevent errors getting triggered due to users trying to add "empty" domains. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-23 11:27:24 +02:00
DL6ER c49bcb1454 Merge pull request #1147 from Th3M3/fix/custom_tooltips 
tweak chartjs customtooltips
 2020-04-21 16:34:19 +02:00
DL6ER c1ddf66487 Merge pull request #1206 from pi-hole/fix/dhcp_static_error 
Check for existence and readability of static leases file before trying to access it
 2020-04-21 10:07:15 +02:00
Samu Voutilainen 39ec67829b Execute pihole through wrapper 
All different exec() calls basically just calls sudo pihole,
with various different syntaxes. Using a wrapper function
allows sanitization of arguments for better safety.

Signed-off-by: Samu Voutilainen <smar@smar.fi>
 2020-04-17 07:55:16 +03:00
DL6ER 2e7b9191fc Update scripts/pi-hole/js/queries.js 
Co-Authored-By: TheME <andreas_fl@outlook.com>
 2020-04-14 19:54:43 +02:00
DL6ER 8ad3b70f96 We should also accept open-ended IPv6 addresses such as, e.g., fda2:2001:5555:: 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-13 09:48:08 +02:00
Th3M3 fadc6073db tweak chartjs customtooltips... 
...and disable 'maintainAspectRatio' for the clients chart to avoid a squeezed display on small screens.

Signed-off-by: Th3M3 <the_me@outlook.de>
 2020-04-12 15:25:29 +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 0f21f6d269 Release possible previous onClick event handler on regex links to avoid multiple tabs being opened on click. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-10 10:45:26 +02:00