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,823 Commits 19 Branches 112 Tags
c42c06be2dea820da599e1598b51a6aa6c39aafc
Commit Graph

1464 Commits

Author SHA1 Message Date
DL6ER
9b8946ee9f Merge branch 'devel' into tweak/exact_searching 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-03 15:21:12 +02:00
Adam Warner
8dd141918d Merge pull request #1419 from pi-hole/fix/long-term-blocking-modes 
Fix long-term blocking calculations
 2020-06-03 08:40:22 +01:00
Adam Warner
4f2d3c0d5a Merge pull request #1421 from pi-hole/tweak/zero_delay_is_possible 
Show "zero" delays in the Query Log
 2020-06-02 16:44:50 +01:00
Adam Warner
b75ebb1cab xo 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-02 16:40:12 +01:00
DL6ER
a4a678b584 Revert "Add per-browser boxed layout setting" 
This reverts commit c2683fb87bc50369753b279e179e7b5d0d1e60a9.

Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:20:51 +01:00
DL6ER
51dc473278 Remove saving backend for settings moved into local storage. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:20:51 +01:00
DL6ER
2e0a261c47 No not use per-browser settings for the theme to avoid flashing pages on navigation. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:20:51 +01:00
DL6ER
e6ca9a213b xo adjustments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:20:27 +01:00
DL6ER
16d313582d Further tweaks and optimization 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:19:24 +01:00
DL6ER
6ed0f056c6 Simplify code 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:19:00 +01:00
DL6ER
3c793581b7 Add per-browser temp unit selection 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:19:00 +01:00
DL6ER
6e52ee4307 Add per-browser theme selection 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:18:36 +01:00
DL6ER
3124e94d5a Fix login page check box 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:17:28 +01:00
DL6ER
7ff5764f95 Add per-browser boxed layout setting 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:17:28 +01:00
DL6ER
0e4d1e4e7f Implement per-browser checkbox and radio button styling using icheck-material. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:17:28 +01:00
DL6ER
580149e91f Merge pull request #1292 from pi-hole/tweak/group_name_separators 
Allow spaces in groups when wrapping names in "..."
 2020-06-02 13:43:49 +02:00
DL6ER
d518a1d43d Merge pull request #1417 from pi-hole/include-hostname-in-backup 
Include hostname in backup filename
 2020-06-02 13:40:13 +02:00
