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

12350 Commits

Author SHA1 Message Date
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 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 bc5f8d0d8d rework pts/dts of audio stream. Spacing. Fix crash 2018-12-04 18:23:08 -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 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
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
Andrew Bauer cae6ffd5a3 use HTTP_HOST instead of SERVER_NAME 2018-12-01 13:27:08 -06:00
Andrew Bauer 76e0782d97 rpm pkg - update nginx config 2018-12-01 09:58:12 -06:00
Isaac Connor 4272225a17 Merge branch 'master' into h265 2018-11-30 16:42:16 -05:00
Isaac Connor 6ad54aad93 add libswscale5 to depends for ubuntu cosmic 2018-11-30 14:53:31 -05:00
Isaac Connor 9bb4f1804e Merge branch 'server_path_prefix' 2018-11-30 14:46:20 -05:00
Isaac Connor 8c626c984b Need to pass port through all Url functions 2018-11-30 14:45:58 -05:00
Isaac Connor 6830849576 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-11-30 10:48:32 -05:00
Isaac Connor f9139f2d98 Use the word skipped instead of aborted 2018-11-30 10:48:20 -05:00
Andrew Bauer 279255d979 rpm pkg - update README 2018-11-30 08:58:42 -06:00
Andrew Bauer bfff07bb3e rpm packaging - takes too long to set perms on events 2018-11-30 08:53:58 -06:00
Isaac Connor 945770c819 Merge branch 'server_path_prefix' 2018-11-29 15:53:35 -05:00
Isaac Connor 3bd5774ea1 Default to PathToIndex should have the index.php in it 2018-11-29 15:53:19 -05:00
Isaac Connor 17551eacee Merge branch 'server_path_prefix' 2018-11-29 14:27:32 -05:00
Isaac Connor 1c17f334d3 fix missing bits. Implement UrlToIndex in Monitor and fix use of Url(). Implement PathToApi as well 2018-11-29 14:26:30 -05:00
Isaac Connor d83fb2e985 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-11-29 14:08:03 -05:00
Isaac Connor 5e0d742e26 Use history.go(-1) which works on safari 2018-11-29 14:04:35 -05:00
Andrew Bauer 79f804e94b update rpm README 2018-11-29 10:43:22 -06:00
Andrew Bauer 9f6a603d59 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2018-11-29 10:36:54 -06:00
Andrew Bauer a74a9ae292
Merge pull request #2328 from pliablepixels/login-auth-relay 
returns user=&pass= in credentials for auth_relay plain and none  #2327
 2018-11-29 09:59:09 -06:00
Andrew Bauer 5a88cbcddb
Merge pull request #2329 from connortechnology/fix_2319 
Fix rate resetting
 2018-11-29 09:57:13 -06:00
Andrew Bauer be07e4413f
Merge pull request #2152 from connortechnology/server_path_prefix 
Server path prefix
 2018-11-29 09:56:25 -06:00
Isaac Connor 5496f6afac add cosmic and disco to ubuntu builds 2018-11-29 10:48:16 -05:00
Isaac Connor 392fa04918 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-11-29 10:45:37 -05:00
Isaac Connor 45a9f9158d spelling mistakes 2018-11-29 10:45:30 -05:00
Isaac Connor 605397b565 Fix rate resetting by storing it in a cookie and using that on initial event load. Fixes #2319 2018-11-29 09:43:21 -05:00
Pliable Pixels e6b8a7bc66 resolves #2327 2018-11-29 09:21:10 -05:00
Isaac Connor 1e915e9567 Merge branch 'master' into server_path_prefix 2018-11-28 10:45:36 -05:00
Isaac Connor 81f345a9cd Add dh-systemd and dh-apache2 to build depends 2018-11-28 10:08:27 -05:00
Isaac Connor a89dd83565 Update to use object instead of db row 2018-11-28 09:55:34 -05:00
Isaac Connor cd13dda294 fix use of instead of 2018-11-28 09:54:22 -05:00
Isaac Connor 2b48b09ef5 Add entries for PathToIndex and PathToZMS 2018-11-28 09:53:35 -05:00
Elmar Pruesse 9c1578e14e Add description for Stream Replay Image Buffer (#2325) 
* Add description for Stream Replay Image Buffer

I hope this is even correct.

* Update definemonitor.rst
 2018-11-27 21:49:58 -05:00
Elmar Pruesse 94d8e043ce Fix unreadable input text when OS theme dark (#2324) 
* Update skin.css

* Update skin.css
 2018-11-27 18:25:05 -05:00