Commit Graph

1475 Commits

Author SHA1 Message Date
Andrew Bauer 9a298a2af2 Copy nagyrobi's localization changes from en_gb verbatim to the other language files. 2014-02-26 09:30:57 -06:00
Andrew Bauer c119c49cd9 Merge remote branch 'nagyrobi/patch-25' into nagyrobi 2014-02-26 09:21:38 -06:00
Andrew Bauer fb698a6755 Merge remote branch 'nagyrobi/patch-23' into nagyrobi 2014-02-26 09:17:14 -06:00
Andrew Bauer 5b1c79e3d0 Merge remote branch 'nagyrobi/patch-22' into nagyrobi 2014-02-26 09:16:51 -06:00
Andrew Bauer 1dd8dc4aa6 Merge remote branch 'nagyrobi/patch-21' into nagyrobi 2014-02-26 09:15:47 -06:00
Andrew Bauer f435435481 Merge remote branch 'nagyrobi/patch-17' into nagyrobi 2014-02-26 09:15:05 -06:00
Andrew Bauer b4679f0a8c Add the ability to set up the Date and time formats by the language files, according to that language's regionals.
The patch allows to set up a global default, in case the language file doesn't contain the date and time definitions.

These definitions are removed from here and added with checking option to the later stage after loading the language files.
2014-02-26 09:14:04 -06:00
Andrew Bauer 805981e06a Merge remote branch 'nagyrobi/patch-4' into nagyrobi
Conflicts:
	web/skins/classic/js/skin.js
2014-02-26 09:04:19 -06:00
Andrew Bauer 18d56e20aa Merge remote branch 'nagyrobi/patch-13' into nagyrobi 2014-02-26 08:46:21 -06:00
Andrew Bauer dee44c8f8d Merge remote branch 'nagyrobi/patch-12' into nagyrobi 2014-02-26 08:45:57 -06:00
Andrew Bauer 5ac8a5cc99 New localization strings from Nagyrobi copied verbatim from en_gb 2014-02-26 08:38:47 -06:00
Andrew Bauer 0258579ef3 Merge remote branch 'nagyrobi/patch-10' into nagyrobi 2014-02-26 08:25:16 -06:00
Andrew Bauer 4196783d97 Increased table width just a little bit, to prevent the longer foreign language translated strings to break window layouts. 2014-02-26 07:56:31 -06:00
Andrew Bauer c899de65a4 Merge remote branch 'nagyrobi/patch-5' into nagyrobi 2014-02-26 07:55:36 -06:00
Andrew Bauer 26be1bd041 Fix builtin authentication issue caused by commit 6e5d927 2014-02-14 18:56:27 -06:00
Andrew Bauer d20e0ee2e7 Temporary workaround to show all ptz control types regardless of monitor source type. 2014-02-13 08:43:19 -06:00
Kyle Johnson 6e9da046b8 Fixed additional Makefile.am pointing to classic skin in flat skin 2014-01-27 14:26:03 -05:00
Kyle Johnson 6f5c9182ce Add paths to flat skin in configure.ac and Makefile.am 2014-01-24 13:58:51 -05:00
Andrew Bauer 4fe4a028f6 Update Makefile.am
Add flat skin to makefile
2014-01-23 14:29:35 -06:00
Justin Lawrence e8f831c055 Flat theme: rename new theme from classic copy to flat 2014-01-22 16:33:40 +02:00
Justin Lawrence 23f69de826 Flat theme: css changes 2014-01-22 16:32:14 +02:00
Justin Lawrence ce825067a8 Flat theme 2014-01-22 16:24:06 +02:00
Kfir Itzhak b2a65dc343 cURL minor corrections and improvements 2014-01-10 09:17:12 +02:00
Kfir Itzhak 9901ce9e84 Merge remote branch 'origin/master' into curl 2014-01-05 10:16:01 +02:00
Kfir Itzhak a962815624 Change default alarm blend percent to 6 and make upgrades smooth by copying the existing blend percent to the alarm one 2014-01-05 08:59:09 +02:00
Isaac Connor 6e5d9272e0 supposed to fix #296 2014-01-03 18:33:01 -05:00
Isaac Connor b3af313370 Merge pull request #282 from scottgrobinson/master
Add zmMontageScale so montage scale is also 'saved'
2014-01-02 11:18:39 -08:00
Adam J. Henry e6b9b8218b Enclose value of the Notes attribute with quotes. 2013-12-31 17:32:20 -06:00
Kfir Itzhak ff9a26273c cURL is now working! 2013-12-27 18:02:32 +02: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 89cfb96855 Merge pull request #277 from ebarnard/libvlc
Add libVLC source type
2013-12-22 13:01:19 -08:00
Scott Robinson 375d67cdf2 Update montage.php
Make use of new zmMontageScale cookie
2013-12-22 20:56:18 +00:00
Scott Robinson db41693fd6 Update montage.js
save montage scale % as cookie
2013-12-22 20:53:09 +00:00
Isaac Connor 7b26636bcd Merge pull request #280 from ZoneMinder/zmfixremoval
Remove zmfix
2013-12-22 11:22:18 -08:00
Miklos Marton 5de638214b In the web/includes/functions.php there were some html formatting errors in the outputVideoStream function.
These errors were:
- Unclosed object and embed tags
- param tags without closing tags