DL6ER
578477148b On fast machines, cache replies can be served within less than 100 nanoseconds. The query log should show "(0.0ms)" in this case instead of hiding the value altogether. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 13:21:34 +02:00
DL6ER
332cff1d36 Improve warnings on the domain management pages. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 11:37:23 +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
Adam Warner
02a4e83d87 create utils.getGraphType() function. 
also apply setting to long term graphs
flip logic - only return "line" if the setting is explicitly set to "false"

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-01 21:10:14 +01:00
Adam Warner
ee89ab3131 Include hostname in backup filename. Will add nothing if no hostname detected. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-01 20:49:31 +01:00
Chris Coffin
4cca206810 Change "Permanently" toggle to "Indefinitely" (#1416) 
* Changing "Permanently" toggle to "Indefinitely"

Signed-off-by: Chris Coffin <me@chriscoffin.org>

* Updating ID name in footer.js

Signed-off-by: Chris Coffin <me@chriscoffin.org>

Co-authored-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-01 21:47:33 +03:00
Adam Warner
0970406701 Merge pull request #1415 from pi-hole/revert-1300-XhmikosR-patch-7 
Revert "header: Move license header at the top"
 2020-06-01 18:01:25 +01:00
XhmikosR
e9fc5a20ca Revert "header: Move license header at the top" 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-31 15:56:10 +03:00
XhmikosR
ff16f4889b network.js: minor consistency changes 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-30 18:20:18 +03:00
Adam Warner
105d880473 final null check on stateLoadCallBack (#1411) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-30 17:52:34 +03:00
Adam Warner
3e36980e7c Merge pull request #1408 from pi-hole/js-doc-ready 
Use `$(fn)`
 2020-05-30 15:41:32 +01:00
Adam Warner
bba9f22090 Merge pull request #1407 from pi-hole/js-removeAttr 
gravity.js: replace `removeAttr()` with `prop()`
 2020-05-30 15:38:02 +01:00
Adam Warner
ccbb0d238f Merge pull request #1406 from pi-hole/prop-disabled 
Use `prop()` for the `disabled` attribute.
 2020-05-30 15:37:46 +01:00
Adam Warner
89ce5d139b Merge pull request #1405 from pi-hole/fix-sidebar 
Fix sidebar docs link
 2020-05-30 15:36:18 +01:00
Adam Warner
be54d1563d Merge pull request #1402 from pi-hole/XhmikosR-patch-3 
Move animate.min.css style in the pages that use it
 2020-05-30 15:35:09 +01: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
XhmikosR
d3da7b4339 gravity.js: replace removeAttr() with prop() 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-30 10:23:12 +03:00
XhmikosR
af47854a2d Use prop() for the disabled attribute. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-30 10:22:35 +03:00
XhmikosR
ee40ea3d36 Fix sidebar docs link 
Also work around us using Font Awesome 5.x with AdminLTE 2.x.

We should fix the FA classes later.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-30 10:16:09 +03:00
XhmikosR
4e5cc31134 Move animate.min.css style in the pages that use it 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-30 08:28:45 +03:00
XhmikosR
876e7d8bd9 Use minified daterangepicker builds. 
The official distribution doesn't include minified files, so just minify the files ourselves.

It's in maintenance mode anyway.

Commands for future reference:

* cleancss --compatibility ie9 -O1 specialComments:0 -o daterangepicker.min.css daterangepicker.css
* terser daterangepicker.js --compress typeofs=false --mangle --source-map url=daterangepicker.min.js.map -o daterangepicker.min.js

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-30 08:26:44 +03:00
XhmikosR
6997122519 Update daterangepicker to v3.1.0. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-30 08:26:17 +03:00
Adam Warner
05c11db514 Merge pull request #1403 from pi-hole/eslint-plugin-compat 
Add `eslint-plugin-compat`
 2020-05-29 23:47:45 +01:00
Adam Warner
a284f71bd7 Merge pull request #1389 from pi-hole/js-move 
Move JS files where they are used.
 2020-05-29 23:39:51 +01:00
Adam Warner
7700d9b44a Merge pull request #1387 from pi-hole/new/api_add_sub_get_lists 
(Re-)Add API endpoints for list manipulations
 2020-05-29 23:30:40 +01:00
Adam Warner
dd678da9c6 Merge pull request #1376 from pi-hole:deduplicate-js 
Deduplicate js
 2020-05-29 23:09:59 +01:00
DL6ER
7abeb2b434 Merge pull request #1404 from pi-hole/been-a-while-since-we-touched-this 
remove outdated local help page, link to docs instead
 2020-05-29 23:15:58 +02:00
Adam Warner
0d7040921e Merge pull request #1361 from pi-hole:rm-jquery-ui 
Remove the unused jQuery UI.
 2020-05-29 21:42:16 +01:00
Adam Warner
1390a6dd5a remove outdated local help page, link to docs instead 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-29 21:41:11 +01:00
DL6ER
e213dce308 Merge pull request #1394 from pi-hole/ren-fa-folder 
Remove version number from the Font Awesome folder.
 2020-05-29 22:10:25 +02:00
DL6ER
77532e550a Merge pull request #1388 from pi-hole/no-console 
No console
 2020-05-29 22:09:14 +02:00
XhmikosR
e7eb4bef9d Ignore the EventSource() errors 
We have code checking for the presence of this, so it's OK to ignore these errors.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-29 17:24:28 +03:00
XhmikosR
7caabf7d2a index.js: assorted simplifications 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>

* rename `colors` variable to avoid shadowing and be more clear
* remove function used only once
* simplify a couple of for loops
 2020-05-29 11:11:34 +03:00