Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-23 10:19:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,700 Commits 23 Branches 114 Tags
02a4e83d8766146e78747de759134370dc5997ec
Commit Graph

1374 Commits

Author SHA1 Message Date
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
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
XhmikosR
61c29cafc4 Move padNumber() to utils. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-29 11:11:34 +03:00
XhmikosR
7f71f1d5fe Move objectToArray() to utils. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-29 11:11:32 +03:00
XhmikosR
f04647fc9e Ignore the remaining console errors for now. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-29 10:42:21 +03:00
XhmikosR
7e2b48adcc Remove unneeded console.log 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-29 10:39:13 +03:00
XhmikosR
2b93d569dd Move the gethostname() call to a variable. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-29 09:49:51 +03:00
XhmikosR
f1eb744ff5 Guard gethostname() calls 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-29 09:24:07 +03:00
XhmikosR
95219703a1 Remove the unused jQuery UI. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-29 08:31:06 +03:00
XhmikosR
469d491260 Move JS files where they are used. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-29 07:43:13 +03:00
XhmikosR
eab6485edb Move escapeHtml to utils. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-29 07:41:05 +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
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
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
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
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
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
9b3d8b81e7 Replace $.each with native methods. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-26 06:34:27 +03:00