Kfir Itzhak
5a256eb96f
Merge pull request #256 from Phhere/patch-1
...
Fix checkJsonError messages
2013-12-04 04:58:39 -08:00
Kfir Itzhak
219ada85c0
Merge pull request #257 from Phhere/patch-2
...
Network Detection Support for Wansview
2013-12-01 16:04:56 -08:00
Kfir Itzhak
23ff4023bd
Removed installation of web/README.md from cmake
2013-12-02 01:53:21 +02:00
Kfir Itzhak
783bf4b8ab
Fixed web/skins/*/includes/config.php not being installed
2013-12-02 01:52:26 +02:00
Philipp Rehs
55dadcf758
Network Detection Support for Wansview
...
Basis support for Wansview Cams
Tested with NC541W
2013-11-30 20:46:59 +01:00
Philipp Rehs
d4babd23f1
Fix checkJsonError messages
...
The $value string was not set inside checkJsonError, so it was not possible to see the data which caused the error
2013-11-30 18:13:02 +01:00
Kfir Itzhak
55ea6745f1
Revert "Correctly fix mootools symlinks being installed twice in cmake this time"
...
This reverts commit 89689d8f3f
.
2013-11-22 23:50:59 +02:00
Kfir Itzhak
89689d8f3f
Correctly fix mootools symlinks being installed twice in cmake this time
2013-11-22 20:23:58 +02:00
Kfir Itzhak
17129cf078
Fix minor bug introduced by commit cfc9a73851: Do not install mootools symlinks twice for out-of-source installations
2013-11-17 15:15:54 +02:00
Kfir Itzhak
91d42a86cf
Merge branch 'cmakemootoolsfix'
2013-11-13 16:59:46 +02:00
Kfir Itzhak
47179f793d
Fix make install failing to install mootools symlinks in an out-of-source build
2013-11-13 16:52:01 +02:00
Kfir Itzhak
cfc9a73851
Fixed not installing mootools symlinks in an out-of-source build
2013-11-08 18:54:46 +02:00
Isaac Connor
b8f075499b
fix for debian bug #725840 Javascript errors in updateButtons function of filter.js
...
Also a slight optimisation using else's instead of continuing to evaluate after the true value has been set.
2013-11-08 11:47:19 -05:00
Kfir Itzhak
be21a882ab
Merge pull request #242 from ZoneMinder/removeversionnumberfromzm.conf
...
Remove ZM_VERSION from zm.conf
2013-11-04 12:27:50 -08:00
Kfir Itzhak
9d5ac7ae8c
Fix cmake installing wrong files in an out-of-source build
2013-11-04 09:56:40 +02:00
Isaac Connor
4565068093
Merge pull request #233 from fastolfe/zone-marker-overflow
...
Fix marker-out-of-bounds crash when defining zone points
2013-11-03 13:10:07 -08:00
Isaac Connor
3fa91a30a3
allow the value side of config lines potentially be empty.
2013-11-03 15:52:37 -05:00
David Nesting
b368d306b9
Fix marker-out-of-bounds crash when defining zone points
2013-11-02 15:56:42 -07:00
Isaac Connor
72b80d7417
remake this branch off master instead of off mysql2PDO.
...
Establish an automake substitution of @VERSION@ and use it throughotu to override whatever is in zm.conf
2013-11-01 09:47:28 -04:00
Kfir Itzhak
c2bd7c97ec
First attempt at enabling out-of-source building for zm with cmake
2013-10-31 18:10:00 +02:00
Isaac Connor
355c10c3a4
fix error when strict modes is on.
2013-10-17 17:02:17 -04:00
Isaac Connor
870a59bed4
fix missing <?php. The missing full size tag makes the file fail when short tags are turned off
2013-10-17 14:23:25 -04:00
Kyle Johnson
7bf4de37de
Merge pull request #211 from kylejohnson/master
...
ZoneMinder Dutch Translation updates by Alco (a.k. nightcrawler)
2013-10-15 13:23:57 -07:00
kjohnson
dff5b3aeb0
ZoneMinder Dutch Translation updates by Alco (a.k. nightcrawler)
2013-10-14 09:27:01 -04:00
Isaac Connor
34f84a4097
Merge branch 'v1.26.4-beta'
2013-10-03 10:14:09 -04:00
mastertheknife
48f11a8064
Add cmake to zoneminder
2013-09-28 12:59:50 +03:00
Isaac Connor
7e91053761
increase the hegiht of the window a bit, the contents are larger
2013-09-23 10:03:33 -04:00
Knniggett
6d00540b5d
Improve Chrome browser support & log streaming events
2013-09-21 14:52:41 -05:00
Isaac Connor
b08a8252c4
Merge branch 'dukess-master' into v1.26.4-beta
...
Conflicts:
scripts/zmupdate.pl.in
2013-09-18 13:03:54 -04:00
Isaac Connor
c9ad6e661a
Merge branch 'master' of https://github.com/dukess/ZoneMinder into dukess-master
2013-09-18 12:57:26 -04:00
Serguei S. Dukachev
ed9f647dd7
Update actions.php
...
SQL-ERR 'Incorrect integer value: '' for column 'Enabled' at row 1', statement was 'update Monitors set Function = 'Monitor', Enabled = '' where Id = '2''
2013-09-13 03:48:01 -07:00
Richard Kojedzinszky
0f5c90bbe4
Rewritten the query to allow mysql to use indexes
...
On a system with heavy logging, without this the login procedure took
too long.
2013-09-12 22:46:26 +02:00
Isaac Connor
ab1314f250
clean out autogenerated files
2013-09-12 14:43:57 -04:00
Isaac Connor
fcf7e5b188
Redo the patch that added the <0 test. Since it isn't an actual error there won't be an error message set so I've made it another case entirely.
2013-09-12 13:54:03 -04:00
Isaac Connor
0a9e63ca2c
remove autogenerated files
2013-09-06 14:40:55 -04:00
Kyle Johnson
c8ad6ae656
Fixes #107 for real this time.
2013-09-05 20:31:52 -04:00
Kyle Johnson
c02d496d23
More CakePHP cleanup - missed it in 2c04d0774f
2013-09-05 10:52:55 -04:00
Kyle Johnson
d47aaec775
Merge pull request #92 from knnniggett/patch-9
...
Update getBrowser() to match IE10
2013-09-03 06:38:13 -07:00
Kyle Johnson
2f92689d7e
Resolving CVE-2013-0232 - this should fix #93 .
2013-08-30 21:53:19 -04:00
Andy
de51926434
Update getBrowser() to match IE10
...
Updates the preg_match expression to match Internet Explorer 10. The previous pattern would not detect IE10, and hence zoneminder would not attempt to stream via Cambozola, which leaves IE10 users looking at a broken link.
NOTE: There is another file in the zoneminder source tree, AssetDispatcher.php, that also uses the same pattern match expression. It is part of the Cake folder, which I am not familiar with. Please advise if we should edit that file as well.
2013-08-29 17:41:20 -05:00
Kyle Johnson
4d6b9f7276
More updates to the Hungarian translation. #Fixes #45
2013-08-15 09:39:45 -04:00
nagyrobi
1fa04cc104
Update hu_hu.php
2013-08-14 22:38:37 +02:00
Kyle Johnson
ee251b3c02
Removing lingering references to UsedPl
2013-08-13 12:34:59 -04:00
Isaac Connor
266b67d0bd
Support for control when monitor source is ffmpeg. This should fix #16 .
2013-08-13 08:34:37 -04:00
Isaac Connor
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
Kyle Johnson
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
Isaac Connor
3a8481a591
cleanup
2013-05-10 14:02:22 -04:00
Isaac Connor
a468baf9eb
cleanup
2013-05-10 13:55:45 -04:00
Isaac Connor
9d89fb3bcb
Merge branch 'kfir-proper' into develop
2013-05-10 12:23:58 -04:00
Isaac Connor
0a3ffb5e2e
fix control types dropdown for a new monitor
2013-05-09 14:11:20 -04:00