Commit Graph

2861 Commits

Author SHA1 Message Date
DL6ER 43fa24fbea Glue needs to be the first argument of implode
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-30 22:11:13 +02:00
DL6ER 72abc5dad4 Add button for pihole arpflush on Pi-hole settings page
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-30 22:05:13 +02:00
Mark Drobnak 4ed39ff8d2 Merge pull request #946 from pi-hole/fix/sidebar-toggle-height
Fix the sidebar toggle from overflowing when hovered over
2019-05-26 15:50:07 -04:00
Mcat12 7b796f2ad8 Fix the sidebar toggle from overflowing when hovered over
Thanks to @Th3M3 for finding the issue and solution.

Fixes #945

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-26 12:27:00 -07:00
Mark Drobnak 2e27a29c76 Merge pull request #938 from pi-hole/fix/query_table_aditional_sorting_by_id
Fix sorting of queries with identical timestamps
2019-05-22 15:40:24 -04:00
Dan Schaper a25195636c Merge pull request #939 from pi-hole/release/v4.3
Update Dev with v4.3 fixes
2019-05-21 17:45:25 -07:00
Mark Drobnak 5563dbe5a2 Merge pull request #942 from pi-hole/fix/refresh-icon
Replace fa-refresh with fa-sync
2019-05-19 18:11:55 -04:00
Mcat12 db68782f62 Replace fa-refresh with fa-sync
Font Awesome 5 replaced the refresh icon from 4 with fa-sync:
https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4#name-changes

Fixes #941

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-19 14:16:55 -07:00
Mark Drobnak 166d684d8d Merge pull request #940 from SuperSandro2000/fix-pr-template
Fix pr template
2019-05-18 17:44:54 -04:00
Sandro Jäckel 7c50e0ba8d Update link to git-scm.com, make the checkboxes actual checkboxes
Signed-off-by: Sandro Jäckel <sandro.jaeckel@gmail.com>
2019-05-18 23:43:01 +02:00
Mark Drobnak 4a062c35b9 Merge pull request #933 from pi-hole/new/gravityDB
Store domains in a database
2019-05-12 18:47:18 -04:00
DL6ER 468cd0ccfd Move dataIndex definition into dataSrc function
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-10 22:02:52 +02:00
DL6ER 6d896f9892 Use Array.map() instead of looping over elements and pushing the content to a new array
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-09 20:10:32 +02:00
DL6ER 1d5b212d93 Apply the same changes also for the database query list
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-06 07:44:11 +02:00
DL6ER ce88417d55 Use the render option of the columns definition to specify how and when the date string is shown.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-06 07:41:13 +02:00
DL6ER 7afa31c6d1 Merge branch 'release/v4.3' into fix/query_table_aditional_sorting_by_id 2019-05-05 20:34:27 +02:00
DL6ER c4df1bcced Remove extra ID column, this is intentionally done in a separate commit
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-05 13:51:23 +02:00
DL6ER 0590127865 Ensure correct sorting of queries even if they happened withing the same second. Fixes #934
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-05 13:50:33 +02:00
DL6ER 599f1ced85 Merge branch 'new/gravityDB' of github.com:pi-hole/AdminLTE into new/gravityDB 2019-05-05 13:00:53 +02:00
DL6ER 72c734fbe1 Show added as well as modified dates in the tooltip
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-05 13:00:42 +02:00
DL6ER 39922e64b6 Merge pull request #936 from pi-hole/tweak/networktable
Set "orderable" to false on last column of network table
2019-05-03 07:44:23 +02:00
Adam Warner 0d0d44939d Set "orderable" to false on last column, as sorting does not work here!
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-05-02 21:58:14 +01:00
Mcat12 d0b0eb8822 Fix wording on blocklist text field placeholder and fix empty input tag
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-01 20:53:34 -07:00
DL6ER 1451a3441e Show date of last modification of adlist entries
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-04-29 19:46:15 +02:00
DL6ER 7f9164f2fe Allow adding only one adlist at a time. This greatly reduces the code complexity. Adding multiple entries is still possible as the Save operation is, in general, very fast. Support for multiple lines at a time might be re-added by a follow-up PR
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-04-28 22:00:59 +02:00
DL6ER 66b7e4c83d Add support for date_added and comment fields on adlists subpage
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-04-28 21:47:40 +02:00
DL6ER ced7174c37 Modify adlists subpage of the settings page to sources the lists from the gravity database.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-04-28 20:42:50 +02:00
DL6ER 406a946b24 Add new file scripts/pi-hole/php/database.php
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-04-26 18:32:33 +02:00
DL6ER 8b0ee8f4fa Reduce code duplication
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-04-26 18:29:05 +02:00
DL6ER cedc59ba78 Show date added
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-04-25 16:06:24 +02:00
DL6ER d8613aa53b Show comments when available
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-04-25 15:48:26 +02:00
DL6ER 506644b671 Rewrite web interface to allow interaction with database-based lists
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-04-25 15:02:39 +02:00
Dan Schaper 10263591dc Merge pull request #931 from pi-hole/fix/ip-validator
Remove jQuery inputmask
2019-04-22 13:36:33 -07:00
DL6ER 4923a7576c Remove another mentioning of data-mask
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-04-12 16:01:35 +02:00
DL6ER 67f3c706a7 Readd lost "be"
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-04-10 17:19:16 +02:00
DL6ER a00e887930 Remove jQuery inputmask
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-04-10 17:12:35 +02:00
DL6ER 70c4bf4265 Merge pull request #921 from pi-hole/fix/list-security
Fix security issue when using list functionality via api.php
2019-03-03 08:45:02 +01:00
Mcat12 24a22bcb55 Fix security issue when using list functionality via api.php
Remote code execution could have been triggered by activating some list
functionality (add and remove) via api.php.

