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

7689 Commits

Author SHA1 Message Date
Isaac Connor 3a00656c3f WHen can't open file log, turn on terminal logging so that the message goes somewhere useful. 2017-06-23 09:58:19 -04:00
Isaac Connor 2460e1acd9 fix whitspace 2017-06-23 09:58:01 -04:00
Isaac Connor 609c9a351f Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-23 09:04:52 -04:00
Isaac Connor b5565bb16a fix filters, refreshparent in wrong block 2017-06-23 09:04:46 -04:00
Isaac Connor 892f3a06c7 wip 2017-06-23 08:32:09 -04:00
Isaac Connor fcc852c859 fix cpplint.py complaints 2017-06-22 16:06:31 -04:00
Andrew Bauer b10779ab3a Update rsync_xfer.sh 
add rsync -l flag to transfer symlinks
 2017-06-22 10:57:11 -05:00
Isaac Connor 4df354dc24 fix order of send_frame and break and fix if ( usleep ) which should be if ( delta_us ) 2017-06-22 10:48:15 -04:00
abishai 950c8f19d3 Upstream FreeBSD patches (#1926) 
* apply FreeBSD patches

* timeval struct needs time.h

* typo

* added forgotten destination for systemd startup script install
 2017-06-22 10:14:24 -04:00
Isaac Connor 394001604d add the new files for EventStream 2017-06-22 10:12:04 -04:00
Isaac Connor 226514e887 split EventStream into it's own files 2017-06-22 10:10:28 -04:00
Isaac Connor 1bba664e3d whitspace 2017-06-22 09:55:45 -04:00
Isaac Connor eac6537d7c Merge ../ZoneMinder.master into fix_event_viewing 2017-06-21 17:21:06 -04:00
Isaac Connor 5ee230a141 always restart zoneminder on upgrade, not just when doing a db update 2017-06-21 17:20:50 -04:00
Isaac Connor c33b179a59 :Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-21 17:18:49 -04:00
Isaac Connor 5e75588bfb Fix event viewing. Output a frame immediately on zoom in/out. Fix recursive loop on play/pause 2017-06-21 17:14:02 -04:00
Andrew Bauer 36683d15d2 Update zoneminder.spec 
bump zm version in rpm specfile
 2017-06-20 11:41:53 -05:00
Isaac Connor 2e60864e99 always stop and start zm on upgrade, not just if doing a db update 2017-06-20 09:44:18 -04:00
Isaac Connor f78e720db3 add /etc/zm and /etc/zm/conf.d to install dirs 2017-06-20 09:41:35 -04:00
Isaac Connor 42a022d15b always stop and start zoneminder on upgrade 2017-06-20 09:41:02 -04:00
Isaac Connor db68d3e0a2 use restart instead of start 2017-06-19 13:57:00 -04:00
Andrew Bauer 6945bbda7c Merge pull request #1925 from doctormo/patch-1 
Fix spelling mistake in link
 2017-06-18 07:25:25 -05:00
Martin Owens 6cc6055bd3 Fix spelling mistake in link 2017-06-17 21:50:41 -04:00
Isaac Connor 8527e5f1de Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-15 13:03:09 -04:00
Isaac Connor 119f8fc86c Fix version checks to fix build on yaketty 2017-06-15 13:02:54 -04:00
Isaac Connor 734f099b4a remove content from changelog 2017-06-15 12:15:15 -04:00
Andrew Bauer 108be3b05f Merge pull request #1922 from connortechnology/log_no_truncate 
change mode of opening log files to append instead of overwrite
 2017-06-14 19:02:15 -05:00
Isaac Connor 2b5139033c Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-14 15:09:28 -04:00
Isaac Connor e2139920a8 change some more quotes 2017-06-14 15:09:21 -04:00
Isaac Connor 5fad7a8470 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-14 13:32:06 -04:00
Andrew Bauer b17a4d8994 Create startpackpack.sh 
quiet gdebi output
 2017-06-14 12:28:56 -05:00
Andrew Bauer f91e171526 Create startpackpack.sh 
increase travis build log output, filter out ONVIF
 2017-06-14 12:06:55 -05:00
Isaac Connor 3dc9594461 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-14 11:24:54 -04:00
Isaac Connor 07a2d49a41 Merge branch 'log_no_truncate' 2017-06-14 11:23:39 -04:00
Isaac Connor a4b3f6b41a fix form of delete used 2017-06-14 10:54:21 -04:00
Isaac Connor b51d885f66 fix build on old ffmpeg 2017-06-14 10:36:08 -04:00
Isaac Connor 1361b8952f change mode of opening log files to append instead of overwrite 2017-06-14 10:15:08 -04:00
Isaac Connor 4219bcd1ca add the missing .map file for bootstrap 2017-06-14 09:36:49 -04:00
Isaac Connor ce6a6a41a8 fix gif->png and the path for arrow-s-u and arrow-s-d 2017-06-14 09:34:03 -04:00
Isaac Connor f0d80ddfd4 fix runstate merge 2017-06-13 21:18:09 -04:00
Isaac Connor dd70eb3e5f more deprecation fixes 2017-06-13 17:06:50 -04:00
Isaac Connor 42100d9a33 introduce current_event in videostore_data so we know which event we are writing a video file for. Also, GetLastEventId so that non-friends can find out the event id of the current event. 2017-06-13 17:05:37 -04:00
Isaac Connor 3c053b36ef introduce zm_dump_codecpar and zm_dump_codec to be used for debugging 2017-06-13 16:51:51 -04:00
Andrew Bauer 417421b1d8 move include <sys/uio.h> outside defined(BSD) block (#1919) 2017-06-13 15:39:12 -04:00
Andrew Bauer df304b417a Update zmupdate.pl.in 2017-06-13 11:08:58 -05:00
Andrew Bauer bf04a68085 Merge pull request #1752 from connortechnology/filter_by_runstate 
rough in the ability to filter on RunState
 2017-06-12 20:54:17 -05:00
Andrew Bauer c11a219b9f Merge pull request #1896 from connortechnology/dragndrop_monitor_sorting 
Dragndrop monitor sorting
 2017-06-12 20:49:51 -05:00
Andrew Bauer bacf65ae9a Migrate values from Options -> Paths to zm.conf (#1908) 
* initial commit to migrate contents of Options->Paths to zm.conf

* remove paths items from configdata.pm

* remove paths tab from options

* update deb packaging scripts with new cmake vars

* remove extraneous file

* save custom paths variables to config file before dB is freshened

* don't check configs if the dB version is >= 1.31.0
 2017-06-12 21:39:37 -04:00
Andrew Bauer 4ba9205ba9 Merge pull request #1917 from MarkosVakondios/1915-dockerfile_will_not_build 
1915 Typo fix
 2017-06-12 06:38:43 -05:00
markos 15a6c3c775 1915 Typo fix 2017-06-11 20:07:28 +03:00