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

7263 Commits

Author SHA1 Message Date
Isaac Connor 9f00971e6b Use Debug for debug output instead of Error 2016-06-27 10:27:26 -04:00
Isaac Connor 0a4eee323b Use a subquery instead of a join to fix group by errors when sql_mode=only_full_group_by 2016-06-27 10:26:52 -04:00
Isaac Connor 4fc68c0aa0 Use a subquery instead of a join to fix group by errors when sql_mode=only_full_group_by 2016-06-27 10:26:37 -04:00
Isaac Connor 6ab2b33e95 fix merge 2016-06-27 09:10:35 -04:00
Andrew Bauer f3583e5707 rpm specfile - add support for f24, remove support for f22 2016-06-24 15:39:57 -05:00
Andrew Bauer 97baf4ecd3 Merge pull request #1529 from ZoneMinder/fix_1526 
connect needs a +1
 2016-06-24 09:53:46 -05:00
Isaac Connor 6e4c8fa224 need to set the Id when duping 2016-06-24 10:31:15 -04:00
Isaac Connor 791c8fb3d5 add setting of object property 2016-06-24 10:30:56 -04:00
Isaac Connor 6644db3bea check for null on various Monitor fields 2016-06-24 10:29:50 -04:00
Isaac Connor d732d9a49a fix merge 2016-06-24 10:02:20 -04:00
Isaac Connor c1f30480e3 fix merge 2016-06-23 12:49:27 -04:00
Isaac Connor 081c0add72 fix 2016-06-23 11:25:50 -04:00
Isaac Connor ccea620531 check for null before instantiating strings 2016-06-23 11:13:26 -04:00
Isaac Connor 71f2ac423d Add NULL For Id column in Filters when adding PurgeWhenFull 2016-06-22 09:44:14 -04:00
Isaac Connor 1383e0b774 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-06-22 09:41:47 -04:00
Isaac Connor 7496dc392f get rid of use of separator, just use \n 2016-06-21 14:06:07 -04:00
Isaac Connor c6761dd094 fix merge 2016-06-21 14:02:36 -04:00
Isaac Connor e29a0ebe71 Merge branch 'feature-h264-videostorage' into storageareas 2016-06-21 13:48:32 -04:00
Isaac Connor ce22e6534e fix tabs 2016-06-21 12:26:08 -04:00
Isaac Connor dfc885a12a fix tabs 2016-06-21 12:25:13 -04:00
Isaac Connor 6a8db582ff whitespacing updates 2016-06-21 12:21:18 -04:00
Isaac Connor 31a5252afa apply btn and btn-primary styles to remaining buttons on console 2016-06-21 09:22:32 -04:00
Isaac Connor 513de21260 Merge branch 'add_api_auth' into storageareas 2016-06-21 09:10:06 -04:00
Isaac Connor b4aec41d3d fix warnings and move User import up higher to where it needs to be 2016-06-21 09:09:58 -04:00
Isaac Connor 4230bd1bd5 move the control_fields into the class so that it is available. 2016-06-20 12:46:23 -04:00
Isaac Connor 9c7b22086f introduce a hash to define the fields and default values of the control table. Primarily this is to prevent method warnings when a monitor is not controllable 2016-06-20 12:41:14 -04:00
Isaac Connor 1d1cedce95 use rand mofification like when re-establishing the stream instead of an Time(). Drop use of a tempImage as it doesn't seem to be used anywhere. Cleanup use of streamSrc. Introduce a function getStreamMode 2016-06-20 12:40:33 -04:00
Steve Gilvarry 2304806bcc Merge pull request #1544 from SteveGilvarry/feature-h264-videostorage 
Feature-h264-videostorage - Fix missing } from merge that was preventing building.
 2016-06-19 08:04:10 +10:00
Steve Gilvarry d8f6cc952d Fix missing } from merge that was preventing building. 2016-06-19 07:22:14 +10:00
Andrew Bauer c0b357ec59 Merge pull request #1539 from knnniggett/onvifProbeType 
zmonvif-probe - fixes syntax error reported on some (older) Perls
 2016-06-18 11:59:05 -05:00
Andrew Bauer 9dd5e34dc8 Merge pull request #1541 from altaroca/zmonvif-probe-1397 
zmonvif-probe: Set $transport->message to prevent undef error
 2016-06-18 09:10:25 -05:00
Jan M. Hochstein 2157f22669 Set ->message to prevent undef error 2016-06-18 15:46:05 +02:00
Andrew Bauer 0fd42abd87 fixes syntax error reported on some (older) Perls 2016-06-17 14:12:14 -05:00
Isaac Connor 08c8da3e8f fix extra else and some whitespace 2016-06-17 11:37:20 -04:00
Isaac Connor 26bba58c56 Merge branch 'master' into feature-h264-videostorage 2016-06-17 11:09:47 -04:00
Isaac Connor 3914e0b394 :Merge branch 'fix_zone_edit' into storageareas 2016-06-16 12:04:18 -04:00
Isaac Connor 0c82e82ae2 Don't update x in updateY and don't update y in updateX as they are not defined. 2016-06-16 12:00:00 -04:00
Steve Gilvarry d0e08b32f5 Merge pull request #1506 from Disassembler0/master 
Change encoding of web/lang/cs_cz.php from ISO-8859-2 to UTF-8
 2016-06-17 00:01:08 +10:00
Isaac Connor baa7da086a Merge pull request #1520 from knnniggett/zmlocalcamera 
Set VIDEO_MAX_FRAME if it is not defined
 2016-06-16 09:31:24 -04:00
Steve Gilvarry f393f3a6f0 Merge pull request #1528 from ZoneMinder/deprecate_configadmin 
Removes current issue in master so it wins.
Disclaimer: This action in no way indicates alliance with Team Isaac over Team Andy 👬
 2016-06-16 07:43:14 +10:00
Isaac Connor c3d3514e51 fix update script to add Id column to Filters 2016-06-15 11:35:11 -04:00
Isaac Connor ea87d9a305 fix merge problem 2016-06-14 21:16:38 -04:00
Isaac Connor 8e7665d397 use getStreamHTML instead of duplicated code 2016-06-14 12:40:18 -04:00
Isaac Connor d5d48bef8a clean out unused variables and don't scale the popup window. The contents of it won't be scaled. 2016-06-14 12:39:51 -04:00
Isaac Connor bfa46e26ee Use monitor Id instead of the array index. Id is unique, so just use it. 2016-06-14 12:39:15 -04:00
Isaac Connor acba5bccf1 Always include the monitor Id in the tag id for the videostream 2016-06-14 12:38:37 -04:00
Isaac Connor 0f1a1a6294 log invalid calls to Monitor Object 2016-06-14 12:38:17 -04:00
Isaac Connor 99c13628fe Merge pull request #1531 from SteveGilvarry/FixLogExport 
Adjust download file path to swap path to match the file generated.
 2016-06-14 07:11:49 -04:00
Steve Gilvarry f804f7739d Adjust download file path to swap path to match the file generated. 2016-06-14 20:49:38 +10:00
Isaac Connor 98fab6528d always use \n as separator and remove the segfault 2016-06-13 14:00:24 -04:00