These errors lead to rendering errors when using the mobile skins with some specific streaming options.
2013-12-22 15:17:21 +01:00
Kfir Itzhak e9bb632a78 Remove zmfix 2013-12-22 16:08:17 +02:00
Edward Barnard 14024451e5 Monitor link now displays for all valid libvlc paths. 2013-12-22 01:29:40 +00:00
Edward Barnard 3201e5a431 Adds web ui support for libvlc camera. 2013-12-19 21:51:39 +00:00
Isaac Connor 0c58957e04 fixes 2013-12-17 14:58:06 -05:00
Isaac Connor 003b8c9868 more removal of escaping 2013-12-17 14:38:08 -05:00
Isaac Connor 9f5b8bb03b Merge branch 'mysql2PDO' of github.com:ZoneMinder/ZoneMinder into mysql2PDO 2013-12-17 14:33:46 -05:00
Isaac Connor 20f1b460ee fix 2013-12-17 14:30:56 -05:00
Kyle Johnson cad33ddb96 Removed embedded jquery, instead include by <script>. Fixes #274 2013-12-17 13:41:55 -05:00
Kyle Johnson 1a744ebed6 Added jquery 1.4.2.min.js to the classic skin's js dir 2013-12-17 13:41:36 -05:00
Isaac Connor 3393a63525 more updates 2013-12-17 12:53:15 -05:00
Isaac Connor 4c348cf159 more updates 2013-12-17 11:16:20 -05:00
Isaac Connor ceca805b48 more updates 2013-12-17 11:07:19 -05:00
Isaac Connor 1c028e5806 use parameter passing and remove extra escsaping 2013-12-16 16:52:30 -05:00
Kyle Johnson f39f2fab66 Merge pull request #241 from ZoneMinder/alarmrefblendoption
Add alarm reference image blend percentage option and replace the text field if fast blends are enabled
2013-12-13 10:13:34 -08:00
Philipp Rehs 529c124a9c Detection Support for WansView Cams
Support for detection of Wansview Cams which are connected by lan
2013-12-11 11:29:30 +01:00
Kfir Itzhak e9f4479171 Added support for UYVY capture palette (required for some Bluecherry cards) 2013-12-10 15:13:48 +02:00
Isaac Connor 00e2b05130 Merge branch 'mysql2PDO' of github.com:ZoneMinder/ZoneMinder into mysql2PDO 2013-12-06 15:52:43 -05:00
Isaac Connor a2a3bda2e1 remove unneccessary quoting and escaping 2013-12-06 15:51:36 -05:00
Isaac Connor 86b04d0e6f fixup dbFetchMOnitor 2013-12-06 14:22:07 -05:00
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
Isaac Connor e4ea12a5ca Merge branch 'mysql2PDO' of github.com:ZoneMinder/ZoneMinder into mysql2PDO 2013-11-13 10:13:42 -05:00
Isaac Connor 1519db78ce add ServerHost filter 2013-11-13 10:13:09 -05:00
Isaac Connor 969918781f more updates, currently the log updates are not enough. Filtering does not work. 2013-11-13 10:11:16 -05: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
Isaac Connor a155082997 use parameter passing instead of esacping 2013-11-12 15:39:29 -05: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
Isaac Connor 463d8a136f Merge branch 'master' into mysql2PDO
Conflicts:
	zm.conf.in
