Commit Graph

26 Commits

Author SHA1 Message Date
DL6ER e188cb6fbc Revert "Merge pull request #267 from pi-hole/folderStructure"
This reverts commit fba3d10fa4, reversing
changes made to 4ee75f4167.
2016-12-21 17:16:52 +01:00
DL6ER bb2c2e2244 Moved more private files out of the root directory 2016-12-20 12:52:19 +01: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
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 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 8bfab70e62 Use 7 instead of 10 digits hash for the sake of convenience 2016-12-09 23:41:17 +01:00
DL6ER e93f33bcf0 Show more detailed output if not on master 2016-12-09 23:18:47 +01:00
Mcat12 002040452b Codacy fixes 2016-12-08 17:33:21 -05:00
Mcat12 e9a7c2f5f7 Assume version is vDev if not on master branch
This removes the need for a vDev tag, which was less reliable
because it needed to be the most recent tag in the dev branch and
was really just an sign that the repo was on a branch besides
master.
2016-12-08 17:20:39 -05:00
DL6ER b644c4f678 Use Chart.js (bundle) so we can have timelines in the future 2016-11-06 23:00:28 +01:00
Lewis Cowles 771741f2dd updated closing tags DOH... 2016-06-19 00:44:03 +01:00
Lewis Cowles 2b2d35e040 updated version output
* removed cd from `AdminLTE` as footer.php lives in same folder and causes inconsistent behaviour if web-root changed
* changed `div style="display: inline-block"` to `span` (virtually same thing)
2016-06-19 00:07:50 +01:00
Mcat12 c537327fbc Pass version info from php to js
Since PHP doesn't run in the sourced js files, it needs
to send the version numbers a different way.
2016-05-26 17:21:39 -04:00
Mcat12 541afbb8c9 Adjust to CSP 2016-05-21 11:25:19 -04:00
Mcat12 501d467517 Merge branch 'devel' into update-notification 2016-05-21 11:18:10 -04:00
Mcat12 c050b8151a Add update notifications
Using the Github API, it checks the latest release against
the current version. If it needs updating, it shows an
update alert in the top right dropdown-menu and opens it
automatically. Also this commit stops the dropdown-menu
from closing if you click inside of it. It will only close
if you click the toggle button or outside of it.
2016-05-21 10:58:06 -04:00
Mcat12 d7391dc860 Move main JS into separate files 2016-05-08 13:44:18 -04:00
Mcat12 7d2904311b Add CSP and sort JS files 2016-05-08 13:32:48 -04:00
Mcat12 76207075f2 Fixed images in Query Log
Also moved bootstrap to its own folder (it perfers it that way)
2016-02-21 16:44:09 -05:00
Mcat12 82e7108afe Loads from local files 2016-02-20 18:13:21 -05:00
Brice Johnson 43be39ffd5 Merge branch 'devel' of https://github.com/pi-hole/AdminLTE into advancedstats
Conflicts:
	footer.php
2016-02-13 12:17:45 -06:00
Mcat12 e19b584e29 Dynamic versions in footer
- Shows Pi-hole and Web Interface versions
2016-01-30 11:26:18 -05:00