Andrew Bauer
|
fa835359a1
|
Add install target for C binary man pages
|
2015-06-20 17:33:13 -05:00 |
SteveGilvarry
|
9b06b1399c
|
Merge branch 'master' into feature-h264-videostorage
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
src/zm_ffmpeg_camera.cpp
web/skins/classic/views/event.php
web/skins/classic/views/monitor.php
web/skins/classic/views/timeline.php
|
2015-06-10 23:09:30 +10:00 |
|
Andrew Bauer
|
4cb8cf8681
|
remove commented commands
|
2015-04-12 11:48:49 -05:00 |
|
Andrew Bauer
|
3a3f186e74
|
update working_directory
|
2015-04-12 11:48:18 -05:00 |
|
Andrew Bauer
|
8f337999d4
|
remove nph-zms target
|
2015-04-12 11:47:28 -05:00 |
|
Andrew Bauer
|
3108fd2109
|
link nph-zms rather than build
|
2015-04-12 11:00:43 -05:00 |
|
SteveGilvarry
|
bf33eab17c
|
Merge branch 'video' into feature-h264-videostorage
Conflicts:
src/CMakeLists.txt
src/Makefile.am
src/zm_event.cpp
web/skins/classic/views/js/event.js
|
2014-12-02 20:58:35 +11:00 |
Isaac Connor
|
69090563d5
|
Merge branch 'master' into video
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
|
2014-11-28 14:23:05 -05:00 |
|
Isaac Connor
|
70c63bd394
|
Merge branch 'master' into storageareas
Conflicts:
db/zm_create.sql.in
distros/debian/control
distros/ubuntu1204/changelog
src/CMakeLists.txt
src/zm_config_defines.h
src/zm_monitor.h
|
2014-11-19 14:11:39 -05:00 |
m-bene
|
32f05ada86
|
add digest auth file for cmake
Conflicts:
src/CMakeLists.txt
|
2014-10-13 16:51:21 +11:00 |
stevegilvarry
|
189f6cba54
|
Add zm_videostore.cpp to CMakeLists.txt
|
2014-05-30 13:31:49 +10:00 |
|
m-bene
|
e25420efaa
|
add digest auth file for cmake
|
2014-04-29 17:31:06 +02:00 |
Kfir Itzhak
|
0d7c52dc1f
|
Merge remote branch 'origin/master' into video
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
|
2014-04-17 13:26:00 +03:00 |
|
Kfir Itzhak
|
bf708a8373
|
Merge branch 'master' into curl
Conflicts:
CMakeLists.txt
src/CMakeLists.txt
src/zm_camera.h
src/zm_monitor.cpp
web/skins/classic/views/console.php
web/skins/classic/views/monitor.php
|
2013-12-27 14:21:12 +02:00 |
|
Kfir Itzhak
|
e652441996
|
Merge remote-tracking branch 'origin/master' into video
Conflicts:
configure.ac
src/CMakeLists.txt
|
2013-12-26 21:03:45 +02:00 |
|
Kfir Itzhak
|
89cfb96855
|
Merge pull request #277 from ebarnard/libvlc
Add libVLC source type
|
2013-12-22 13:01:19 -08:00 |
|
Kfir Itzhak
|
e9bb632a78
|
Remove zmfix
|
2013-12-22 16:08:17 +02:00 |
Edward Barnard
|
3321506b45
|
Working libvlc camera implementation.
|
2013-12-19 21:51:39 +00:00 |
|
Kfir Itzhak
|
2b79ff2cbd
|
Initial commit for saving events as videos :)
|
2013-12-19 18:38:07 +02:00 |
|
Isaac Connor
|
8bd8e326bc
|
add storage
|
2013-12-13 13:45:00 -05:00 |
|
Kfir Itzhak
|
c1970a51e3
|
Fix few errors and syntax errors regarding curl
|
2013-11-04 17:10:07 +02:00 |
|
Kfir Itzhak
|
c2bd7c97ec
|
First attempt at enabling out-of-source building for zm with cmake
|
2013-10-31 18:10:00 +02:00 |
|
mastertheknife
|
48f11a8064
|
Add cmake to zoneminder
|
2013-09-28 12:59:50 +03:00 |