ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,622 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

5622 Commits

Author SHA1 Message Date
Kyle Johnson f59ed9cf0d clean up options a bit more 2016-04-01 14:39:15 -04:00
Kyle Johnson 92e0552f8e Add side tab list to options page, and style it. 2016-04-01 14:02:19 -04:00
Kyle Johnson 8c5d309feb Add header to log view 2016-04-01 13:44:37 -04:00
Kyle Johnson fa3425f2b0 Merge branch 'updated-console' of github.com:ZoneMinder/ZoneMinder into updated-console 2016-04-01 13:43:26 -04:00
Isaac Connor 757740ede5 Move skin and css changing up above the include of header.php so that the set cookie call will work 2016-03-23 16:12:51 -04:00
Isaac Connor dd06db0bf0 remove duplication 2016-03-23 15:54:20 -04:00
Kyle Johnson dd937f7732 Restyle the header. Full width, dark background, collapseable. 2016-03-16 00:51:13 -04:00
Kyle Johnson 8fdf3291b4 Load jquery and bootstrap js in classic skin 2016-03-16 00:49:51 -04:00
Kyle Johnson 53d0e1c8df Add local copy of bootstrap.js 3.3.6 2016-03-16 00:45:34 -04:00
Kyle Johnson d01ef25f82 Update doctype to html5, and add additional meta tags 2016-03-16 00:17:05 -04:00
Kyle Johnson 6f409f0bf4 Make the ZM logo in header stand out 2016-03-15 23:53:29 -04:00
Kyle Johnson 897a0a995c Convert options layout to side-tabs, and improve readability 2016-03-15 15:21:28 -04:00
Kyle Johnson 87932002cf Push the options page down a bit to make tab look better 2016-03-15 14:45:40 -04:00
Kyle Johnson 183f58ad17 Restyle options view with horizontal form layout 2016-03-15 14:43:22 -04:00
Kyle Johnson 694ad0b539 Add styling to delete / save / add buttons in options.php 2016-03-15 14:08:01 -04:00
Kyle Johnson bd30d40522 Remove cancel button from options as it no longer makes sense. 2016-03-15 14:03:17 -04:00
Kyle Johnson 0004a1180e Update options.php to use bootstrap container 2016-03-15 13:56:54 -04:00
Kyle Johnson 26748c2de5 Oops. Move Console view outside of canView(system) restriction 2016-03-15 13:52:36 -04:00
Kyle Johnson f05c1548ce Add a link back to console in header 2016-03-15 13:49:14 -04:00
Kyle Johnson 299c61c1ec Make the Options link a standard href (not a popup). 2016-03-15 13:47:31 -04:00
Kyle Johnson 8070bf8700 Move console php code to header as that code is now needed in additional views. 2016-03-15 13:46:03 -04:00
Kyle Johnson 49f46ac927 Move the header into its own file, and include it in options view. 2016-03-15 13:43:49 -04:00
Kyle Johnson 8acfe1b0d8 Update options styling 2016-03-12 22:44:11 -05:00
Kyle Johnson 2378c9a359 Fix state link to do popup like before 2016-03-12 20:44:42 -05:00
Kyle Johnson d202760d82 Additional footer padding 2016-03-12 20:37:07 -05:00
Kyle Johnson f5ba52824a Add styles to additional console buttons 2016-03-12 20:36:39 -05:00
Kyle Johnson a2c2101c48 Remove extra #footer styling 2016-03-12 20:28:16 -05:00
Kyle Johnson f80cbf52df Bump up the default font size 2016-03-12 20:27:51 -05:00
Kyle Johnson bebb1017fd Wrap footer in container-fluid 2016-03-12 20:27:22 -05:00
Kyle Johnson 5e2d4bc325 Restyle of Login page. 2016-03-12 20:11:32 -05:00
Kyle Johnson a403c1db8c Move recaptcha javascript to actual <head> tag 
The way it was handled previously resulted in invalid html, with an
extra <head> tag being inserteed inside the <body>.
 2016-03-12 19:14:07 -05:00
Kyle Johnson 71c35e712b Initial major restyle of classic skin. 2016-03-12 03:28:02 -05:00
Kyle Johnson c9441ec8c0 Local copy of bootstrap 3.3.6, included in classic skin. 2016-03-12 01:16:19 -05:00
Kyle Johnson 5b2d194af2 Merge pull request #1330 from knnniggett/freebsd 
add freeBSD cmake target distro
 2016-03-11 14:58:43 -07:00
Andrew Bauer 16992a44cb add ZM_PERL_MM_PARMS 2016-03-11 15:56:29 -06:00
Andrew Bauer 2cae5d6e7f Merge pull request #1333 from ZoneMinder/quick-fix-perl-path 
Quick fix perl path
 2016-03-11 15:43:48 -06:00
Kyle Johnson 4e1af516d7 Don't output sudo test cmd to /dev/null. Other tests aren't, and info us useful. 2016-03-11 14:29:48 -07:00
Kyle Johnson b9085cea64 Fix issue where programs are installed in unexpected paths. 
For example, on freebsd, sudo is in /usr/local/bin, and as things
were pre-this commit, sudo wasn't being found.
 2016-03-11 14:28:16 -07:00
Andrew Bauer b1d3be2cfc add freeBSD cmake target distro 2016-03-11 07:38:29 -06:00
Kyle Johnson 8cd7731c4a Merge pull request #1329 from knnniggett/execinfo 
change linker flag to "-lexecinfo"
 2016-03-10 14:16:25 -07:00
Andrew Bauer 1d478a3b1c change linker flag to "-lexecinfo" 2016-03-10 15:00:21 -06:00
Kyle Johnson 46b40458eb Merge pull request #1328 from knnniggett/pure_install 
use make "-f" parameter instead of "--makefile"
 2016-03-10 13:21:24 -07:00
Andrew Bauer facae6cb0d use make "-f" parameter instead of "--makefile" 2016-03-10 13:58:41 -06:00
Andrew Bauer 4606d2fbca Update zmtrigger.pl.in 
mention the %Q placholder when using showtext
 2016-03-10 10:13:38 -06:00
Andrew Bauer a0f81b2315 Merge pull request #1327 from ZoneMinder/add_onvif_deps 
Add onvif deps
 2016-03-09 12:04:22 -06:00
Isaac Connor d51d95ce1e Merge pull request #1326 from knnniggett/fixGroupSaveBtn 
disable save button when nothing slected. fixes #1322
 2016-03-09 11:43:13 -05:00
Andrew Bauer 77f7a3642c remove check for "selected" property 2016-03-09 10:34:06 -06:00
Isaac Connor 313f46dceb add zmtelemetry.pl to autotools build 2016-03-09 11:26:10 -05:00
Isaac Connor 1c481a3dbf add zmtelemetry.pl to autotools build 2016-03-09 11:25:16 -05:00
Isaac Connor ee0c134a9b need spaces at beginning of lien 2016-03-09 11:18:27 -05:00