7d97ecb9c9
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-11-23 10:40:08 -05:00
4126f1f072
Merge pull request #1168 from knnniggett/swap_path
...
fix mem alloc fault in zm_monitor.cpp
2015-11-21 22:13:47 -05:00
dabe32a593
Error on missing submodules
2015-11-21 18:21:18 -06:00
79d486b5aa
Test Example of 1.29 Changelog
2015-11-22 10:21:38 +11:00
3112fe6279
Merge remote-tracking branch 'ZoneMinder/master'
2015-11-22 10:13:42 +11:00
cbfdc5d88d
rpm packaging updates
2015-11-21 15:23:13 -06:00
e65f91d404
update rpm documentation
2015-11-21 15:18:43 -06:00
a9609d2a43
fix mem alloc fault in zm_monitor.cpp
2015-11-21 12:17:23 -06:00
4d6c4355db
Merge branch 'master' into multi-server
2015-11-20 16:07:50 -05:00
37b041b561
add index to recommended default permissions on zmuser
2015-11-20 16:00:57 -05:00
5ea11a8bfe
use webvvt to overlay timestamp (honoring Monitor.LabelFormat) to videos in timeline and event
...
also fixed bug which prevented seeking in timeline video preview
2015-11-18 21:21:56 -08:00
f01b0e84e8
Merge remote-tracking branch 'ZoneMinder/master'
2015-11-18 23:15:38 +11:00
9052274d0d
Update rpm documentation to reference index permission
2015-11-17 12:20:51 -06:00
c0216f74cb
Merge pull request #1164 from abishai/master
...
compat for php 5.4. Fixes #1163
2015-11-16 09:28:03 -07:00
5add10289b
Merge pull request #1136 from pliablepixels/1135-events-API-prev-next
...
added prev/next event ids
2015-11-16 09:23:36 -07:00
7f5958d873
remove comma that shouldn't be there
2015-11-16 11:01:41 -05:00
f322bde35c
increase version to 109 because I at some point pushed a db update script
2015-11-16 11:01:11 -05:00
e00049f17a
change format to native
2015-11-16 09:30:09 -05:00
551194227d
compat for php 5.4
2015-11-15 21:40:25 +00:00
a0d4934b84
Have PDO actually throw exceptions on db errors. Prior to this it would have been just failing silently. Also, fix a . to -> in the exception catcher.
2015-11-11 16:56:28 -05:00
0ee7b3d729
add hostname to Servers table
2015-11-11 16:54:41 -05:00
5e70146b0e
Monitor->Frames, since we are updating Frames
2015-11-11 16:43:57 -05:00
fc85ccbf5f
Set value for Hostname to avoid php warning. fix save button. Can't use it to pass action value because it gets translated.
2015-11-11 16:43:23 -05:00
ab7aa392f4
Merge pull request #1157 from ZoneMinder/fix_1156
...
remove comment at end of line
2015-11-10 14:11:49 -06:00
d231ac4533
remove comment at end of line
2015-11-10 14:46:12 -05:00
b123de3b54
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-11-10 14:45:24 -05:00
d5cc602bfa
Merge branch 'master' into multi-server
2015-11-09 12:36:34 -05:00
16274e46bc
grant create,index to zmuser when updating
2015-11-09 12:36:26 -05:00
ac76d224b8
grant create,index to zmuser when updating
2015-11-09 12:36:23 -05:00
82edfc2f16
grant create,index to zmuser when updating
2015-11-09 12:34:24 -05:00
6b994132f1
grant create,index to zmuser when updating
2015-11-09 12:34:11 -05:00
49a89b75a8
More verbose error reporting
2015-11-09 16:15:53 +01:00
3479af78bd
Add more verbose help
2015-11-06 13:36:29 -05:00
92401193a7
Add missing semicolon
2015-11-06 11:19:12 -05:00
ced0240fc3
Use the ssmtp path set in options first. shell command if ssmtp path empty. display debug suggesting set ssmtp path in option.
2015-11-06 10:43:30 -05:00
e8f31d7451
Merge pull request #1147 from SteveGilvarry/RTSPBuildWarning
...
Reorder RTSPDescribe to avoid -wreorder warnings
2015-11-05 10:33:59 -06:00
1e5c82937c
Merge pull request #1148 from SteveGilvarry/FixMergeRegression
...
Add FFMPEGInit back to feature-h264-videostorage
2015-11-05 19:39:20 +11:00
6002f251c0
Add FFMPEGInit back
2015-11-05 19:36:11 +11:00
477e63a878
Reorder RTSPDescribe to avoid -wreorder warnings
2015-11-05 17:19:58 +11:00
db6aab2071
Merge pull request #1145 from liucougar/merge_with_master
...
Merging master to feature-h264-videostorage
2015-11-05 16:37:15 +11:00
44f63443c1
video branch ffmpeg 2.9 fixes
...
ffmpeg 2.9 patched removed SSE2 CPU
2015-11-04 14:43:45 -08:00
4e263f5913
Merge branch 'master' into feature-h264-videostorage
...
Conflicts:
src/zm_ffmpeg.h
2015-11-04 14:39:52 -08:00
7cbad44ae4
also return the prev and next events for the same monitor as the current event
2015-11-04 14:23:28 -05:00
1f1b48ed51
Added Vivotek ePTZ control to zm_create.sql
2015-11-04 19:17:47 +01:00
b611d9fcae
Bump database version to 1.28.109
2015-11-04 17:29:37 +01:00
330e0d7adf
Add Vivotek ePTZ control module to database
2015-11-04 17:29:07 +01:00
a942b22541
Add camera control module for Vivotek ePTZ protocol
2015-11-04 17:12:07 +01:00
80d3e0be80
Merge pull request #1139 from SteveGilvarry/Travis_ffmpeg2.8.1
...
Update Travis to ffmpeg 2.8.1 for testing
2015-11-04 10:01:20 -06:00
11f10e5e7c
Merge pull request #1142 from SteveGilvarry/pr/1137
...
Update to #1137 for backward compatibility.
2015-11-04 09:59:57 -06:00
4c773472bd
Add support for IPv6 in RTSP code
...
Monitors with source type 'remote' can now be accessed over IPv6. This
code uses getaddrinfo(3) now instead of gethostbyname(3) - and changes a
lot of networking stuff which should be tested thoroughly.
2015-11-04 16:41:47 +01:00
Isaac Connor
Isaac Connor
Andy Bauer
Steve Gilvarry
Andrew Bauer
Heng Liu
Kyle Johnson
abishai
Robin Daermann
dreaddy
SteveGilvarry
Pliable Pixels