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

13454 Commits

Author SHA1 Message Date
Isaac Connor db7362dbcb Merge branch 'master' into storageareas 2019-06-20 14:18:47 -04:00
Isaac Connor 3bae7a5432 spaces and parenthesis 2019-06-20 13:28:12 -04:00
Isaac Connor b068428bbc zmcontrol complains about unfinished statement handles. This is because we aren't finishing them in functions in Database.pm 2019-06-20 13:27:42 -04:00
Isaac Connor 540a114c4b spacing google code style 2019-06-19 10:31:53 -04:00
Isaac Connor cc35e3f187 add dumpQueue to packetqueue to print out the contents 2019-06-19 09:51:06 -04:00
Isaac Connor 16b035f76c Use common first_dts/pts instead of separate video and audio first pts/dts 2019-06-19 09:22:21 -04:00
Isaac Connor 9727d0ed9f spaces 2019-06-19 09:22:21 -04:00
Isaac Connor 847cd9f347 Print out an error when a monitor is in MONITOR mode because we can't handle alarms. Allow signals to terminate zmu by checking zm_terminate. 2019-06-19 09:22:21 -04:00
Isaac Connor 77eb15ff17 fix an oninput and use validHtmlStr on ServerNames storageName MonitorName etc in dropdowns 2019-06-19 09:22:21 -04:00
Tom Hodder 70a91c7069 WIP: Add pagination to frames.php in classic (#2618) 
* add pagination to the frames.php results

* remove commented code, fix view all paging

* removing debugging logging statements

* default frames paging to on
 2019-06-19 09:22:21 -04:00
Pliable Pixels a6e42e4317 remove a password log, corrected PHP version in log (#2627) 
* remove a password log, corrected PHP version in log

* PHP version correction
 2019-06-19 09:22:21 -04:00
Pliable Pixels 2d5f84cd22 add event file system path to API (#2639) 2019-06-19 09:22:21 -04:00
Isaac Connor 199e8182be Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-06-19 08:36:48 -04:00
Isaac Connor 33951ae584 Print out an error when a monitor is in MONITOR mode because we can't handle alarms. Allow signals to terminate zmu by checking zm_terminate. 2019-06-19 08:36:37 -04:00
Isaac Connor dc7707bbc1 fix an oninput and use validHtmlStr on ServerNames storageName MonitorName etc in dropdowns 2019-06-18 10:03:14 -04:00
Tom Hodder 1336c03f97 WIP: Add pagination to frames.php in classic (#2618) 
* add pagination to the frames.php results

* remove commented code, fix view all paging

* removing debugging logging statements

* default frames paging to on
 2019-06-16 12:02:00 -04:00
Pliable Pixels 98bf7800b0 remove a password log, corrected PHP version in log (#2627) 
* remove a password log, corrected PHP version in log

* PHP version correction
 2019-06-16 11:59:48 -04:00
Pliable Pixels c4dc5f34e4 add event file system path to API (#2639) 2019-06-16 11:59:23 -04:00
Isaac Connor 695bdfc1c6 big ::Analyze logic cleanup. Also implement close continuous event before starting motion event in MOCORD 2019-06-13 15:48:41 -04:00
Isaac Connor b073505146 If either pts or dts is AV_NOPTS_VALUE then set equal to the other 2019-06-13 15:47:58 -04:00
Isaac Connor 9a33e55efc Bump log level to warning if we are restarting any daemons. Daemons should NOT need to be restarted in a healthy system. 2019-06-13 11:53:26 -04:00
Isaac Connor 84648ac557 Merge branch 'master' into storageareas 2019-06-12 10:05:40 -04:00
Isaac Connor 30a210f68f also need to adjust dts of last packet when switching events 2019-06-12 10:05:08 -04:00
Isaac Connor d87f5e3276 Merge branch 'master' into storageareas 2019-06-11 14:39:08 -04:00
Isaac Connor ec7b373913 fix structure of events_by_monitor_id 2019-06-11 14:38:51 -04:00
Isaac Connor 1e7cf8c7cf fix eslint, Fix video not resuming after setting speed to 0. 2019-06-11 14:38:28 -04:00
Isaac Connor 1928d1153f spacing and quotes 2019-06-11 13:32:15 -04:00
Isaac Connor 03419303b3 Merge remote-tracking branch 'origin/zoom_improve' into storageareas 2019-06-11 11:04:48 -04:00
Isaac Connor 1241761683 Add a title popup telling people about the zoomin/out/pan functions. Add ctrl-click to zoomout 2019-06-11 10:58:54 -04:00
Isaac Connor acb95709e6 Fix issues with too much audio in events by storing packets in the queue with their timestamps converted to AV_TIME_BASE_Q, so that we can sort video and audio packets together. 2019-06-11 10:19:42 -04:00
Isaac Connor 3a91880e2e Merge branch 'storageareas' 2019-06-10 16:01:03 -04:00
Isaac Connor 1eadb814e2 Fix use of onclick and onchange. Fix bulk frame lookup. Make scanning events more efficient 2019-06-10 15:59:19 -04:00
Isaac Connor 265e49fe45 Add a newline after each filter group to make the code easier to read 2019-06-10 15:58:17 -04:00
Isaac Connor 1749a7a4f9 fix extra closing button tag in shutdown button. Add a newline after each Storage group to make the code easier to read 2019-06-10 15:57:53 -04:00
Isaac Connor ee80b086af log the # of db entries being written before doing the writing so that we know the # being written 2019-06-10 14:13:21 -04:00
Isaac Connor 50436c5ea1 Correct debug line listing how many frames are being written to db 2019-06-10 13:59:01 -04:00
Isaac Connor 76763fca0e Merge branch 'master' into storageareas 2019-06-10 12:58:33 -04:00
Isaac Connor 37cc323078 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-06-10 12:58:18 -04:00
Isaac Connor ebc9a77c9d When saving jpegs, do a db write on the first frame. Fix test for writing frame info to db. Because we increment frames, it is essentially 1-based. So the test needs to be ==1 instead of ! 2019-06-10 12:57:57 -04:00
Isaac Connor 2e624522c7
fixes #2294 (#2637) 2019-06-10 09:43:56 -04:00
Isaac Connor b9ea9ce0ae Merge branch 'master' into storageareas 2019-06-07 14:40:43 -04:00
Isaac Connor 9b507734b2 spacing 2019-06-06 13:49:24 -04:00
Isaac Connor a16d29740c Fix final frame of event having same id as the second last 2019-06-06 13:49:01 -04:00
Isaac Connor 41714c676d Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-06-06 13:40:09 -04:00
Isaac Connor dfc60baf85 fix eslint spacing 2019-06-06 13:40:00 -04:00
fri.K b254e1e392 For column name title field should be taken instead of array name (#2635) 2019-06-06 12:58:33 -04:00
Isaac Connor 4879249d77 V4LMultiBuffer has a string value so testing against an integer fails. 2019-06-06 12:53:25 -04:00
fri.K 43d24cda8e Completed Polish translation (#2634) 
* Completed Polish translation

* Changing translation to be simillar with other lines
 2019-06-05 17:07:32 -04:00
Isaac Connor 08cc4e0383 add null value to set() function 2019-06-05 10:22:20 -04:00
Isaac Connor 4b8a2a94e3 reduce frame send time too slow to a warning instead of error 2019-06-05 10:12:56 -04:00