17e65d12b4
fixed SaveJPEGs are not working
...
which is caused in errors introduced when merging with master
2015-10-31 21:27:23 -07:00
55fce55518
Merge pull request #1130 from inflex/h264-mkv
...
Fixes for crashes from bad packets to av_interleaved_write_frame
2015-10-30 23:06:21 +11:00
cad374db50
Merge pull request #1 from SteveGilvarry/h264-mkv
...
Remove syslog.h
2015-10-30 21:36:06 +10:00
650d93435e
Remove syslog.h
2015-10-30 21:42:58 +11:00
6e2e33cf89
Fixes problem of crashing zmc when bad packet arrives causing av_interleaved_write_frame() to return non-zero (-22). Prefilters common packet issues. Add metadata title to generated video file
2015-10-30 19:05:40 +10:00
ef18714687
Merge pull request #1127 from SteveGilvarry/feature-h264-videostorage
...
Merging master to feature-h264-videostorage
2015-10-28 08:36:49 +11:00
d45cf9607b
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2015-10-28 08:12:46 +11:00
f5fedde139
Merge pull request #1125 from liucougar/smart_video_or_image
...
better way of detecting showing image or video in timeline and event view
2015-10-26 08:07:17 +11:00
05a2445b7a
better way of detecting showing image or video in timeline and event view
...
instead of Monitor.VideoWriter, Event.DefaultVideo is used, so even if
VideoWriter/SaveJPEG option is changed, a valid image or video will always be
displayed for historical events in both timeline and event view
this also fixes loading videos in timeline view
2015-10-24 22:22:52 -07:00
a85dda3407
Merge pull request #1124 from baffo32/symlink-install
...
Install nph-zms with FILES so it is listed in install_manifest.txt
2015-10-24 21:55:47 -05:00
44cda8032b
Install nph-zms with FILES so that it is listed in install_manifest.txt and uninstalled with make uninstall
2015-10-24 20:07:42 -04:00
d47edbbb87
Merge pull request #1123 from baffo32/patch-1
...
Stray semicolon causes SQL error. Fixes #1122
2015-10-24 16:06:38 -06:00
d0ce4904ff
Stray semicolon causes SQL error
...
also normalized space around '='
2015-10-24 17:58:20 -04:00
de3e7784d5
Merge pull request #1120 from ZoneMinder/zmupdate-url
...
Update version check URL
2015-10-23 19:02:44 -06:00
e37cf0e218
append /www to docroot for all debian/ubuntu dists
2015-10-23 16:08:32 -04:00
1cce60f6ec
Update version check URL
2015-10-23 11:45:32 -06:00
ac8d9fe76a
Merge pull request #1118 from liucougar/fix_crash_in_ubuntu1404
...
feature-h264-videostorage - Fix segmentation fault in zma with ubuntu 14.04 and ffmpeg 2.5.8 (gcc…
2015-10-23 22:24:26 +11:00
adcd2dfdb5
Merge pull request #1119 from SteveGilvarry/feature-h264-videostorage
...
Merging Master to feature-h264-videostorage
2015-10-23 22:22:37 +11:00
d8494aba2d
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_remote_camera_rtsp.h
web/skins/classic/views/monitor.php
2015-10-23 22:07:22 +11:00
fee883f61a
fix segmentation fault in zma with ubuntu 14.04 and ffmpeg 2.5.8 (gcc 4.8)
...
when libx264 is not installed
2015-10-22 22:52:41 -07:00
5608884bfa
Merge pull request #1116 from ZoneMinder/add-index-to-frames
...
Add index to frames
2015-10-22 13:28:04 -05:00
030792d861
Remove files accidentally added in 9dcb3e1df3
2015-10-22 12:15:38 -06:00
e51ff0677f
Fix typo in Frames index creation. I hope
2015-10-22 12:12:56 -06:00
9dcb3e1df3
Add Index to Frames table. Fixes #1085 .
2015-10-22 11:40:25 -06:00
356fadbff8
Add index to Frames table for people updating
2015-10-22 11:36:55 -06:00
746e695448
Add index to Frames table upon new creation
2015-10-22 11:25:32 -06:00
d0e5dd62b5
Merge pull request #1103 from seebaer1976/patch-6
...
Update preinst
2015-10-16 12:06:44 -04:00
7ebf3de8a2
Update preinst
...
korrektur
2015-10-09 18:13:13 +02:00
8db4c22192
Merge pull request #1100 from seebaer1976/patch-2
...
Update links
2015-10-09 09:23:32 -04:00
729e9536d7
Merge pull request #1101 from seebaer1976/patch-4
...
Update rules
2015-10-09 09:23:13 -04:00
79078f8308
Merge pull request #1102 from seebaer1976/patch-5
...
Update apache.conf
2015-10-09 09:22:55 -04:00
6c51f568a1
Merge pull request #1099 from seebaer1976/patch-3
...
Update preinst
2015-10-09 09:22:36 -04:00
b17819d181
Update apache.conf
...
Update links
2015-10-09 13:50:15 +02:00
b042152694
Update rules
...
update links
2015-10-09 13:48:26 +02:00
4284f8b089
Update preinst
...
Update links
2015-10-09 13:45:19 +02:00
23a6000380
Update links
...
Update links
2015-10-09 13:41:02 +02:00
1d173a9bf0
Merge pull request #1083 from pliablepixels/1082-monitor-orange
...
fixed orange display for monitor mode
2015-10-06 08:36:35 -04:00
98c0f2478e
Merge pull request #1087 from liucougar/fix_timeline_for_SaveJPEGs
...
fix timeline view for SaveJPEGs monitors (without enabled VideoWriter)
2015-10-06 08:36:08 -04:00
1882300a41
Merge pull request #1094 from pliablepixels/1051-zmupdate-versioncompare-problems
...
fixed version compare logic
2015-10-06 08:35:46 -04:00
e0e048fe7e
fixed version compare logic
2015-10-04 09:10:05 -04:00
b74abe88c9
minor centos 7 specfile change
2015-10-03 17:07:22 -05:00
1dbea023b8
Update README.md
...
remove draft note
2015-10-03 15:33:04 -05:00
3242cde0bf
move zm.conf under /etc/zm for Fedora
2015-10-03 13:38:51 -05:00
4fb2bcb393
Fedora specfile changes
2015-10-03 13:21:58 -05:00
e8c4adbcca
Use make macros inside Fedora config files rather than hardcode
2015-10-03 12:54:18 -05:00
6861ea00d2
Add Fedora 22 Target Distro
2015-10-03 12:40:34 -05:00
269e9bd475
Configure Fedora packages for HTTPS
2015-10-03 12:35:22 -05:00
a79d0fc502
update README.fedora
2015-10-03 11:04:58 -05:00
9fae2bdf67
symlink README.https into Fedora folder
2015-10-03 10:45:41 -05:00
59b0675588
only expose monitor info which are being used in client
2015-10-02 20:04:10 -07:00
Heng Liu
Steve Gilvarry
Paul (Jack) Daniels
SteveGilvarry
inflex
Andrew Bauer
baffo32
Kyle Johnson
Isaac Connor
Isaac Connor
seebaer1976
Pliable Pixels
Andrew Bauer