Commit Graph

9285 Commits

Author SHA1 Message Date
Isaac Connor 874dc79948 tell eventdetail popup to close on save 2017-07-06 10:48:33 -04:00
Isaac Connor 3233105d2c implement a way to tell a popup to close 2017-07-06 10:48:06 -04:00
Isaac Connor 9b4fb05d5b Fix parseFilter because terms is now under Query 2017-07-06 10:47:47 -04:00
Isaac Connor d892b94819 spacing 2017-07-06 09:38:30 -04:00
Isaac Connor 6d0dad38e0 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-07-05 15:34:35 -04:00
Isaac Connor c3c6459052 Merge branch 'montagereview_rework' into storageareas 2017-07-05 15:34:02 -04:00
Isaac Connor 771d385257 Merge branch 'logger_fix' into storageareas 2017-07-05 15:28:44 -04:00
Isaac Connor 2cab6baf2c add some comments and one change that may fix effectiveLevel use 2017-07-05 15:25:01 -04:00
Isaac Connor 6b2e23e1a5 Merge branch 'montagereview_rework' of ../ZoneMinder.master into montagereview_rework 2017-07-05 14:27:46 -04:00
Isaac Connor 1e21beb1cd use instead of document.getElementById 2017-07-05 14:25:44 -04:00
Isaac Connor 95ba837bda fix braces 2017-07-05 14:25:23 -04:00
Isaac Connor 0e40897e02 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-07-05 14:24:09 -04:00
Isaac Connor d61dfcd410 scale in montagereview is 1 based instead of 100, so multiply by 100 when asking for the streamSrc. 2017-07-05 14:23:01 -04:00
Isaac Connor 720748a731 code cleanup mostly. scale in montagereview is 1 based instead of 100, so multiply by 100 when asking for the streamSrc. 2017-07-05 14:22:44 -04:00
Isaac Connor 0b4a2b41cc fix scale on initial montage load. Replace calls to functions.php/getStreamSrc with object based call 2017-07-05 14:20:50 -04:00
Isaac Connor 8569c7523a fix braces 2017-07-05 14:11:58 -04:00
Isaac Connor 2bc679e65e if a 0 scale is given, default to 100% 2017-07-05 14:11:17 -04:00
Isaac Connor 834d1dddfa fix braces 2017-07-05 14:10:09 -04:00
Isaac Connor 3068987308 Merge branch 'master' into montagereview_rework 2017-07-05 13:53:00 -04:00
Isaac Connor 1849b1e69b fix code spacing, add codecpar dumping when failed to write frame 2017-07-05 13:09:00 -04:00
Isaac Connor fdd0e8dc1b fix spacing 2017-07-05 13:08:31 -04:00
Isaac Connor efba7be9c7 switch back to int i... google style guide says to use signed counters in for loops. Ok. Get's rid of compiler warning because i_nales is signed. 2017-07-05 13:08:16 -04:00
Isaac Connor 8c19b129d7 more wip 2017-07-04 12:33:01 -04:00
Isaac Connor f87a89a5ce more fixes 2017-07-04 11:51:23 -04:00
Isaac Connor f183a74b0a increase the wait time for waiting for zmdc to startup 2017-07-04 10:11:57 -04:00
Isaac Connor d7950bd732 Merge branch 'master' into knnniggett-configfiles 2017-07-03 21:53:47 -04:00
Andrew Bauer 9be0e43618 Update README.Redhat7 2017-06-30 07:36:22 -05:00
Isaac Connor 121aba0308 add parenthesis around truth value to quieten compiler 2017-06-29 15:41:21 -04:00
Isaac Connor decb83eb46 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-06-29 15:39:20 -04:00
Isaac Connor 76cb2f83e1 Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas 2017-06-29 15:37:18 -04:00
Isaac Connor 562519fdad Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-06-29 15:23:59 -04:00
Isaac Connor a886d30aa7 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-06-29 15:08:06 -04:00
Isaac Connor a263de144b fixup defaults for Filter 2017-06-29 15:00:17 -04:00
Isaac Connor 69509689e0 debian stretch prefers libmariadbclient-dev and libgcrypt11-dev 2017-06-29 08:41:18 -04:00
Isaac Connor 7a85e22bfc Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-06-28 16:22:16 -04:00
Isaac Connor 7ecce473f6 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-28 16:13:45 -04:00
Isaac Connor c926f733ea There should be a blank line here 2017-06-28 16:13:33 -04:00
Isaac Connor 1b71114fb9 put * outside of quoted filename spec 2017-06-28 15:26:34 -04:00
Isaac Connor 93ecf69381 Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas 2017-06-28 15:23:26 -04:00
Isaac Connor 621d2e0e41 remove debug code 2017-06-28 15:18:12 -04:00
Isaac Connor 8b1459a510 fixes for cambozola on ie, and fixes to setting fixed widths 2017-06-28 15:17:55 -04:00
Isaac Connor ed4da1e8bc change to single quotes 2017-06-28 14:27:09 -04:00
Isaac Connor 323cd3540d Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-28 11:58:23 -04:00
Isaac Connor f4fdbabf96 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-28 11:32:33 -04:00
Isaac Connor a1d1a6a0d4 fix Options and and Protocol which can be NULL 2017-06-28 11:32:18 -04:00
Andrew Bauer a656f4a6cd Update zoneminder.conf.in
rpm specfile - make el6 script alias match el7 & f25
2017-06-28 10:04:28 -05:00
Isaac Connor 1ef25ae1f3 switch to single quotes where possible 2017-06-28 11:03:35 -04:00
Isaac Connor 7c877798ea Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-28 10:53:41 -04:00
Isaac Connor 9ba9495ae0 whitespace, braces, move pod doc to bottom. No functional changes 2017-06-28 10:53:35 -04:00
Isaac Connor 12ee5c697b fixup copying package files to zmrepo 2017-06-28 10:38:52 -04:00