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

7379 Commits

Author SHA1 Message Date
Steve Gilvarry 25f7a8cadf Restore lost fixes for deprecation 2016-07-09 22:31:01 +10:00
Steve Gilvarry 142784746c Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-07-07 19:33:04 +10:00
Andrew Bauer 477c02382b Update CMakeLists.txt 
Minor change for fedora rpmbuild
 2016-07-06 19:06:28 -05:00
Steve Gilvarry 4873683f01 Merge pull request #1548 from knnniggett/libjpegturbo 
fix jpeg buffer too small
 2016-07-07 00:13:54 +10:00
Andrew Bauer 1f060f1938 Update zoneminder.init 
Remove my initials
 2016-07-05 11:35:08 -05:00
Andrew Bauer 257ce2b9a9 Merge pull request #1546 from SteveGilvarry/DocsUpdate 
Updates to Ubuntu and Debian install guides
 2016-07-05 09:30:45 -05:00
Steve Gilvarry 5811ba7eda Swap to apt-get for debian 2016-07-05 23:10:03 +10:00
Steve Gilvarry 3a40f39d83 Fix 14.04 php.ini location and some more formatting issues 2016-07-05 07:52:37 +10:00
Steve Gilvarry 1f53377d8a Implement suggested wait for MySQL start 2016-07-05 07:28:52 +10:00
Steve Gilvarry 219289ee20 Consistency changes 2016-07-05 07:15:01 +10:00
Andrew Bauer 75a98601ef fix jpeg buffer too small 2016-07-03 14:59:05 -05:00
Andy Bauer 980d3f6e7f rpm housecleaning, change the way jscalendar is installed 2016-07-03 11:34:35 -05:00
Steve Gilvarry b2d1d688cc Updates to Ubuntu and Debian install guides 2016-07-03 20:21:13 +10:00
Steve Gilvarry 3eccdcd3e2 Merge pull request #1524 from ZoneMinder/add_api_auth 
if user=&pass= are in request, use them for auth in api
 2016-06-29 21:47:44 +10:00
Steve Gilvarry f3779d543c Merge pull request #1521 from ZoneMinder/fix_zone_edit 
update area when points move
 2016-06-29 21:46:28 +10:00
Steve Gilvarry bdd0790106 Merge pull request #1522 from ZoneMinder/video_session 
Move the session start down to where it is actually needed so that we…
 2016-06-29 21:45:12 +10:00
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