42c9b4e7a5
Added build notes for CentOS & RHEL
2013-08-17 08:52:24 -05:00
0a911d9d27
The .deps directory shouldn't have been included. Removing it.
...
.deps is generated during configure (or is it make?). Fixes #52
2013-08-15 12:44:10 -04:00
e8fa5694e8
Changing AUTOMAKE_OPTIONS from gnu to foreign to fix automake.
...
In commit 21ee8dbe02
2013-08-15 12:24:02 -04:00
4d6b9f7276
More updates to the Hungarian translation. #Fixes #45
2013-08-15 09:39:45 -04:00
cacf77a183
Merge pull request #37 from nagyrobi/patch-2
...
Update Hungarian translation - thanks to robi / @nagyrobi
2013-08-15 06:26:33 -07:00
0a79e4a975
1.26 Beta did not install SkyIPCam7xx.pm Control Script. Fixes #38
2013-08-15 09:08:51 -04:00
1fa04cc104
Update hu_hu.php
2013-08-14 22:38:37 +02:00
21ee8dbe02
Moved README to markdown language for github display
2013-08-14 12:38:42 -04:00
2df9c25df8
Updated release notes with something meaningful
2013-08-14 12:37:10 -04:00
4a03935d10
Added URLs to mastertheknife and nextime changes
2013-08-14 09:57:31 -04:00
1ed901edd1
Updated the changelog with some of the changes in this release
2013-08-13 14:17:40 -04:00
6c411b5c43
Merge branch 'release-1.26' of https://github.com/ZoneMinder/ZoneMinder into release-1.26
2013-08-13 12:40:03 -04:00
c9425a5626
iI decided to keep this just for reference
2013-08-13 12:39:42 -04:00
ee251b3c02
Removing lingering references to UsedPl
2013-08-13 12:34:59 -04:00
cb97c43ce7
Renamed db update file to match standard.
2013-08-13 11:12:02 -04:00
940f7a191e
add code to add Colours and Deinterlacing to Monitors table. These were added by mastertheknife's perfpatch.
2013-08-13 11:05:20 -04:00
e2da7c37dc
bump version
2013-08-13 10:25:34 -04:00
c014f3faaa
delete generated files
2013-08-13 10:06:37 -04:00
0ec6622a9e
Cleaning up some build errors regarding Native Motion Detection
2013-08-13 09:59:30 -04:00
c3f468eb8c
Fixing zm_image_analyser.h:13:25: fatal error: zm_detector.h: No such file or directory
2013-08-13 09:53:31 -04:00
1888bec092
Doing my best to manually remove nextime's plugin architecture while keeping his other changes.
2013-08-13 09:43:23 -04:00
266b67d0bd
Support for control when monitor source is ffmpeg. This should fix #16 .
2013-08-13 08:34:37 -04:00
3a305522c4
Merge branch 'develop' of github.com:ZoneMinder/ZoneMinder into develop
2013-07-25 11:50:24 -04:00
cdac403fb1
Merge ../zum into develop
...
Conflicts:
AUTHORS
configure.ac
db/zm_create.sql.in
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
scripts/zmupdate.pl.in
src/Makefile.am
src/zm_buffer.cpp
src/zm_config_defines.h
src/zm_event.cpp
src/zm_ffmpeg.h
src/zm_ffmpeg_camera.cpp
src/zm_image.cpp
src/zm_jpeg.h
src/zm_local_camera.cpp
src/zm_logger.cpp
src/zm_mem_utils.h
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_mpeg.cpp
src/zm_remote_camera_http.cpp
src/zm_remote_camera_rtsp.cpp
src/zm_rtsp.cpp
src/zm_sdp.cpp
src/zm_sdp.h
src/zm_stream.cpp
src/zm_thread.cpp
src/zm_thread.h
src/zm_threaddata.cpp
src/zm_user.cpp
src/zm_user.h
src/zm_utils.cpp
src/zm_zone.cpp
src/zm_zone.h
web/includes/actions.php
web/lang/big5_big5.php
web/lang/cn_zh.php
web/lang/cs_cz.php
web/lang/de_de.php
web/lang/dk_dk.php
web/lang/en_gb.php
web/lang/es_ar.php
web/lang/et_ee.php
web/lang/fr_fr.php
web/lang/he_il.php
web/lang/hu_hu.php
web/lang/it_it.php
web/lang/ja_jp.php
web/lang/nl_nl.php
web/lang/pl_pl.php
web/lang/pt_br.php
web/lang/ro_ro.php
web/lang/ru_ru.php
web/lang/se_se.php
web/skins/classic/js/skin.js
web/skins/classic/views/js/monitor.js.php
web/skins/classic/views/monitor.php
web/skins/classic/views/zone.php
2013-07-25 11:49:55 -04:00
bb19e80fa8
Support for control when monitor source is ffmpeg. This should fix #16 .
...
Some IP cameras need the source set to ffmpeg even though they are remote
cameras. These cameras do have a remote PTZ interface, but previously
when the monitor source was set to ffmpeg, the only control type
available was 'none'.
2013-06-15 19:50:19 -04:00
118e607839
clean
2013-05-10 14:03:17 -04:00
3a8481a591
cleanup
2013-05-10 14:02:22 -04:00
a468baf9eb
cleanup
2013-05-10 13:55:45 -04:00
2cd0237863
add some lines to create /var/run/zm. These day /run is a tmpfs, so the zm dir needs to be created on each boot
2013-05-10 13:42:09 -04:00
9d89fb3bcb
Merge branch 'kfir-proper' into develop
2013-05-10 12:23:58 -04:00
0a3ffb5e2e
fix control types dropdown for a new monitor
2013-05-09 14:11:20 -04:00
0da26d4f75
add a Controls preset for Airlink SkyIPCam 7xx cameras
2013-05-09 09:14:01 -04:00
7cf5475542
Merge ../ZoneMinder-kfir into kfir-proper
...
Conflicts:
configure
src/Makefile.am
src/Makefile.in
2013-05-02 21:28:51 -04:00
2c04d0774f
Reverting my web changes in develop - keeping them in modern
2013-05-02 10:20:06 -04:00
a16054b33f
Removed an HTML comment and changed the heading from 1 to 2.
2013-05-01 08:24:42 -03:00
31902af09a
Update README.md
2013-05-01 08:04:57 -03:00
5354ec12e1
Merge branch 'modern' into develop
2013-05-01 07:03:10 -04:00
9d5243ccab
Initial commit of Event Model, View and Controller with basic support for drilling into an event
2013-05-01 07:02:12 -04:00
8322dc390f
Initial commit of CakePHP 2.3.4
2013-05-01 06:58:31 -04:00
1ed6462354
Removed all of the old web files
2013-05-01 06:52:43 -04:00
e37a49b511
add the debian directory with stuff to build a debian package
2013-04-29 16:46:56 -04:00
044af38cdb
match up #if's regarding gnutls-openssl
2013-04-29 16:44:37 -04:00
c0e634d856
add a check for gnutls-openssl which is required to add the -lgnutls-openssl to the compile line to make it compile
2013-04-29 16:43:49 -04:00
ce61512a0d
gnutls changes from ubuntu package
2013-04-29 15:32:55 -04:00
0913287ee1
gnutls changes from ubuntu package
2013-04-29 15:32:16 -04:00
36f25c7ffb
add -fno-inline from ubuntu package
2013-04-29 15:31:55 -04:00
ca4e6b455e
look for script in installed bath, not build location
2013-04-29 13:46:37 -04:00
1c3f6a9637
fix typos
2013-04-29 13:45:27 -04:00
0967797933
add unistd.h to fix compile
2013-04-29 13:44:21 -04:00
6db183a5ba
add mathetmatics.h to fix compile
2013-04-29 13:43:48 -04:00
Andy
Kyle Johnson
nagyrobi
Isaac Connor
Isaac Connor