Commit Graph

1345 Commits

Author SHA1 Message Date
m-bene 2784b3d1f5 Merge master 2014-03-20 10:26:12 +01:00
m-bene 2345889d64 include ExtendAlarmFrames in Presets and enable input for preclusive zones only 2014-03-20 09:53:47 +01:00
Andrew Bauer a9c83b5e71 Merge pull request #342 from knnniggett/nagyrobi
Mostly Translation related changes
2014-03-15 08:08:09 -05:00
m-bene 26777487dc add feature to extend preclusive zone alarm state by x frames 2014-03-09 17:05:39 +01:00
Kyle Johnson 5a2009a143 Fix popup sizes in flat skins. Fixes #331 2014-03-03 21:26:18 -05:00
Andrew Bauer 03ded1edd0 Merge remote branch 'nagyrobi/patch-2' into nagyrobi
Conflicts:
	web/lang/hu_hu.php
2014-02-26 09:37:41 -06:00
Andrew Bauer c2b93c3caf Merge remote branch 'nagyrobi/patch-26' into nagyrobi 2014-02-26 09:32:58 -06:00
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
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
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