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

12513 Commits

Author SHA1 Message Date
Isaac Connor b61eb7d4fc Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-12-13 10:53:56 -05:00
Isaac Connor 0c5eead929 Merge branch 'master' into fix_startup_db_connection 2018-12-13 10:53:34 -05:00
Isaac Connor 0784a8a5a1 reduce ffmpeg log levels from error to warning and warning to info. Ffmpeg outputs a lot of errors that don't significantly affect video recording. 2018-12-13 10:27:44 -05:00
Isaac Connor 50b67fe6bf Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-12-13 10:25:52 -05:00
Mike Rosack 567b60ffa7 support for forwarded proto/port in Server.php (#2343) 2018-12-13 10:24:32 -05:00
Andrew Bauer 882c4e2ea6
Update zm_update-1.33.0.sql 
fixes #2342
 2018-12-12 20:55:50 -06:00
Andrew Bauer 8d74354fcb
Merge pull request #2242 from connortechnology/cleanup_auth 
Cleanup auth
 2018-12-12 20:53:24 -06:00
Isaac Connor c4bf67b063 fix commas 2018-12-12 09:17:14 -05:00
Isaac Connor eba8b3327d Merge branch 'master' into cleanup_auth 2018-12-11 16:04:42 -05:00
Andrew Bauer ae4e1011db Merge branch 'connortechnology-remove_default_view' 2018-12-11 09:44:31 -06:00
Andrew Bauer 21a98f3653 Merge branch 'remove_default_view' of https://github.com/connortechnology/ZoneMinder into connortechnology-remove_default_view 2018-12-11 09:44:13 -06:00
Isaac Connor 4e4c7502c3 put sql update into zm_update-1.33.0.sql 2018-12-11 10:37:52 -05:00
Isaac Connor 278abbc201 Merge branch 'master' into remove_default_view 2018-12-11 10:37:26 -05:00
Andrew Bauer 3cf6bf1786
Merge pull request #2243 from connortechnology/add_archive_filter_to_montagereview 
Rough in an archived status filter in montagereview.
 2018-12-11 09:36:35 -06:00
Andrew Bauer fe5cb4bfdc
Merge pull request #2283 from connortechnology/warn_colour_when_disabled 
Use a warning colour when motion detection is disabled.
 2018-12-11 09:36:07 -06:00
Andrew Bauer 4d7e98475f
Merge pull request #2297 from connortechnology/introduce_getBodyTopHTML 
Introduce get body top html
 2018-12-11 09:35:54 -06:00
Andrew Bauer 22460f580b
Merge pull request #2305 from pliablepixels/save-first-alarm 
Save first alarm
 2018-12-11 09:35:40 -06:00
Andrew Bauer b563968ce2
Merge pull request #2321 from connortechnology/av_logging 
Av logging
 2018-12-11 09:30:08 -06:00
Andrew Bauer c530337c50
Merge pull request #2331 from connortechnology/fix_ios9 
Fix ios9
 2018-12-11 09:29:50 -06:00
Andrew Bauer cd21850015
Merge pull request #2337 from knight-of-ni/manpath 
allow one to set manpage destination
 2018-12-11 09:29:37 -06:00
Andrew Bauer af6b709ae1 bump to 1.33.0 development 2018-12-11 09:28:48 -06:00
Isaac Connor c8c34d3f95 Merge branch 'master' into storageareas 2018-12-11 10:21:22 -05:00
Isaac Connor b3bed9a28a fix whitespace 2018-12-11 10:20:02 -05:00
Isaac Connor e1ecd47bff Fix missing use of UrlToApi 2018-12-11 09:40:40 -05:00
Isaac Connor 1e8c4276bb fix #2319 some more. This is fixing rate sticking across gapless events and reload 2018-12-10 17:32:17 -05:00
Andrew Bauer 08899b69c3 update ENDMACRO 2018-12-08 12:04:57 -06:00
Andrew Bauer 077c643da0 1.32.3 release 2018-12-08 08:22:36 -06:00
Andrew Bauer c3620672b3 1.32.3 release 2018-12-08 08:19:55 -06:00
Andrew Bauer 16318ca3ef
Update zoneminder.spec 2018-12-07 09:59:28 -06:00
Andrew Bauer db81465fa2 allow one to set manpage destination 2018-12-07 09:47:00 -06:00
Isaac Connor a1141d2dc4 remove second use of HTTP_HOST and use a better method of stripping off port from HTTP_HOST 2018-12-07 08:39:23 -05:00
Andrew Bauer 5258415e83
Merge pull request #2335 from connortechnology/server_path_prefix 
strip port from HTTP_HOST
 2018-12-06 16:17:42 -06:00
Isaac Connor 757e538550 strip port from HTTP_HOST 2018-12-06 17:12:03 -05:00
Isaac Connor 51fcede45c Merge branch 'batch_frame_records' into storageareas 2018-12-05 13:18:35 -05:00
Isaac Connor ab9081e1bf create a simple Frame class. Add a queue of Frames to the Event. When we get 10 of them write them out to the db. 2018-12-05 13:18:21 -05:00
Isaac Connor 50017057de Merge branch 'master' into storageareas 2018-12-05 09:05:27 -05:00
Isaac Connor 9ffd77428a fix paths to jquery-ui-theme components, thereby upgrading them to the proper version. This fixes the datetime filters not being shown on skins that don't specify a custom theme for jquery-ui 2018-12-05 09:05:10 -05:00
Isaac Connor a9290759a5 Merge branch 'fix_ios9' into storageareas 2018-12-03 16:25:34 -05:00
Isaac Connor 0c7f91c38a Merge branch 'master' into storageareas 2018-12-03 16:25:28 -05:00
Isaac Connor f2f1e230d1 put back missing ! 2018-12-03 16:25:03 -05:00
Isaac Connor 18ce7c9ea0 Old browsers, specifically Safari on IOS9 doesn't support let. Need to use var instead. 2018-12-03 15:17:16 -05:00
Isaac Connor 27d4ba9e5f use output of babeljs.io to provide code that works on older browsers. The nice class notation is ES6 upwards.. Safari on IOS9 doesn't like it 2018-12-03 15:16:47 -05:00
Isaac Connor 14272a42b4 fix use of getcwd in delete_empty_subdirs. We use absolute paths 2018-12-03 11:08:24 -05:00
Isaac Connor 23124d634c improve ImageBufferCount too small message 2018-12-03 11:02:45 -05:00
Isaac Connor d837b42836 fix ffmpeg warnings. We have to copy parameters from the context to the stream AFTER we open the codec 2018-12-03 10:33:53 -05:00
Isaac Connor ddd2e24dcb fix ffmpeg warnings. We have to copy parameters from the context to the stream AFTER we open the codec 2018-12-03 10:32:37 -05:00
Isaac Connor 0cf56f186c add frame_size to stream dump 2018-12-03 10:32:01 -05:00
Isaac Connor 2df6d74a3e Merge branch 'master' into storageareas 2018-12-02 17:15:12 -05:00
Andrew Bauer dbb51e9857 add generic nginx config file 2018-12-02 09:40:15 -06:00
Andrew Bauer e327ad100e fix WebSite camera startup issue 2018-12-01 17:03:50 -06:00