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
XhmikosR
a25cb8a838 Reduce CSS duplication a bit 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-29 07:39:50 +03:00
Adam Warner
ac8ece7d05 Merge pull request #1385 from pi-hole:XhmikosR-patch-3 
Use `$` instead of `jQuery`.
 2020-05-28 22:04:39 +01:00
Adam Warner
2cb6a6ede6 Merge pull request #1384 from pi-hole:XhmikosR-patch-2 
Replace `$.each` with native methods.
 2020-05-28 22:03:50 +01:00
Adam Warner
e762b47eb7 Merge pull request #1383 from pi-hole:libs 
Update bootstrap-select and add missing .map files
 2020-05-28 21:58:30 +01:00
DL6ER
6dbe1f44f1 Merge pull request #1398 from pi-hole/fix-broken-abstraction 
Check `data` for null before trying to manipulate it.
 2020-05-28 22:39:33 +02:00
Adam Warner
39ac2026b0 Check data for null before trying to manipulate it. Closes #1391 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-28 21:38:14 +01:00
Adam Warner
6a80f8c2a2 add some blurb, replace confusing placeholder on adlist page 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-28 20:26:53 +01:00
XhmikosR
789470c1b2 gravity.php: add missing space (#1395) 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-28 08:19:58 +03:00
XhmikosR
2d7f563e45 Add the missing bootstrap-toggle.min.js.map file. 
This is to get rid of browser console warnings.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-27 21:49:11 +03:00
XhmikosR
f4f5fa19fb Update bootstrap-select to v1.3.17. 
Also, add its map file to get rid of console warnings

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-27 21:49:10 +03:00
Adam Warner
1bd45006bc Merge pull request #1097 from pi-hole:XhmikosR-patch-1 
Update pi-hole.css
 2020-05-27 10:16:54 +01:00
XhmikosR
bf4ba1b5b9 Use $ instead of jQuery. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-27 11:56:02 +03:00
XhmikosR
f5d68ffd88 Remove version number from the Font Awesome folder. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-27 09:22:37 +03:00
DL6ER
24269a0370 Remove break after die as it cannot be reached. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-26 23:25:19 +02: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
23ff8c246c Merge pull request #1392 from pi-hole/url-check 
Allow semi colons in URLS
 2020-05-26 23:05:32 +02:00
Adam Warner
c2a634f80f Allow for ; in adlist urls 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-26 20:58:18 +01:00
DL6ER
2fac217943 Re-implement api.php?list actions for add, sub and get. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-26 18:40:33 +02:00
XhmikosR
ba86bb876f default-dark.css: don't use 8-digit hex color 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-26 13:14:45 +03:00
XhmikosR
d48a57a2cd Update pi-hole.css 
* format code
* use `background-color` instead of the `background` shorthand
* use the `animation` shorthand
* remove unneeded CSS prefixes

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-26 13:14:45 +03:00
XhmikosR
cfad66abca Update npm scripts 
* add browserslist settings in package.json
* add prettier scripts for CSS and JS (JS is mainly for devel since xo handles this for us)
* add autoprefixer to handle CSS prefixes for us (`npm run prefix`)

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-26 13:13:03 +03:00
XhmikosR
9b3d8b81e7 Replace $.each with native methods. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-26 06:34:27 +03:00
Paul Mannarino
256aff73a6 Replace custom httpGet() with $.ajax()" (#1371) 
Signed-off-by: Paul Mannarino <paul.mannarino@gmail.com>
 2020-05-25 21:59:18 +03: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
DL6ER
8cc24a9158 Merge pull request #1379 from pi-hole/XhmikosR-patch-3 
pi-hole.css: fix glow to use the current color
 2020-05-25 20:41:17 +02:00
DL6ER
ba510cc8d1 Merge pull request #1369 from pi-hole/clean-markup 
Minor HTML markup fixes.
 2020-05-25 20:37:00 +02:00
DL6ER
a4f9068b32 Merge pull request #1368 from pi-hole/sidebar-toggle 
Use `fa5` class on the sidebar toggle
 2020-05-25 20:36:19 +02:00
DL6ER
621e65b9bb Merge pull request #1367 from pi-hole/clean-table-classes 
Clean table classes
 2020-05-25 20:33:48 +02:00
DL6ER
68cd72a3c0 Merge pull request #1381 from pi-hole/XhmikosR-patch-2 
Update settings.js
 2020-05-25 20:31:06 +02:00
DL6ER
18dba14389 Merge pull request #1344 from pi-hole/tweak-footer 
Tweak footer.php
 2020-05-25 20:27:58 +02:00
XhmikosR
792abf8624 Update settings.js 
* cache variable
* camelcase variable name

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-25 21:27:36 +03:00
XhmikosR
36eb877a31 Tweak footer.php 
* add a new row for the version info
* add links to the current tags
* make the updates URLs go to the latest GitHub release
* color the heart icon red
* remove "Version" from links; the tags are prefixed with "v"

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-25 21:22:18 +03:00
DL6ER
b6d1392948 Merge pull request #1351 from pi-hole/redundant-var 
Remove redundant variable
 2020-05-25 20:17:49 +02:00
DL6ER
fc78d470a8 Merge pull request #1358 from pi-hole/XhmikosR-patch-2 
db_graph.js: move variable where it's used
 2020-05-25 20:14:08 +02:00
DL6ER
b6ad648842 Merge pull request #1329 from pi-hole/new/somepeoplelikecurves 
Add checkbox (save state in localstorage) to toggle between bar and smooth
 2020-05-25 20:08:42 +02:00
DL6ER
184c8e47e1 Merge pull request #1332 from pi-hole/tweak/dhcp_save_state 
Remember last used sort column/direction on DHCP lease tables
 2020-05-25 20:05:45 +02:00
DL6ER
3bfef7b8a8 Merge pull request #1326 from pi-hole/tweak/notAnError 
Remove an error log output that was presumably leftover from debugging
 2020-05-25 20:00:40 +02:00
DL6ER
61a3ec1b2b Merge pull request #1298 from pi-hole/XhmikosR-patch-5 
Enable `no-zero-fractions` rule
 2020-05-25 19:48:01 +02:00
XhmikosR
7b084b87d4 pi-hole.css: fix glow to use the current color 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-25 16:12:29 +03:00
Adam Warner
2d28f16240 Merge pull request #1373 from pi-hole/rm-dupe-func 
footer.js: remove duplicate function.
 2020-05-25 13:14:16 +01:00
XhmikosR
c7e3be4b07 footer.js: remove duplicate function. 
There's already a function checking for cookies in the previous document.ready function.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-25 09:41:21 +03: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
8f8fb36d25 Regenerate package-lock.json (#1365) 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-24 21:46:56 +03:00
XhmikosR
bf63da9873 Minor HTML markup fixes. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-24 21:16:57 +03:00
XhmikosR
30776108ee Use fa5 class on the sidebar toggle 
This was added in AdminLTE v2.4.13.

Also, remove unneeded related custom CSS while at it.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-24 21:12:15 +03:00
XhmikosR
b7540de7d0 Revert "Remove the invalid width="100% attribute" 
This reverts commit 59ea121e07.

Apparently, we are doing something weird in the settings tables and this doesn't work. We should revisit this later.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-24 17:14:04 +03:00
XhmikosR
59ea121e07 Remove the invalid width="100% attribute 
Also, add the missing `table` class in a network table.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-24 16:13:43 +03:00
XhmikosR
d3cd52b992 Remove the obsolete cellspacing="0" attribute. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-24 16:07:46 +03:00
XhmikosR
de71dd0fb5 Clean up table classes. 
These are DataTables classes which we don't use since we use Bootstrap.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-24 16:05:24 +03:00
Adam Warner
d5d2e56c45 Merge pull request #1359 from pi-hole/markdown 
Assorted Markdown tweaks
 2020-05-24 13:53:22 +01:00