Commit Graph

1340 Commits

Author SHA1 Message Date
DL6ER bb2c2e2244 Moved more private files out of the root directory 2016-12-20 12:52:19 +01:00
Mcat12 30d70baf5e Fix php links in js files
Also removed help.js because it's no longer used
2016-12-19 19:59:08 -05:00
Mcat12 d1da1de597 Move PHP scripts to scripts folder 2016-12-19 19:44:51 -05:00
Promofaux 6a13796d99 Organise folder structure a bit better... Seperates vendor packages from self-written scripts. 2016-12-19 18:30:16 +00:00
Adam Warner b8bd57731a Merge pull request #263 from pi-hole/fixqueryoptions
Fix Query Log "None" option
2016-12-19 09:52:11 +00:00
DL6ER da12f6f16d Change the "none" to "nothing" 2016-12-19 10:44:04 +01:00
DL6ER d86122ee83 Merge pull request #262 from pi-hole/showPermittedshowBlocked
nothing to see here...
2016-12-19 10:24:23 +01:00
Promofaux 70a8eee23a nothing to see here... 2016-12-19 09:19:16 +00:00
Mcat12 b4b06ab81e Merge pull request #260 from pi-hole/noDNSprefetching
No DNS prefetching
2016-12-18 17:29:29 -05:00
Adam Warner ac2a04227f Merge pull request #261 from pi-hole/helptypo
Fix typo and arrangement on Help page
2016-12-18 22:21:20 +00:00
DL6ER 1dea042f4b Fix typo and arrangement on Help page 2016-12-18 23:04:42 +01:00
Adam Warner 0772b24757 Merge pull request #230 from pi-hole/loginpage
Add custom login page
2016-12-18 19:02:58 +00:00
DL6ER 7784341c29 Update header.php 2016-12-17 20:18:11 +01:00
DL6ER 4dc937bd54 Disable DNS prefetching 2016-12-17 17:39:42 +01:00
DL6ER 9a902c0e4e Merge pull request #259 from pi-hole/hostnamecors
Add hostname to allowed domains
2016-12-17 11:21:22 +01:00
DL6ER f96ce2c99f Show the extra long version string if not on master only on devices classified as "large" 2016-12-16 23:43:01 +01:00
DL6ER bb512b2042 Another idea 2016-12-16 23:28:58 +01:00
DL6ER 822c8cf1c8 Fix the footer 2016-12-16 22:58:28 +01:00
DL6ER 1068ed82b1 Add hostname to allowed domains 2016-12-16 21:36:26 +01:00
DL6ER 1044879218 Merge branch 'devel' into loginpage 2016-12-16 18:11:10 +01:00
Adam Warner ee41a78bdd More codacy fixes (#256)
* single quotes to double

* Avoid variables with short names like $a. Configured minimum length is 3.

* list_type > listType https://www.codacy.com/app/Pi-hole/AdminLTE/file/4753758893/issues/source?bid=3919163&fileBranchId=3919163#l30

* define `refresh` before it is used

* single to double quotes

* EsLint expects `{}` after `if`

* singlequotes to doublequotes

* https://www.codacy.com/app/Pi-hole/AdminLTE/file/4753758894/issues/source?bid=3919163&fileBranchId=3919163#l49

* Copy filterArray Function from api.php

* missed a single-quote

* single>double

* `===`, `==`

* single to double

* Usages come AFTER declarations

* missing semi

* function delcaration order change

* more codacy complaints
2016-12-16 13:52:51 +00:00
DL6ER ff5fbfa4bd Merge pull request #257 from pi-hole/freememory
Improved memory usage determination
2016-12-16 14:41:40 +01:00
DL6ER cd1c57a8f9 Improved memory usage determination 2016-12-16 12:19:16 +01:00
DL6ER 766f733592 Minor tweaks 2016-12-15 23:18:48 +01:00
DL6ER 4b035c0247 Merge branch 'loginpage' of https://github.com/pi-hole/AdminLTE into loginpage 2016-12-15 23:16:03 +01:00
DL6ER 79a648dd87 Removed dark logo 2016-12-15 23:15:53 +01:00
Promofaux 21fec8c657 brightlybrightly 2016-12-15 22:14:56 +00:00
Adam Warner c8d977af03 Merge pull request #255 from pi-hole/loginPageTweaks
played about with the layout. Looks nicer on fullscreen, boxed-layout…
2016-12-15 21:50:57 +00:00
Promofaux 437ab6afb4 be a bit more intelligent about logo size 2016-12-15 21:00:26 +00:00
Promofaux 5c447582f5 increase logo size 2016-12-15 20:48:23 +00:00
Promofaux 52f448cad1 played about with the layout. Looks nicer on fullscreen, boxed-layout, and mobile (in my opinion) 2016-12-15 20:43:06 +00:00
Adam Warner e03fe39d85 Merge pull request #250 from pi-hole/fixfooter
Fix footer on medium size screens
2016-12-15 19:47:57 +00:00
Adam Warner f2d58c6f05 Merge pull request #251 from pi-hole/settingstweak
Hide size of log if logging is disabled
2016-12-15 19:47:11 +00:00
DL6ER a8a04d8631 Merge pull request #254 from pi-hole/fixerrorsuccessvars
Move variables out of if clause
2016-12-15 20:45:54 +01:00
DL6ER dbba1059bb Move variables out of if clause 2016-12-15 20:42:31 +01:00
Mcat12 61a609f08d Merge pull request #221 from unseen1980/patch-1
Some small changes in updateSummaryData
2016-12-15 14:12:36 -05:00
DL6ER 994660b6c8 Hide size of log if logging is disabled 2016-12-15 15:30:18 +01:00
DL6ER 8d4ffe8391 Break into two lines if long version string is there 2016-12-15 13:25:21 +01:00
DL6ER a23a4464b2 Fix footer on medium size screens 2016-12-15 13:18:40 +01:00
DL6ER 69839aa51c Merge pull request #249 from pi-hole/codacyDevel
redundant double negation
2016-12-15 12:37:05 +01:00
Adam Warner 5337469922 redundant double negation 2016-12-15 11:34:02 +00:00
DL6ER 9a5125f3ca Merge pull request #248 from pi-hole/fixCodacyIssuesInDevel
define functions before calling document.ready
2016-12-15 12:21:32 +01:00
DL6ER a8cfb091df $(document).ready(function() { ... }); was included in in function updateTopLists(){ ... } 2016-12-15 12:19:58 +01:00
Adam Warner 30ae5ea6b6 define functions before calling document.ready 2016-12-15 11:15:02 +00:00
DL6ER a2932c2fd8 Merge pull request #247 from pi-hole/fixCodacyIssuesInDevel
Fix codacy issues in devel
2016-12-15 12:07:23 +01:00
Adam Warner 83f17c180e Dear Adam, When you refactor part of a function out to another function.. remember to call it from the original function. It will not work if you do not. Kind Regards, Adam. 2016-12-15 11:01:20 +00:00
Adam Warner ff9741b4aa Restore updateSummaryData to match devel 2016-12-15 10:55:01 +00:00
Adam Warner b036b75d29 reduce complexity of getAllQueries 2016-12-15 10:45:15 +00:00
Adam Warner 8144ae01fe Codacy complaints index.js 2016-12-15 10:16:25 +00:00
Adam Warner aec468d000 Codacy complaints footer.js 2016-12-15 09:33:43 +00:00