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

13290 Commits

Author SHA1 Message Date
andornaut 164a2d4d70 Fix image path (#2576) 
Change the path of the "center.png" image from skins/classic/graphics/graphics/center.png to skins/classic/graphics/center.png.

Note that the `graphics/` directory was previously duplicated.
 2019-04-14 15:41:58 -04:00
Isaac Connor 8828e2fe61 Merge branch 'master' into storageareas 2019-04-14 13:50:31 -04:00
Isaac Connor 91ea9615ad Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-04-14 13:50:18 -04:00
Isaac Connor 439a7b3ab3 Don't set bitrate, etc when h264. Causing crashes in ffmpeg 4.11. 2019-04-14 13:50:10 -04:00
Isaac Connor ad61f770ab Don't set bitrate, etc when h264. Causing crashes in ffmpeg 4.11. 2019-04-14 13:49:27 -04:00
Andrew Bauer 733bd66773
Merge pull request #2562 from santos995/master 
Added and edited tranlations to ru_ru.php
 2019-04-13 08:25:09 -04:00
Isaac Connor f0af0619e4 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2019-04-12 14:58:24 -04:00
Isaac Connor 3f3ae748f0 Merge branch 'add_shutdown_capability' into storageareas 2019-04-12 14:58:11 -04:00
Isaac Connor 160f5c7bd9 Merge branch 'master' into storageareas 2019-04-12 14:57:54 -04:00
Isaac Connor d59f058956 basic update of optionhelp view 2019-04-12 14:57:11 -04:00
Isaac Connor 1a1c2db15f add the shutdown view and actions 2019-04-12 14:55:56 -04:00
Isaac Connor 9421c0208d Add instructions for enabling the web user to run shutdown 2019-04-12 14:48:47 -04:00
Isaac Connor c9d45b143c Merge branch 'master' into add_shutdown_capability 2019-04-12 13:09:45 -04:00
Isaac Connor 36336d67be set width and height of shutdown window 2019-04-12 13:09:25 -04:00
Isaac Connor 7b98dcbb94 but the shutdown icon in a navbar-txt 2019-04-12 13:08:58 -04:00
Isaac Connor d7747b3385 add a shutdown power button to the navbar 2019-04-12 09:37:14 -04:00
Isaac Connor ec6d56fd7e Add a translation for Shutdown 2019-04-12 09:36:56 -04:00
Isaac Connor 0dd4a23770 Add Config for showing a system shutdown/restart option 2019-04-12 09:36:30 -04:00
Isaac Connor df348c3513 lets go with reporting actual errors 2019-04-10 11:48:17 -04:00
Isaac Connor f7dfe2982b Fix deleting single events 2019-04-10 11:46:12 -04:00
Isaac Connor f44eee61e2 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-04-09 19:42:33 -04:00
Isaac Connor 69f812f5cc force section end when seconds % section_length == 0 which is the old behaviour. 2019-04-09 19:42:24 -04:00
Pliable Pixels d270fbd0ad added support for named params to consoleEvents (#2571) 2019-04-09 16:28:46 -04:00
Andrew Bauer 6b86ec7304
Merge pull request #2570 from aktarus82/master 
Installation guide for Debian Stretch
 2019-04-09 16:23:38 -04:00
aktarus82 aaf988576f removing test.txt 2019-04-09 21:42:40 +02:00
Isaac Connor 7671f59d2f Add error counting on decoding 2019-04-09 12:27:40 -04:00
aktarus82 8403bf92fc updated Debian installation guide 2019-04-09 16:20:54 +02:00
aktarus82 eba52023f9 Merge remote-tracking branch 'upstream/master' 2019-04-09 16:14:34 +02:00
Isaac Connor 37b7c32465 fix errors when no filter specified 2019-04-09 09:45:28 -04:00
Isaac Connor 5ad9219609 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-04-09 09:39:39 -04:00
Andrew Bauer 50dd63c21d fix eslint 2019-04-08 19:58:18 -05:00
Andrew Bauer 8af96e3c00 fix eslint errors 2019-04-08 18:40:52 -05:00
Isaac Connor 3abf263e7a fixup half-merged changes to filter to view in montagereview 2019-04-08 16:57:41 -04:00
Isaac Connor fab548b119 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-04-08 16:46:28 -04:00
Isaac Connor 1b98f3529f allow non-increasing dts in muxer 2019-04-08 14:18:59 -04:00
Isaac Connor 7f2440177b remove duplicate dump_codec 2019-04-08 13:51:55 -04:00
Isaac Connor accaeadb18 code cleanup. dump_codecs 2019-04-08 13:51:41 -04:00
Isaac Connor e81c216b4a add more fields in dump_codec. 2019-04-08 13:51:13 -04:00
Isaac Connor 2f2e798696 Merge branch 'master' of github.com:zoneminder/ZoneMinder 2019-04-08 10:12:53 -04:00
Isaac Connor 806400bd81 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-04-08 10:04:38 -04:00
Isaac Connor 3c57d79669 Go back to using video_first_dts 2019-04-08 10:04:26 -04:00
Isaac Connor 64ec568547 Merge branch 'master' of github.com:zoneminder/ZoneMinder 2019-04-08 09:57:13 -04:00
Andrew Bauer 4b2fe5c3c7
Update zoneminder.spec 2019-04-07 18:21:52 -05:00
Isaac Connor d776f63bd8 Change MonitorIds from TinyText to TEXT. Fixes #2569 2019-04-07 17:23:39 -04:00
Isaac Connor f719dd9acc always commit buffered db_frames when we have a new max score image or alarm cause image 2019-04-07 10:29:02 -04:00
Isaac Connor 780f4f9b9a Merge branch 'master' of github.com:zoneminder/ZoneMinder 2019-04-06 09:27:44 -04:00
Isaac Connor 9faaba9300 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-04-05 15:18:39 -04:00
Isaac Connor 381f526d66 spacing 2019-04-05 15:18:20 -04:00
Isaac Connor aa83239069 rework zmcontrol.pl. If command is given and server is not up, use zmdc.pl to start it. Give up after 10 seconds. 2019-04-05 15:18:03 -04:00
Isaac Connor e1873b1693 debug response content 2019-04-05 15:17:13 -04:00