Isaac Connor
eb5f299512
increase max_socket_tries to 10 as #470
2014-07-11 10:51:24 -04:00
Isaac Connor
8f88e2a6c0
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-07-08 10:54:16 -04:00
Isaac Connor
2be38d7f32
fix problem editing users, a semi-colon screwed up the if statement.
...
Also change behaviour so that if a user is specified, and doesn't load, generate an error.
This also removes a search for empty user id in the db
2014-07-08 10:52:55 -04:00
Andrew Bauer
371c1bae3d
Merge pull request #359 from knnniggett/eyezm
...
fix eyezm authentication issue
2014-07-07 17:57:48 -05:00
Andrew Bauer
5c8c00c1ab
Fix double login issue with eyezm
2014-07-07 17:48:33 -05:00
Isaac Connor
70471936a7
get rid of escapeSql and replace it's calls with new PDO-style calls to FetchOne FetchALl,e etc
2014-07-07 10:06:50 -04:00
Andrew Bauer
48d961082c
Determine full path to arp
2014-07-05 11:11:36 -05:00
Andrew Bauer
c2e2a12995
Merge pull request #406 from m-bene/focusPopup
...
focus popup windows
2014-07-04 13:00:45 -05:00
Andrew Bauer
9a0eb63df2
Merge pull request #415 from m-bene/selectSkin
...
make skin selection persistent
2014-07-04 12:57:37 -05:00
Andrew Bauer
5aad658262
Fixes errors when opening Filters (issue #34 )
2014-07-04 11:00:00 -05:00
stevegilvarry
a8d60aa727
Fixed missing $ on ARRAY(event[id]). Fixes #455
2014-07-02 23:58:44 +10:00
stevegilvarry
61cf067be0
Wrap sort order. Fixes #450
2014-06-29 22:09:59 +10:00
Isaac Connor
623837115b
fix missing ARRAY() around params to dbFetchOne
2014-06-25 14:01:45 -04:00
Isaac Connor
5fac727c2f
Users tab should always be available
2014-06-25 13:40:37 -04:00
Isaac Connor
11718f0559
The users tab should always be available. It is useful to configure users BEFORE turning on auth.
2014-06-25 13:39:31 -04:00
tim
8ac6ce17bc
Fixed issue DateTime handling in filter queries that broke timeline view.
2014-06-15 13:05:25 -07:00
Isaac Connor
5bf894d263
guard against unsafe monitor name
2014-06-05 15:23:15 -04:00
Isaac Connor
0689e8453c
guard against dangerous (old or new) monitor names
...
by rogerroger288
2014-06-05 15:21:28 -04:00
Isaac Connor
baf5da9561
guard against monitor names being dangerous
...
by rogerroger288
2014-06-05 15:20:04 -04:00
Isaac Connor
5ae3cb8907
merge some security fixes from rogerroger288
2014-06-05 15:14:12 -04:00
Kfir Itzhak
5fea101294
Merge pull request #421 from m-bene/ffmpegoptions
...
Add optional options field for ffmpeg and VLC source types
2014-05-18 18:07:42 +03:00
m-bene
82447ebb27
remove unwanted comment change
2014-05-17 22:05:57 +02:00
m-bene
a81b9b8ce2
change examples for options
2014-05-17 21:48:08 +02:00
m-bene
f62afdb8cc
add select list for rtsp method for ffmpeg and libvlc
2014-05-17 20:41:22 +02:00
m-bene
de107f77ba
fix option help text for overlooked languages
2014-05-17 04:51:01 +02:00
m-bene
9a71a0068a
add help window for ffmpeg/libvlc options
2014-05-17 04:33:33 +02:00
m-bene
ceff5a98ea
add generic Option field to ffmpeg and libvlc cameras
2014-05-05 13:29:12 +02:00
m-bene
b197f985e0
make expiry date relative (~10years)
2014-05-01 09:53:45 +02:00
m-bene
ed7ca66045
make skin selection cookie persistent
2014-05-01 09:37:39 +02:00
Isaac Connor
8da9383d5d
use PDO style
2014-04-30 10:09:27 -04:00
Isaac Connor
e94fca2778
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-04-30 10:01:29 -04:00
Isaac Connor
b3226223f8
remove uses of dbEscape
2014-04-30 10:01:10 -04:00
Kfir Itzhak
ec5784abe2
Fix wrong install path for core.php and database.php
2014-04-30 12:25:42 +03:00
Kfir Itzhak
afd4e451fd
Add the web/api folder to cmake
2014-04-30 12:16:46 +03:00
Kyle Johnson
40e929e7a6
Changed the API readme to be ZoneMinder-relevant
2014-04-29 20:49:54 +00:00
Kyle Johnson
f1f3de6d7d
Moved the api to underneath the web directory
2014-04-29 20:41:04 +00:00
m-bene
28f62c4f8f
remove call of undefined "fixDevices" function
2014-04-26 04:23:36 +02:00
m-bene
2881e6b643
focus popup windows
2014-04-26 04:07:33 +02:00
Kfir Itzhak
1f29aa432a
Minor corrections to the cURL source type in the web interface
2014-04-23 12:12:41 +03:00
Kfir Itzhak
3cee6a133d
Merge remote-tracking branch 'Sune1337/motion/FrameSkip'
...
Conflicts:
db/zm_update-1.27.1.sql
web/lang/nl_nl.php
2014-04-22 20:13:11 +03:00
Kyle Johnson
fd4f77b145
Merge pull request #381 from m-bene/flatLayout2
...
Fix window sizes and input field sizes for flat skin
2014-04-18 09:40:00 -04:00
Kyle Johnson
4b7f1896b9
Merge pull request #385 from maciekczwa/master
...
fix sql error which prevents remote login from working
2014-04-18 09:39:09 -04:00
Maciej Czerniak
50a9055601
fix sql error which prevents remote login from working
2014-04-13 09:54:11 +02:00
m-bene
b56093a637
Fix window sizes and input field sizes for flat skin
2014-04-11 09:53:46 +02:00
m-bene
f737af15b9
Fix reload loop on switching skins
2014-04-11 09:40:23 +02:00
Sune1337
6c637947e2
Ability to skip frames in motion detection.
...
The reason for this is to make it possible to reduce CPU-load if split-second motion detection is not required.
2014-04-10 14:59:34 +02:00
Kyle Johnson
db5a8fe194
Merge pull request #375 from m-bene/flatLayout
...
Fix small / cropped DRV controls in event view. Fixes #356
2014-04-09 16:45:15 -04:00
m-bene
bd5e25644e
same dvr controlls in event as in monitor
2014-04-09 20:19:23 +02:00
Andrew Bauer
35468af815
Merge pull request #338 from m-bene/extendPreclusive
...
add feature to extend preclusive zone alarm state by x frames
2014-04-08 08:04:37 -05:00
m-bene
f22b956b8b
do not quote column names in parse filter
2014-04-08 09:07:59 +02:00
m-bene
9a714f8d6d
Fix 'Undefined index: filter' php warnings for filter view when called without filter arguments
2014-04-07 16:11:48 +02:00
m-bene
9edb55d9af
Modify window size to exclude task bar area
2014-04-07 12:07:29 +02:00
Andrew Bauer
fec72f05d0
fix eyezm authentication issue
2014-03-25 18:48:20 -05:00
Isaac Connor
d6a27b31e8
fix extra }
2014-03-24 13:44:06 -04:00
Isaac Connor
957d6f123f
remaining conversions
2014-03-22 14:16:56 -04:00
Isaac Connor
bfb52ab9aa
fix groups
2014-03-21 23:10:13 -04:00
Isaac Connor
967dda737c
more copying mysql2PDO from classic. Also, some fixes in classic
2014-03-21 17:16:56 -04:00
Isaac Connor
c7a8c0601b
wip
2014-03-21 16:51:09 -04:00
Isaac Connor
ffa952419c
Merge branch 'mysql2PDO'
...
Conflicts:
distros/ubuntu1204/changelog
scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm
web/includes/actions.php
2014-03-20 16:48:03 -04:00
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
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
Kyle Johnson
31902af09a
Update README.md
2013-05-01 08:04:57 -03:00
Kyle Johnson
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
Kyle Johnson
8322dc390f
Initial commit of CakePHP 2.3.4
2013-05-01 06:58:31 -04:00
Kyle Johnson
1ed6462354
Removed all of the old web files
2013-05-01 06:52:43 -04:00
nextime
33cbd89212
Migrate svn to git
2013-03-17 00:45:21 +01:00
Kfir Itzhak
0fe55a18bf
Something useable :)
...
1) Added optimized versions of four field deinterlacing, including SSSE3 ones.
2) Removed the "Very Soft" and "Very Hard" options.
3) Deinterlacing happens before any rotation to the image.
2012-07-15 17:30:37 +03:00
Kfir Itzhak
a6c7acd02a
Some more progress on the deinterlacing code.
2012-07-13 20:11:16 +03:00
Kfir Itzhak
f27b424503
Much more progress!
...
1) Removed the V4L2_CAPTURE_FIELDS option.
2) V4L2 Interlacing control options added to the new per-monitor deinterlacing option.
3) Fixed the 32bit version of Linear.
4) Added Blend (50%) and Blend (25%).
5) Completed the grayscale version of the Four Field Motion Adaptive deinterlacing algorithm.
2012-07-13 20:11:16 +03:00
Kfir Itzhak
8f0ec42ba2
First work on adding built-in deinterlacing to ZM.
2012-07-13 20:11:16 +03:00
stan
4996dd0a51
Recreated generated files.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3662 e3e1d417-86f3-4887-817a-d78f3d33393f
2012-07-04 09:46:18 +00:00
stan
be97b244b4
Increased size of options window and changed to use debug functions instead of console ones.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3659 e3e1d417-86f3-4887-817a-d78f3d33393f
2012-07-04 08:58:19 +00:00
Kfir Itzhak
2dfdc8129c
Few small fixes:
...
1) Added a workaround against SWS_CPU_CAPS_SSE2 not being defined.
2) Fixed enableDisableAlarms javascript error.
3) swscale unsupported format errors now include the unsupported format in the error.
4) Fixed a small error affecting local cameras with rotation enabled.
2012-03-07 14:33:09 +02:00
Kfir Itzhak
d5fbd351b3
Small corrections
2012-02-01 07:33:21 +02:00
Kfir Itzhak
be8ef02a7c
Small corrections
2012-02-01 07:33:21 +02:00
Kfir Itzhak
b4921c4403
1) Made 24bit the default target colorspace.
...
2) Changed crop info's layout.
2012-02-01 07:33:21 +02:00
Kfir Itzhak
066fe89718
Added automatic capture palette selection.
2012-02-01 07:33:21 +02:00
Kfir Itzhak
bdf0687550
1) Added support for JPEG and MJPEG capture palettes - needs to be tested
...
2) Allow the blend percent to be zero, to disable blending
2012-02-01 07:33:20 +02:00
Kfir Itzhak
63122ab9bc
Undo translations in es_es.php because its not available in the ZM 1.24.4 package.
2012-02-01 07:33:20 +02:00
Kfir Itzhak
8ac3dda54b
1) Removal of the ZM_LOCAL_BGR_INVERT option.
...
2) Allow FPS reporting interval to be zero again.
3) Added translation for the new texts.
4) Corrected the blend function declaration.
2012-02-01 07:33:20 +02:00
Kfir Itzhak
eeaed7ccd3
Some small changes
...
1) Fixed wrong size calculation in Image::AssignDirect.
2) Improved libjpeg subpixel order selection.
3) Finished adding support in the simple Overlay function.
4) Completed Flip and Rotate 32bit RGB support.
5) Allow ZM to compile on 32bit with omit frame pointer disabled by defining _DEBUG
To use one less register in the SSE algorithms.
6) Removed the counter variable in some loops to reduce loop overhead.
7) Modified crop query error handling.
8) Most of the shared data now declared as volatile.
9) Small improvements to the AlarmedPixels motion detection.
10) Changed the default blend percent from 7% to 12%.
11) Fixed an earlier bug created by me: motion detection checking the wrong pixels.
2012-02-01 07:33:20 +02:00
Kfir Itzhak
642a1bfdb2
1) RTSP support for direct capture and target colorspace.
...
2) Hopefully fixed the mmap unexpected shared memory size completely this time.
3) Added 32bit RGB and grayscale support to the signal checking.
4) Fixed zms\nph-zms keeps running after changing capture options, eating CPU and has to be killed with -9.
5) Default monitor options changed again.
6) Fixed unrelated bug: Undefined constant ZM_V4L2 in monitor probe.
7) Fixed unrelated bug: Error in offset X in monitor probe.
8) Changed monitor probe's prefered capture settings.
9) Small other minor changes.
2012-02-01 07:33:20 +02:00
Kfir Itzhak
b0bc227232
1) Made shared memory 16 byte aligned and identical size and layout for all platforms.
...
2) Fixed a bug in zmwatch.pl: Not freeing shared memory handles between iterations.
3) Modified default monitor options to simplify new monitor creation.
2012-02-01 07:33:20 +02:00
Kfir Itzhak
33119c6dc5
1) Added image size requirements to ensure proper alignment
...
2) Changed image class buffer related functions
3) Improved format selection for local cameras
4) Removed imagesize check for swscale
5) Fixed mmap unexpected memory size when changing capture options
6) Fixed unrelated bug in zmdc.pl: sockets directory doesn't exist
2012-02-01 07:33:20 +02:00
Kfir Itzhak
c3ecdd00e0
1) Relocated conversion functions and tables to zm_image.cpp
...
2) SSE2 aligned memcpy now functional
3) Fixed fill functions bug from an earlier commit
4) Many changes to zm_local_camera.cpp format selection
5) Fixed memory leak in AssignDirect()
6) Fixed Target Colorspace webinterface issues
7) Small other changes
2012-02-01 07:33:20 +02:00
stan
2c47a15f9b
Use event dimensions instead of monitor ones as they may have changed.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3520 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-11-10 22:53:29 +00:00
stan
8b86c9af58
Removed permissions check when creating new log entries. Instead check that request is 'post'ed and moved some other requests to be 'post' only.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3509 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-26 10:50:50 +00:00
stan
e695dfd4dd
Allow for level as a minimum when selecting availability criteria for other fields.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3501 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-24 13:15:58 +00:00
stan
b64c506659
Added SFTP upload option.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3500 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-23 14:10:20 +00:00
stan
194d8350b4
Fixed distribution and install lists
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3497 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-05 11:24:24 +00:00
stan
62df1ba8de
Tidier detainting.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3494 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-03 17:33:58 +00:00
stan
aa0ee13afa
Detaint further dodgy path varieties.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3488 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-03 11:08:40 +00:00
stan
63589ddee7
Don't include postprocessed config.php
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3487 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-07-28 21:26:20 +00:00
stan
3a399378b2
Fixed problem with link to overlay css file
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3485 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-07-27 16:09:09 +00:00
stan
6035ed211a
Detaint some user inputs to avoid malicious file inclusion
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3483 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-07-22 08:37:01 +00:00