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

12355 Commits

Author SHA1 Message Date
Andrew Bauer ac0e8c9b0b initial support for subpackages 2018-11-17 10:45:08 -06:00
Isaac Connor d8d9544497 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-11-17 10:39:52 -05:00
Isaac Connor 87140ecdb5 white space and quiet warning 2018-11-17 10:39:42 -05:00
Andrew Bauer b4f77077e9
Update zmdc.pl.in 
temporary fix to #2292
 2018-11-16 18:33:54 -06:00
Andrew Bauer 21d311942f
Create no-response.yml 2018-11-16 17:54:24 -06:00
Andrew Bauer 15e720d4f7
Create config.yml 2018-11-16 17:50:54 -06:00
Andrew Bauer 6883d5b532
Update ISSUE_TEMPLATE.md 2018-11-16 17:11:05 -06:00
Andrew Bauer 713e810632
Update ISSUE_TEMPLATE.md 2018-11-16 17:08:23 -06:00
Andrew Bauer b353b625eb rpm - configure the nginx config file in all cases 2018-11-16 10:40:39 -06:00
Andrew Bauer 8df9e4c1ee
Update zoneminder.logrotate.in 2018-11-15 20:18:56 -06:00
Andrew Bauer e5f2212a32 fix gpl mailing address 2018-11-15 20:00:53 -06:00
Andrew Bauer 5c2e5d89ed
fix gpl mailing address 
This makes rpmlint & lintian complain less
 2018-11-15 19:53:45 -06:00
Isaac Connor d99ee73ad3 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-11-15 12:24:04 -05:00
Isaac Connor 415d43fafb Include Server Name when testing for CORS. Also be case insensitive. 2018-11-15 12:23:52 -05:00
Isaac Connor f72651da5a Add auth hash to ajax fps and status calls in zone edit 2018-11-15 12:22:35 -05:00
Andrew Bauer 9b46c92ac5 rpm pkg - add note to zm php-fpm config file 2018-11-15 09:19:26 -06:00
Andrew Bauer 2f8c0654d5 rpm pkg - fix for zm php-fpm config path 2018-11-15 08:31:04 -06:00
Andrew Bauer f2fc234880 rpm pkg - install zm php-fpm config in all cases for future nginx support 2018-11-15 08:26:54 -06:00
Isaac Connor 64ce035129 Merge branch 'av_logging' into storageareas 2018-11-14 17:03:32 -05:00
Isaac Connor 70d9fda758 Implement a logging callback for avcodec to use our logging functions 2018-11-14 17:02:52 -05:00
Isaac Connor d89c0bc737 Merge branch 'master' into storageareas 2018-11-14 15:55:00 -05:00
Isaac Connor aa8ac9c31c spaces and quotes 2018-11-14 15:54:45 -05:00
Isaac Connor 3a409b26aa Use buttons instead of anchor tags for Prev/Next/FIrst/Last buttons 2018-11-14 15:54:34 -05:00
Isaac Connor 3be31020b7 Automatically add width to frames view when thumbnails are turned on. 2018-11-14 15:54:01 -05:00
Isaac Connor 0546c54f5a Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-11-14 13:02:48 -05:00
Isaac Connor 9d5772b517 Merge branch 'fix_multiserver_daemon_restarting' into storageareas 2018-11-14 13:02:30 -05:00
Isaac Connor 786ca5b22a implement remove service restart for zma. Use daemonControl instead of saving the monitor when restarting zmc 2018-11-14 13:00:19 -05:00
Isaac Connor 51d8c0ea73 add back daemon parameter, but make it actually work 2018-11-14 12:59:44 -05:00
Isaac Connor 9d8f0fef0c add templates for daemonControl to api 2018-11-14 12:54:40 -05:00
Isaac Connor d671761a35 simplify params to daemonControl since they really aren't being used anyways. Return the status text 2018-11-14 12:54:10 -05:00
Isaac Connor 35b439629c Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-11-13 18:14:35 -05:00
Isaac Connor 5120c6f540 remove compile warning by assigning AV_CODEC_NONE to the codec_id. 2018-11-13 18:13:55 -05:00
Isaac Connor 381071eb0f Fix log message to say recovering instead of auditing 2018-11-13 16:36:39 -05:00
Isaac Connor d2dc23b4e9 fixes, better logging 2018-11-13 16:35:09 -05:00
Andrew Bauer 8b50c87aab
Merge pull request #2307 from connortechnology/fix_32bit_alignment 
remove epadding2, to restore the 64bit alignment of startup_time.
 2018-11-13 13:38:53 -06:00
Isaac Connor c484a4f32a Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-11-13 14:24:26 -05:00
Isaac Connor 73c52705f2 Merge branch 'fix_32bit_alignment' into storageareas 2018-11-13 14:22:06 -05:00
Isaac Connor e8ed1367d7 Merge branch 'master' into storageareas 2018-11-13 14:22:00 -05:00
Isaac Connor ca87936cd7 add function time_of_youngest_file to determine the youngest file in an event dir, so as to guess the starttime of the event. 2018-11-13 14:13:41 -05:00
Isaac Connor 798bf68df1 add function time_of_youngest_file to determine the youngest file in an event dir, so as to guess the starttime of the event. 2018-11-13 14:13:32 -05:00
Isaac Connor 31b0ed107d remove epadding2, to restore the 64bit alignment of startup_time. A proper fix instead of #2258 2018-11-13 14:02:44 -05:00
Isaac Connor 07d6d799ce Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-11-13 10:30:58 -05:00
Isaac Connor 993da131f1 tidy up and use Error instead of Carp::croak 2018-11-13 10:29:19 -05:00
Isaac Connor abeafe9ba6 fix log export. minTime and maxTime were being cleared by the regexp to detect sub second time. Also use ZM_DIR_EXPORTS instead of ZM_PATH_SWAP 2018-11-12 15:43:03 -05:00
Isaac Connor d76d6bb9d1 include overlay.js when viewing the log, so that export works 2018-11-12 15:09:15 -05:00
Isaac Connor 2cc9c6bab1 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-11-12 11:56:30 -05:00
Isaac Connor a95a012fa5 fix #2302 2018-11-12 11:56:18 -05:00
rafidashab 4a56a405b7 Fix typos in README file (#2301) 
* Fix typos in README file

* Improve clarity in introduction doc

* Improved word selection

* Revision of the README file

* Finish editing introduction documentation
 2018-11-12 09:18:13 -05:00
Isaac Connor 246765ced9 Add tooltip for sorting monitors 2018-11-11 16:23:19 -05:00
Isaac Connor 967fe14b22 Add ability to update incorrect starttime. 2018-11-11 10:17:32 -05:00