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

13358 Commits

Author SHA1 Message Date
Steve Root 0d4651c2d6 Update url to donate page (#2586) 2019-04-23 10:58:28 -04:00
Javier González Calleja 8195c4e395 Fixing video export view (#2585) 2019-04-20 11:19:27 -04:00
Andrew Bauer 017479303e
Merge pull request #2584 from alexfornuto/patch-1 
Update Debian Instructions
 2019-04-18 20:25:49 -04:00
Alex Fornuto 41cadf3a00
Update Debian Instructions 
When downloading the repository GPG key, `wget` does not require `sudo`. The root permissions required are provided by `sudo` after the pipe.
 2019-04-18 18:51:06 -05:00
Isaac Connor eb76cd87bb
Revert "Alarm cause fix (#2580)" (#2581) 
This reverts commit 6923382485.
 2019-04-17 13:53:11 -04:00
Pliable Pixels 6923382485 Alarm cause fix (#2580) 
* move alarm cause code to when the alarm flag is set

* formatting

* added temp info log

* char* not string in log
 2019-04-17 13:33:38 -04:00
Isaac Connor 5b68ddcc9a add a note deprecating getDiskPercent 2019-04-17 09:55:34 -04:00
Isaac Connor 70ed4a4646 Must unlock mutex before destructor as we do some logging in the mutex destructor when we destroy it while locked. 2019-04-16 11:51:10 -04:00
Isaac Connor 22adb243ec Fix crash when reporting an event longer than section length when event was just closed so event is null. 2019-04-16 11:50:41 -04:00
Isaac Connor 2ff1e7ed6d Fix crash when reporting an event longer than section length when event was just closed so event is null. 2019-04-16 11:30:18 -04:00
Isaac Connor 98a9c68b8b spacing and code documentation 2019-04-15 17:54:30 -04:00
Isaac Connor 293ec20824 Must unlock mutex before destructor as we do some logging in the mutex destructor when we destroy it while locked. 2019-04-15 17:54:17 -04:00
Isaac Connor 14791ec19b Merge branch 'master' into storageareas 2019-04-15 13:27:41 -04:00
Isaac Connor 13e5fd0950 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-04-15 13:27:25 -04:00
Isaac Connor 3664084862 Handle out of order dts in writeAudioFrame 2019-04-15 13:27:13 -04:00
Isaac Connor f28af7b729 store diag_path in the object and initialize them in constructor instead of constantly checking to see if they have been initialized in DetectMotion. Also use a string instead of a static char[MAX_PATH]. Also split it into diag_path_r and diag_path_d to fix the bug that only diag_path_r would ever get created and would be overwritten by the delta image. 2019-04-15 13:26:55 -04:00
Isaac Connor 93f0a03d8b spacing and code comments 2019-04-15 12:55:28 -04:00
Isaac Connor 7c8b37e08c fix mutex hang on Fatal 2019-04-15 11:21:23 -04:00
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