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

6689 Commits

Author SHA1 Message Date
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
Andrew Bauer f55c03e9ea Merge pull request #1336 from pliablepixels/1335-api-states-security 
api security enhancements issue #1335
 2016-03-12 09:09:38 -06:00
arjunrc 8a47241e18 address issue #1335 2016-03-12 08:07:25 -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 688dd67697 Merge branch 'add_onvif_deps' into storageareas 2016-03-09 11:18:35 -05:00
Isaac Connor ee0c134a9b need spaces at beginning of lien 2016-03-09 11:18:27 -05:00
Isaac Connor 740dc12f7c remove extra comma 2016-03-09 11:17:50 -05:00
Andrew Bauer 3280aff876 disable save button when nothing slected. fixes #1322 2016-03-09 09:43:44 -06:00
Steve Gilvarry 5f6d47fee8 Merge pull request #1325 from SteveGilvarry/feature-h264-videostorage 
Merge Master to feature-h264-videostorage
 2016-03-09 21:16:13 +11:00
SteveGilvarry 24ebc33ea4 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-03-09 20:54:11 +11:00
Isaac Connor 9647a680f6 Merge branch 'add_onvif_deps' into storageareas 2016-03-08 16:06:30 -05:00
Isaac Connor 094b041c43 There must be spaces before the comma 2016-03-08 16:06:16 -05:00
Isaac Connor f8582ad9b6 add libsys-cpu-perl and libsys-meminfo-perl 2016-03-08 15:56:26 -05:00
Isaac Connor c27387610c add libsys-cpu-perl and libsys-meminfo-perl 2016-03-08 15:56:17 -05:00
Isaac Connor b0835660b1 add libsys-cpu-perl and libsys-meminfo-perl 2016-03-08 15:56:08 -05:00
Isaac Connor 12a277912e add libsys-cpu-perl and libsys-meminfo-perl 2016-03-08 15:56:01 -05:00
Isaac Connor cf1d475dbb add libsys-cpu-perl and libsys-meminfo-perl 2016-03-08 15:55:56 -05:00
Isaac Connor b9996b4fc0 add libsys-cpu-perl and libsys-meminfo-perl 2016-03-08 15:55:37 -05:00
Isaac Connor cfbf2cced1 add libsys-cpu-perl and libsys-meminfo-perl 2016-03-08 15:55:29 -05:00
Isaac Connor 455c268a0c add libsys-cpu-perl and libsys-meminfo-perl 2016-03-08 15:55:11 -05:00
Isaac Connor 172b687ab3 Merge branch 'add_onvif_deps' into storageareas 2016-03-07 22:18:39 -05:00
Isaac Connor 97249110a4 must still support libgnutls28 for raspbian 2016-03-07 22:18:22 -05:00
Isaac Connor 98b3b92bbf Merge branch 'add_onvif_deps' into storageareas 2016-03-07 21:54:25 -05:00
Isaac Connor ef9f218c77 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-03-07 21:52:42 -05:00
Isaac Connor 0e8fc7953d Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-03-07 21:46:10 -05:00