Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-23 20:28:28 +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
XhmikosR
d062cb0423 header: fix aria-expanded for user-menu dropdown 
It's not expanded by default, so it needs `aria-expanded="false"`

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-16 19:53:44 +03:00
XhmikosR
f6bd1a28a2 Use fa-angle-left to see if sidebar transition works 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-16 19:44:55 +03:00
XhmikosR
8283f63c41 Simplify sidebar markup per the latest AdminLTE 2.x demo 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-16 19:44:05 +03:00
XhmikosR
db878379ea Update Font Awesome to v5.13.0 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-16 19:23:34 +03:00
XhmikosR
b416075cdc header: Move license header at the top 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-16 19:16:44 +03:00
Adam Warner
b351f45cb2 Change the names of the info elements without changing the property names of the API 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-15 09:25:01 +01:00
DL6ER
6634fb6856 Merge pull request #1288 from pi-hole/tweak/add_domain_behaviour1 
Also do this from the query log page
 2020-05-15 01:18:33 +02:00
DL6ER
a3df25c845 Merge pull request #1293 from jacklul/patch-2 
Trim user input where applicable
 2020-05-14 18:22:18 +02:00
DL6ER
402e56e054 Allow adding groups with spaces in them when wrapping groups names in quotation marks. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-14 18:04:31 +02:00
Jack'lul
e12ebcbd08 Trim user input where applicable 
Signed-off-by: Jack'lul <jacklulcat@gmail.com>
 2020-05-14 18:01:36 +02:00
Jack'lul
9b92548ae1 Make sure ip-custom field is editable when no suggestions are available 
Signed-off-by: Jack'lul <jacklulcat@gmail.com>
 2020-05-14 17:38:49 +02:00
Adam Warner
c53436ab3f Also do this from the query log page 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-13 23:38:43 +01:00
DL6ER
56990c5c34 Merge pull request #1287 from pi-hole/fix/autocomplete_bug 
Fix autocomplete bug on group pages
 2020-05-13 23:59:59 +02:00
DL6ER
6b8e12a0d1 Fix autocomplete bug on group pages. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-13 23:54:22 +02:00
Adam Warner
ef13e69125 Use REPLACE into instead of INSERT into. This allows for a domain's white/blacklist status to be toggled 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-13 22:01:58 +01:00
XhmikosR
76d50c1897 Use the minified animate.css file. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-13 07:34:16 +03:00
DL6ER
b7d74ff772 Reinstall loading overlay on long-term graphs page (shown only if data has been requested). 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 22:50:29 +02:00
DL6ER
eefbef678c Suppress white 'flashing' on page reloading in dark mode. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 22:50:29 +02:00
DL6ER
b5e64653db Update network colors 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 22:50:29 +02:00
DL6ER
ec53843379 Restore coloring of the entire rows in the Query Log 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 22:50:29 +02:00
DL6ER
05d5f02a36 Add theme chooser to Setting -> Web interface. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 22:50:29 +02:00
DL6ER
064a0aae9c Use the iCheck library for input box styling. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 22:50:29 +02:00
DL6ER
6b47a937fb Add network table theming. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 22:44:55 +02:00
DL6ER
b23afb4516 Dark mode for Long-term Query Log and Lists 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 22:44:55 +02:00
DL6ER
8468f129eb Dark mode optimizations for Query Log and Long-term graphics 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 22:44:55 +02:00
DL6ER
a08a85994e Initial (incomplete) support for themes. Currently, the default is the new Pi-hole dark theme. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 22:44:52 +02:00
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
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
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