Thanks to Kacper Szurek for finding this bug.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-03-02 13:51:29 -08:00
Mark Drobnak 16d06d6948 Merge pull request #918 from pi-hole/new/fine_grained_externally_blocked_status
Long-term queries: Request all externally blocked variants when the checkbox is enabled
2019-02-22 21:53:24 -05:00
DL6ER e0947d69ab Long-term queries: Request all externally blocked variants when the checkbox is enabled
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-22 21:26:36 +01:00
Mark Drobnak e4d80b5e24 Merge pull request #909 from pi-hole/new/fine_grained_externally_blocked_status
Implement finer grained external blocking displaying
2019-02-17 14:14:49 -05:00
Mark Drobnak fa8a85d41d Merge pull request #915 from pi-hole/tweak/index.js
Remove dead code from scripts/pi-hole/js/index.js
2019-02-17 13:07:09 -05:00
DL6ER f728fd980d DNSSEC UNKNOWN is not an error, it is also shown for queries that are imported from the database
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-17 18:40:57 +01:00
DL6ER 635bdfb717 Undo removal of slice operations
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-17 11:52:14 +01:00
DL6ER e433e90308 Remove dead code from scripts/pi-hole/js/index.js
Removed:
- updateForwardedOverTime();
- updateQueryTypesOverTime();
- slicing on overTime data

Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-11 00:52:24 +01:00
Mark Drobnak 83cf702a60 Merge pull request #913 from emelendez89/devel
Fixed typo, added the word 'be'
2019-02-08 00:11:13 -05:00
Eugenio Marcelo Melendez 73e30e2e1c Fixed typo, added the word 'be'
Signed-off-by: Eugenio Marcelo Melendez <eugenio.mg@gmail.com>
2019-02-07 23:05:31 -06:00
DL6ER 8796583818 Implement finer grained external blocking displaying
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-04 17:45:30 +01:00
Mcat12 2ba8787261 Merge branch 'release/v4.2' into devel
# Conflicts:
#	scripts/pi-hole/js/db_graph.js
2019-02-03 11:24:19 -08:00
Adam Warner f2b2aa42c0 Merge pull request #899 from pi-hole/fix/long-term-stats-datetime
Fill long-term data daterange field with initialization value
2019-02-02 14:43:54 +00:00