2013-11-08 11:22:09 -05:00
Isaac Connor 03809cfa0f improve error reporting 2013-11-07 10:58:27 -05:00
Isaac Connor 4c6c415f02 fix: wrote dbCon instead of dbConn 2013-11-07 10:03: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
Isaac Connor 51455b5c85 more updates and removal of escaping and quoting 2013-11-04 12:43:34 -05:00
Kfir Itzhak f73585dbaa Few web interface corrections regarding cURL 2013-11-04 17:28:15 +02:00
Kfir Itzhak 8e96df7643 Initial work on adding cURL to zoneminder 2013-11-04 16:52:21 +02:00
Kfir Itzhak fd656c55cf Changed default blend percentages and the dropdown list for alarm reference image blend 2013-11-04 12:10:53 +02: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 7989e8e980 Merge branch 'master' into mysql2PDO 2013-11-03 16:07:37 -05:00
Isaac Connor 2d0f4dffd1 Fix a missing NULL second paramter to dbFetchAll 2013-11-03 16:06:31 -05:00
Isaac Connor 6c6da67427 Merge branch 'master' into mysql2PDO 2013-11-03 15:57:45 -05:00
Isaac Connor 3fa91a30a3 allow the value side of config lines potentially be empty. 2013-11-03 15:52:37 -05:00
Isaac Connor 59b841958d use parameter passing instead of explicit exscaping 2013-11-03 15:40:00 -05:00
Kfir Itzhak 833705b613 Added alarm blend percent (useful for controlling how long an alarm lasts) and a dropdown list is used now if ZM_FAST_IMAGE_BLENDS is enabled 2013-11-03 10:26:04 +02:00
David Nesting b368d306b9 Fix marker-out-of-bounds crash when defining zone points 2013-11-02 15:56:42 -07:00
Isaac Connor 93560652f1 make sortorder be asc or desc, not something arbitrary which needs to be escaped
other fixes to use parameter passing to PDO instead of escaping them ourselves
2013-11-01 12:30:07 -04: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 ae51ac5519 redo changes to use new dbFetch functions with parameter arrays 2013-10-18 14:24:08 -04:00
Isaac Connor 7fdb933d6b rework dbQuery, dbFetchOne to take a parameters array, and use it 2013-10-18 14:15:24 -04:00
Isaac Connor cde89a7144 more quoting removal, some slight optimisations 2013-10-17 21:03:24 -04:00
Isaac Connor 92591a6835 more removal of quotes 2013-10-17 17:05:50 -04:00
Isaac Connor ef765afa2d Merge branch 'master' into mysql2PDO 2013-10-17 17:02:44 -04:00
Isaac Connor 355c10c3a4 fix error when strict modes is on. 2013-10-17 17:02:17 -04:00
Isaac Connor 60e2703637 fix missing n 2013-10-17 17:01:37 -04:00
Isaac Connor 09fbdc9e35 forget the updates to this file 2013-10-17 16:57:05 -04:00
Isaac Connor 2a45506bff more quoting removal 2013-10-17 16:15:04 -04:00
Isaac Connor 0979830b91 more removal of exra quotes 2013-10-17 15:54:17 -04:00
Isaac Connor 36c4fad644 remove extra quoets since dbEcape does quoting now 2013-10-17 15:35:23 -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
Isaac Connor 92d22b5202 Merge branch 'master' into mysql2PDO 2013-10-16 16:58:33 -04:00
Isaac Connor b126c5ae7e fix typo 2013-10-16 16:55:24 -04:00
Isaac Connor 9e2d7cfd24 initial convert to PDO with no testing 2013-10-16 16:07:58 -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
nagyrobi 9f1268df38 Update hu_hu.php
This one contains updates related to all the earlier pull requests.
Had to change the entire file due to charset encoding reasons.
2013-08-16 15:40:50 +02:00
nagyrobi bd4aae4c1e Update console.php
Fix the bandwidth status sentence on the top of the console window, the last word is different than the universal 'bandwidth' word in many other languages.
2013-08-16 14:08:38 +02:00
nagyrobi 8a3850ac11 Update en_gb.php
Enable localization of the monitor function names in the console, function window and monitor settings window.

Fix the bandwidth status sentence on the top of the console window, the last word is different than the universal 'bandwidth' word in many other languages.
2013-08-16 14:06:40 +02:00
nagyrobi a186981278 Update monitor.php
Enable localization of the monitor function names in the monitor settings window.
2013-08-16 13:48:25 +02:00
nagyrobi 0c098e2b0f Update function.php
Enable localization of the monitor function names in the function window.
2013-08-16 13:41:33 +02:00
nagyrobi ff9cbeff6b Update console.php
Enable localization of the monitor function names in the console.
2013-08-16 13:39:42 +02:00
nagyrobi 60ea6a387d Update lang.php
Add the ability to set up the Date and time formats by the language files, according to that language's regionals.
The patch allows to set up a global default, in case the language file doesn't contain the date and time definitions.

Here we look if the constants are already defined or not, if they are not, define them to the original defaults.
2013-08-16 12:05:33 +02:00
nagyrobi bc18a27072 Update skin.js
Increased popup window sizes just a little bit, to prevent the longer foreign language translated strings to break window layouts.

Fine-tuned again, I hope that's the final one :-)
2013-08-16 10:13:35 +02:00
nagyrobi 9c7653ca68 Update timeline.php
Enable localization of the usage instructions in the Timeline window.
2013-08-15 18:58:08 +02:00
nagyrobi 8ce4d302dd Update montage.php
Enable localization of the dropdown box items in the montage window.
2013-08-15 18:56:01 +02:00
nagyrobi 150cf5ae80 Update en_gb.php
Added a couple of localized strings.
These need to be added to each language file too!
2013-08-15 18:52:14 +02:00
Kyle Johnson 4d6b9f7276 More updates to the Hungarian translation. #Fixes #45 2013-08-15 09:39:45 -04:00
nagyrobi 2b0647a52c Update skin.css
Increased table width just a little bit, to prevent the longer foreign language translated strings to break window layouts.
2013-08-15 12:48:04 +02: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 3a305522c4 Merge branch 'develop' of github.com:ZoneMinder/ZoneMinder into develop 2013-07-25 11:50:24 -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
Isaac Connor 7cf5475542 Merge ../ZoneMinder-kfir into kfir-proper
Conflicts:
	configure
	src/Makefile.am
	src/Makefile.in
2013-05-02 21:28:51 -04:00
Kyle Johnson 2c04d0774f Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
Kyle Johnson a16054b33f Removed an HTML comment and changed the heading from 1 to 2. 2013-05-01 08:24:42 -03:00