pi-hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2024-12-06 19:36:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,377 Commits 16 Branches 105 Tags
5e257574157afb4885fd96f12ccd3dea1befe8ca
Commit Graph

2377 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Drobnak 5e25757415 Merge pull request #662 from pi-hole/tweak/database-timeout-warning 
Add timeout warning to database pages
 2018-01-07 14:35:26 -05:00
DL6ER 3506101ff5 Merge pull request #663 from pi-hole/fix/db_executiontime 
Set maximum execution time to 10 minutes in api_db.php
 2018-01-07 20:29:13 +01:00
DL6ER 0fdebd070c Set maximum execution time to 10 minutes in api_db.php 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-07 20:22:38 +01:00
Mcat12 afe2f73bef Use triple equals in the other places too 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-07 14:20:41 -05:00
Mcat12 322f73fcac Use triple equals 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-07 14:13:57 -05:00
Mcat12 081f0bb98c Add timeout warning to database pages 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-07 14:04:38 -05:00
DL6ER 7d491841b8 Merge pull request #661 from pi-hole/fix/long-term-lowercase 
Convert host names and domains to lower case in DB replies
 2018-01-07 19:31:39 +01:00
DL6ER 0fbd860827 Process all returned data before sorting and slicing the data 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-07 19:13:58 +01:00
DL6ER 84012074de Add the same logic for topDomains 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-07 18:15:08 +01:00
DL6ER 9cc8062c88 Fetch up to 20 clients and limit the list to 10 results in PHP 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-07 18:07:39 +01:00
DL6ER 047329a4ae Reset the SQL syntax - directly doing it in PHP is obviously much faster! 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-07 18:02:13 +01:00
DL6ER f0f32e82a5 Convert all client host names to lower case when requesting api_db.php?topClients 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-07 17:49:55 +01:00
Mark Drobnak 1a7e10cfdf Merge pull request #660 from pi-hole/tweak/blocking-lists-warning 
Add Warning to Settings Page: Block Lists
 2018-01-05 18:28:37 -05:00
Mcat12 b0a56e9017 Add warning to block lists tab of settings page 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-01-05 18:15:02 -05:00
DL6ER 80176d6167 Merge pull request #659 from pi-hole/fix/TravisVersioning 
FTL version display
 2018-01-06 00:12:17 +01:00
DL6ER 746df3b63f Decide whether FTL is on any custom branch by looking for "vDev" in the beginning of the version string 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-05 23:19:02 +01:00
Mark Drobnak 9319a5234c Merge pull request #657 from pi-hole/fix/preg_split 
Fix preg_split warning
 2018-01-02 12:13:16 -05:00
Mark Drobnak f2a0b622f1 Fix preg_split warning 
Warning was:
`preg_split(): Delimiter must not be alphanumeric or backslash`

Signed-off-by: Mark Drobnak <newtoncat12@yahoo.com>
 2018-01-02 12:11:22 -05:00
Mark Drobnak 9d37821081 Merge pull request #656 from pi-hole/new/DNSSEC_support 
Show DNSSEC result in Query Log (if available)
 2017-12-31 11:50:05 -05:00
DL6ER 6500d46289 Unspecified is no error, so make it black 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-31 17:20:41 +01:00
DL6ER f5930e134c Add ABANDONED result 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-31 17:19:21 +01:00
DL6ER d9d477f7fb Add "BOGUS" and unknown ("?") 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-31 16:50:31 +01:00
DL6ER b5adf6d28a Show DNSSEC result in Query Log (if available) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-31 16:41:27 +01:00
DL6ER e19a5928a8 Merge pull request #655 from pi-hole/fix/db_fail_gracefully 
Fail gracefully on database problems
 2017-12-31 10:29:39 +01:00
DL6ER 78a8aa8b31 Check if $results is boolean and use fetchArray() only if it isn't 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-30 23:44:01 +01:00
Mark Drobnak 3d6ed38886 Merge pull request #654 from pi-hole/new/add_second_quad9 
Add quad9 secondary IPv4 server
 2017-12-30 13:01:43 -05:00
