Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-22 19:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,823 Commits 19 Branches 112 Tags
c42c06be2dea820da599e1598b51a6aa6c39aafc
Commit Graph

3823 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DL6ER
7eba926643 Merge pull request #1272 from pi-hole/tweak/updateAdminLTE 
Update adminLTE to 2.4.18
 2020-05-12 19:52:38 +02:00
XhmikosR
bf5e60bae3 Fix bg image 2020-05-12 18:37:05 +03: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
a0bd88c7ef Add proper IP sorting to the groups->client table. Also implement subnet (CIDR notation) support into our existing IP sorting algorithm. This fixes #1268. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-11 23:53:24 +02: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
DL6ER
577b5433f8 Merge pull request #1267 from pi-hole/XhmikosR-patch-4 
Delete the unused mstile-150x150.png
 2020-05-11 21:35:53 +02:00
XhmikosR
52261c3c58 Delete the unused mstile-150x150.png 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-11 22:11:38 +03: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
DL6ER
c2f3baf25e Merge pull request #1252 from pi-hole/master-to-development-v5.0 
Update devel from release v5.0
 2020-05-11 19:43:53 +02: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
Willem Stuursma-Ruwen
5971707263 Fixes #1227 Fix possible warning when unlinking files 
Signed-off-by: Willem Stuursma-Ruwen <willem@stuursma.name>
 2020-05-10 21:18:03 +02:00
Adam Warner
b86e4a3178 Merge pull request #1247 from pi-hole/release/v5.0 
Pi-hole web v5.0
v5.0 		2020-05-10 19:07:48 +01:00
DL6ER
b6d3d6c334 Merge pull request #1248 from pi-hole/tweak/donatelink 
Use Pi-hole.net donate page instead of direct link to Paypal
 2020-05-09 14:23:23 +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
XhmikosR
9b70e6dc53 Remove unneeded xo suppression. (#1238) 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-09 09:04:50 +03:00
Adam Warner
5909433a79 Merge pull request #1244 from pi-hole/fix/blank-domains-toplists 
Show a clickable "." when there is a blank domain in the top domain lists
 2020-05-07 08:41:36 +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
416d35dc47 Bump ecmaVersion to 5 (#1239) 
This is the ESLint default and I doubt we care about older versions nowadays

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-04 10:50:27 +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
DL6ER
e620211211 Merge pull request #1236 from pi-hole/fix/vuln-savesettings 
Check IP addresses read in from dns-server.conf are valid before addi…
 2020-05-04 09:23:23 +02: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
d5477c5cfb Merge pull request #1224 from pi-hole/tweak/trim_domains_input 
Improve group management pages
 2020-05-02 16:38:46 +02:00
DL6ER
c37c86ec22 Merge pull request #1234 from pi-hole/fix/long_term_interval_filling 
Fill missing time intervals with zero
 2020-05-02 16:38:22 +02:00
dependabot-preview[bot]
acba118a42 Bump xo from 0.29.1 to 0.30.0 (#1233) 
* Bump xo from 0.29.1 to 0.30.0

Bumps [xo](https://github.com/xojs/xo) from 0.29.1 to 0.30.0.
- [Release notes](https://github.com/xojs/xo/releases)
- [Commits](https://github.com/xojs/xo/compare/v0.29.1...v0.30.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Ignore `unicorn/no-fn-reference-in-iterator` rule

Signed-off-by: XhmikosR <xhmikosr@gmail.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-02 14:55:16 +03: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
34d994286b Merge pull request #1230 from pi-hole/fix/long_doghnout_legends 
Allow too long legend lines to break
 2020-04-28 11:50:39 -07: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
2ead771a86 Allow too long legend lines to break 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-28 18:41:14 +00: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
c463e15ba6 Fix wording 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-28 17:55:41 +00: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
576edc452c Merge pull request #1228 from pi-hole/XhmikosR-patch-3 
CI: remove no longer needed steps
 2020-04-28 19:22:24 +02:00
XhmikosR
f7277b28b8 CI: remove no longer needed steps 
The latest `actions/setup-node` prints this info by default

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-04-28 17:40:04 +03:00