Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-05-01 14:12:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,092 Commits 24 Branches 114 Tags
e045ec3d329d48e42b7d5db3e19ccb090c8d6e21
Commit Graph

89 Commits

Author SHA1 Message Date
Adam Warner
638a7db036 Merge pull request #1603 from thislooksfun/devel 
Fix html escaping showing up in input fields. (#1584)
 2020-11-08 15:40:04 +00:00
Adam Warner
280d31c00f Merge branch 'devel' into fix/group_sel_simple_pages 2020-11-08 13:57:52 +00:00
thislooksfun
8f55dfa03b Fix html escaping showing up in input fields. (#1584) 
Signed-off-by: thislooksfun <thislooksfun@repbot.org>
 2020-10-12 12:26:49 -05:00
DL6ER
1b129bcad0 Merge branch 'release/v5.2' into new/mac_clients 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-07-30 21:56:21 +02:00
XhmikosR
ea1fd6c323 Remove HTML from titles when not needed. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-22 08:53:48 +03:00
Adam Warner
c949516ee1 make use of utils.escapeHtml on the JS side of things, and html_entity_decode/htmlentities in PHP 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-13 18:50:36 +01:00
DL6ER
a901489a96 Merge branch 'devel' into new/mac_clients 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-05 22:24:17 +02: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
f04647fc9e Ignore the remaining console errors for now. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-29 10:42:21 +03: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
DL6ER
eb3c672545 Show explicitly which hostname belongs to which IP address when hovering over the hostnames. Note that the IP addresses and host names were already in the same order, before. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-27 19:59:53 +02:00
DL6ER
7214a0f025 Fix initial visibility of group selector on simplified black- and whitelist pages. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-26 23:18:08 +02:00
DL6ER
b6d1392948 Merge pull request #1351 from pi-hole/redundant-var 
Remove redundant variable
 2020-05-25 20:17:49 +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
XhmikosR
e70e108cce Use .hidden/.show for showing/hiding the reset buttons 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-23 13:04:13 +03:00
XhmikosR
9c5fb734c4 Remove redundant variable. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-23 11:27:59 +03:00
Adam Warner
3957e9eef1 Move some duplicated code to utils.js 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-23 11:04:30 +03:00
XhmikosR
4247c973c9 Rename function. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-23 10:29:50 +03:00
XhmikosR
0fa7de82b0 JS: Enforce camelcase. 
It's a common convention to use camelcase for variable names.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-23 10:29:44 +03:00
XhmikosR
f158e25d2e Remove glyphicons again. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-21 09:55:36 +03:00
DL6ER
eb983dc292 Add support for entering client host names. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-18 14:59:39 +02:00
Adam Warner
7d409ad76c Merge pull request #1269 from pi-hole/fix/client_sorting 
Add proper IP sorting to the groups->client table
 2020-05-17 13:49:56 +01:00
XhmikosR
f2b11caf58 Rename variable to camelcase. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-17 08:53:53 +03:00
DL6ER
389f1d1ecd Fix failed git auto-merge. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-14 20:29:42 +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
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
DL6ER
6b8e12a0d1 Fix autocomplete bug on group pages. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-13 23:54:22 +02:00
DL6ER
68b99658ad Ensure IP addresses w/o MAC addresses are also shown and that already added clients are hidden. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-13 22:59:28 +02:00
DL6ER
bdca8104e5 Add better select menu allowing users to filter inside the dropdown as well as add new entries in place. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-13 21:19:05 +02:00
DL6ER
2f0b8bfdc8 Allow users to specify clients as MAC addresses 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-13 19:20:01 +02: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
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
e02df5467a Fix lint errors. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-11 09:20:32 +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
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
ae13014565 Adapt to the new rules. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-04-10 18:34:47 +00:00
DL6ER
a64810e00e Merge branch 'release/v5.0' into devel 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-08 12:25:18 +02:00
DL6ER
43b45d3da7 Merge pull request #1100 from Ghalid/patch-1 
Disable text correction features, change types to make input fields easier to type in (especially for mobile devices)
 2020-04-07 13:59:44 +02:00
Th3M3
3ea59d5d36 shorter button textes & cleanup 
Signed-off-by: Th3M3 <the_me@outlook.de>
 2020-04-05 20:49:53 +02:00
Th3M3
fd983a2b68 improve multiselect 
Signed-off-by: Th3M3 <the_me@outlook.de>
 2020-04-05 14:56:28 +02:00
DL6ER
6e98c41a4f Merge branch 'release/v5.0' into tweak/wrap_other_tables 2020-03-31 21:11:30 +00:00
DL6ER
ded679a9b7 Add IPv4/IPv6 address validation to clients management page 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-03-14 13:37:33 +00:00
TheME
9fde58d7e0 make id names unique, ...* (#1170) 
* - remove unneeded code
- fix php notice in log if url parameter 'type' is not set

Signed-off-by: Th3M3 the_me@outlook.de
 2020-02-21 12:04:51 -08:00
DL6ER
ea6a6ad2f3 Keep "custom" selection after clicking [Add]. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-21 18:27:39 +01:00
DL6ER
59085c237e Merge branch 'release/v5.0' into new/clients_comment_fields 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-18 16:44:12 +01:00
Adam Warner
211bcc999f Whejn dropdown is shown, move it outside of the datatable container (at the same absolute position) 
When it is closed, put it back where it came from

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-02-16 17:33:52 +00:00
Adam Warner
b5e77648ad drop up instead of down if there are less than 200 px to the bottom of the screen Signed-off-by: Adam Warner <me@adamwarner.co.uk> 2020-02-16 15:59:33 +00:00
DL6ER
a83626e99b Add class "breakall" also to the code fields in the other tables. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-16 16:51:06 +01:00
DL6ER
3c3e22bd98 Add support for client comment and timestamp fields. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-16 15:55:29 +01:00