DL6ER bc1f6f9be6 Add quad9 secondary IPv4 server 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-30 18:26:49 +01:00
DL6ER 9f16324cd0 Merge pull request #651 from pi-hole/master 
Sync with development branch
 2017-12-22 21:59:14 +01:00
Jacob Salmela 31dddd8a06 Merge pull request #645 from pi-hole/release/v3.2.1 
Pi-hole web v3.2.1
v3.2.1 		2017-12-22 14:48:16 -06:00
DL6ER 556da99dbf Merge pull request #644 from pi-hole/tweak/DB_location 
Use non-standard location of FTL's database
 2017-12-19 19:26:34 +01:00
DL6ER 7847c64a53 Merge pull request #649 from pi-hole/fix/codacy-v3.2.1 
Codacy issues on release/v3.2.1
 2017-12-18 17:40:39 +01:00
DL6ER cfa9bfbbd2 :codacy: 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-17 21:08:58 +01:00
DL6ER c37a9bca09 Merge pull request #648 from pi-hole/devel 
Merge Devel into Relase/3.2.1
 2017-12-17 20:59:20 +01:00
Mark Drobnak 560709a5a3 Merge pull request #646 from pi-hole/release/3.2 
Merge Release/3.2 to Devel branch
 2017-12-17 14:41:16 -05:00
DL6ER ff66f4af97 Merge branch 'devel' into release/3.2 2017-12-16 20:50:20 +01:00
DL6ER ed398fa56f Use possible non-standard location of FTL's database 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-16 11:10:10 +01:00
Mark Drobnak 5ef3a885d0 Merge pull request #641 from pi-hole/fix/settings-undefined-index 
Check if the GET param 'tab' is set before use
 2017-12-15 11:47:26 -05:00
Mcat12 6689a83874 Check if the GET param 'tab' is set before use 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2017-12-13 18:03:37 -05:00
Mark Drobnak d298f3f4ec Merge pull request #637 from pi-hole/fix/license-header 
Finish fixing whitespace caused by license headers
 2017-12-10 15:15:09 -05:00
Mark Drobnak 3b5cac13de Finish fixing whitespace caused by license headers 
Addresses https://github.com/pi-hole/AdminLTE/pull/409#issuecomment-350504602

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2017-12-10 14:18:35 -05:00
DL6ER fc2aa3064a Merge pull request #633 from pi-hole/tweak/querylog_disable_autofilter 
Add checkbox on Query Log to be able to disable filtering on click
 2017-12-10 13:40:33 +01:00
DL6ER 7a93fa6470 :codacy: says: "Strings must use doublequote" 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-10 12:43:59 +01:00
DL6ER 848f59787a Add checkbox on Query Log to be able to disable filtering on click 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-10 12:31:54 +01:00
DL6ER 36eaa6b45d Merge pull request #624 from pi-hole/tweak/updatecheckerFTL 
Adding branch/version display for FTL
 2017-12-10 11:27:08 +01:00
DL6ER 0025f56c1f Merge pull request #631 from pi-hole/fix/flush_button 
Re-add missing background form. Fixes #1823
 2017-12-10 11:24:48 +01:00
DL6ER d025c3c94d Re-add missing background form. Fixes #1823 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-09 21:09:59 +01:00
Mark Drobnak 81d6e3d13e Merge pull request #630 from bvtsang/monthoffbyone 
Fix off-by-one display of month
 2017-12-09 14:05:41 -05:00
DL6ER c9371568a7 Merge pull request #629 from pi-hole/fix/settingpage 
remove problematic function that caused the settings page to crash on some systems
 2017-12-09 18:33:21 +01:00
Bryan Tsang 4530e5d89d Fix off-by-one display of month 
Signed-off-by: Bryan Tsang <bvtsang@gmail.com>
 2017-12-09 01:01:44 -08:00
Jacob Salmela d3eae78e62 remove problematic function 
Signed-off-by: Jacob Salmela <github@decoy.email>
 2017-12-08 19:48:38 -06:00