8da9383d5d
use PDO style
2014-04-30 10:09:27 -04:00
e94fca2778
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-04-30 10:01:29 -04:00
b3226223f8
remove uses of dbEscape
2014-04-30 10:01:10 -04:00
ec5784abe2
Fix wrong install path for core.php and database.php
2014-04-30 12:25:42 +03:00
afd4e451fd
Add the web/api folder to cmake
2014-04-30 12:16:46 +03:00
40e929e7a6
Changed the API readme to be ZoneMinder-relevant
2014-04-29 20:49:54 +00:00
f1f3de6d7d
Moved the api to underneath the web directory
2014-04-29 20:41:04 +00:00
28f62c4f8f
remove call of undefined "fixDevices" function
2014-04-26 04:23:36 +02:00
2881e6b643
focus popup windows
2014-04-26 04:07:33 +02:00
1f29aa432a
Minor corrections to the cURL source type in the web interface
2014-04-23 12:12:41 +03:00
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
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
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
0d7c52dc1f
Merge remote branch 'origin/master' into video
...
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
2014-04-17 13:26:00 +03:00
50a9055601
fix sql error which prevents remote login from working
2014-04-13 09:54:11 +02:00
b56093a637
Fix window sizes and input field sizes for flat skin
2014-04-11 09:53:46 +02:00
f737af15b9
Fix reload loop on switching skins
2014-04-11 09:40:23 +02:00
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
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
bd5e25644e
same dvr controlls in event as in monitor
2014-04-09 20:19:23 +02:00
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
f22b956b8b
do not quote column names in parse filter
2014-04-08 09:07:59 +02:00
9a714f8d6d
Fix 'Undefined index: filter' php warnings for filter view when called without filter arguments
2014-04-07 16:11:48 +02:00
9edb55d9af
Modify window size to exclude task bar area
2014-04-07 12:07:29 +02:00
fec72f05d0
fix eyezm authentication issue
2014-03-25 18:48:20 -05:00
d6a27b31e8
fix extra }
2014-03-24 13:44:06 -04:00
957d6f123f
remaining conversions
2014-03-22 14:16:56 -04:00
bfb52ab9aa
fix groups
2014-03-21 23:10:13 -04:00
967dda737c
more copying mysql2PDO from classic. Also, some fixes in classic
2014-03-21 17:16:56 -04:00
c7a8c0601b
wip
2014-03-21 16:51:09 -04:00
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
2784b3d1f5
Merge master
2014-03-20 10:26:12 +01:00
2345889d64
include ExtendAlarmFrames in Presets and enable input for preclusive zones only
2014-03-20 09:53:47 +01:00
a9c83b5e71
Merge pull request #342 from knnniggett/nagyrobi
...
Mostly Translation related changes
2014-03-15 08:08:09 -05:00
26777487dc
add feature to extend preclusive zone alarm state by x frames
2014-03-09 17:05:39 +01:00
5a2009a143
Fix popup sizes in flat skins. Fixes #331
2014-03-03 21:26:18 -05:00
03ded1edd0
Merge remote branch 'nagyrobi/patch-2' into nagyrobi
...
Conflicts:
web/lang/hu_hu.php
2014-02-26 09:37:41 -06:00
c2b93c3caf
Merge remote branch 'nagyrobi/patch-26' into nagyrobi
2014-02-26 09:32:58 -06:00
9a298a2af2
Copy nagyrobi's localization changes from en_gb verbatim to the other language files.
2014-02-26 09:30:57 -06:00
c119c49cd9
Merge remote branch 'nagyrobi/patch-25' into nagyrobi
2014-02-26 09:21:38 -06:00
fb698a6755
Merge remote branch 'nagyrobi/patch-23' into nagyrobi
2014-02-26 09:17:14 -06:00
5b1c79e3d0
Merge remote branch 'nagyrobi/patch-22' into nagyrobi
2014-02-26 09:16:51 -06:00
1dd8dc4aa6
Merge remote branch 'nagyrobi/patch-21' into nagyrobi
2014-02-26 09:15:47 -06:00
f435435481
Merge remote branch 'nagyrobi/patch-17' into nagyrobi
2014-02-26 09:15:05 -06:00
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
805981e06a
Merge remote branch 'nagyrobi/patch-4' into nagyrobi
...
Conflicts:
web/skins/classic/js/skin.js
2014-02-26 09:04:19 -06:00
18d56e20aa
Merge remote branch 'nagyrobi/patch-13' into nagyrobi
2014-02-26 08:46:21 -06:00
dee44c8f8d
Merge remote branch 'nagyrobi/patch-12' into nagyrobi
2014-02-26 08:45:57 -06:00
5ac8a5cc99
New localization strings from Nagyrobi copied verbatim from en_gb
2014-02-26 08:38:47 -06:00
0258579ef3
Merge remote branch 'nagyrobi/patch-10' into nagyrobi
2014-02-26 08:25:16 -06:00
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
c899de65a4
Merge remote branch 'nagyrobi/patch-5' into nagyrobi
2014-02-26 07:55:36 -06:00
26be1bd041
Fix builtin authentication issue caused by commit 6e5d927
2014-02-14 18:56:27 -06:00
d20e0ee2e7
Temporary workaround to show all ptz control types regardless of monitor source type.
2014-02-13 08:43:19 -06:00
6e9da046b8
Fixed additional Makefile.am pointing to classic skin in flat skin
2014-01-27 14:26:03 -05:00
6f5c9182ce
Add paths to flat skin in configure.ac and Makefile.am
2014-01-24 13:58:51 -05:00
4fe4a028f6
Update Makefile.am
...
Add flat skin to makefile
2014-01-23 14:29:35 -06:00
e8f831c055
Flat theme: rename new theme from classic copy to flat
2014-01-22 16:33:40 +02:00
23f69de826
Flat theme: css changes
2014-01-22 16:32:14 +02:00
ce825067a8
Flat theme
2014-01-22 16:24:06 +02:00
b2a65dc343
cURL minor corrections and improvements
2014-01-10 09:17:12 +02:00
9901ce9e84
Merge remote branch 'origin/master' into curl
2014-01-05 10:16:01 +02:00
f9c8b4760b
Merge remote branch 'origin/master' into video
2014-01-05 09:02:11 +02:00
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
6e5d9272e0
supposed to fix #296
2014-01-03 18:33:01 -05:00
b3af313370
Merge pull request #282 from scottgrobinson/master
...
Add zmMontageScale so montage scale is also 'saved'
2014-01-02 11:18:39 -08:00
e6b9b8218b
Enclose value of the Notes attribute with quotes.
2013-12-31 17:32:20 -06:00
ff9a26273c
cURL is now working!
2013-12-27 18:02:32 +02:00
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
e652441996
Merge remote-tracking branch 'origin/master' into video
...
Conflicts:
configure.ac
src/CMakeLists.txt
2013-12-26 21:03:45 +02:00
89cfb96855
Merge pull request #277 from ebarnard/libvlc
...
Add libVLC source type
2013-12-22 13:01:19 -08:00
375d67cdf2
Update montage.php
...
Make use of new zmMontageScale cookie
2013-12-22 20:56:18 +00:00
db41693fd6
Update montage.js
...
save montage scale % as cookie
2013-12-22 20:53:09 +00:00
7b26636bcd
Merge pull request #280 from ZoneMinder/zmfixremoval
...
Remove zmfix
2013-12-22 11:22:18 -08:00
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
e9bb632a78
Remove zmfix
2013-12-22 16:08:17 +02:00
8ae387e376
Few minor code improvements
2013-12-22 15:19:55 +02:00
14024451e5
Monitor link now displays for all valid libvlc paths.
2013-12-22 01:29:40 +00:00
3201e5a431
Adds web ui support for libvlc camera.
2013-12-19 21:51:39 +00:00
2b79ff2cbd
Initial commit for saving events as videos :)
2013-12-19 18:38:07 +02:00
0c58957e04
fixes
2013-12-17 14:58:06 -05:00
003b8c9868
more removal of escaping
2013-12-17 14:38:08 -05:00
9f5b8bb03b
Merge branch 'mysql2PDO' of github.com:ZoneMinder/ZoneMinder into mysql2PDO
2013-12-17 14:33:46 -05:00
20f1b460ee
fix
2013-12-17 14:30:56 -05:00
cad33ddb96
Removed embedded jquery, instead include by <script>. Fixes #274
2013-12-17 13:41:55 -05:00
1a744ebed6
Added jquery 1.4.2.min.js to the classic skin's js dir
2013-12-17 13:41:36 -05:00
3393a63525
more updates
2013-12-17 12:53:15 -05:00
4c348cf159
more updates
2013-12-17 11:16:20 -05:00
ceca805b48
more updates
2013-12-17 11:07:19 -05:00
1c028e5806
use parameter passing and remove extra escsaping
2013-12-16 16:52:30 -05:00
79b3f16635
add storage tab
2013-12-15 15:37:41 -05:00
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
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
e9f4479171
Added support for UYVY capture palette (required for some Bluecherry cards)
2013-12-10 15:13:48 +02:00
00e2b05130
Merge branch 'mysql2PDO' of github.com:ZoneMinder/ZoneMinder into mysql2PDO
2013-12-06 15:52:43 -05:00
a2a3bda2e1
remove unneccessary quoting and escaping
2013-12-06 15:51:36 -05:00
86b04d0e6f
fixup dbFetchMOnitor
2013-12-06 14:22:07 -05:00
5a256eb96f
Merge pull request #256 from Phhere/patch-1
...
Fix checkJsonError messages
2013-12-04 04:58:39 -08:00
219ada85c0
Merge pull request #257 from Phhere/patch-2
...
Network Detection Support for Wansview
2013-12-01 16:04:56 -08:00
23ff4023bd
Removed installation of web/README.md from cmake
2013-12-02 01:53:21 +02:00
783bf4b8ab
Fixed web/skins/*/includes/config.php not being installed
2013-12-02 01:52:26 +02:00
55dadcf758
Network Detection Support for Wansview
...
Basis support for Wansview Cams
Tested with NC541W
2013-11-30 20:46:59 +01:00
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
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
89689d8f3f
Correctly fix mootools symlinks being installed twice in cmake this time
2013-11-22 20:23:58 +02:00
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
e4ea12a5ca
Merge branch 'mysql2PDO' of github.com:ZoneMinder/ZoneMinder into mysql2PDO
2013-11-13 10:13:42 -05:00
1519db78ce
add ServerHost filter
2013-11-13 10:13:09 -05:00
969918781f
more updates, currently the log updates are not enough. Filtering does not work.
2013-11-13 10:11:16 -05:00
91d42a86cf
Merge branch 'cmakemootoolsfix'
2013-11-13 16:59:46 +02:00
47179f793d
Fix make install failing to install mootools symlinks in an out-of-source build
2013-11-13 16:52:01 +02:00
a155082997
use parameter passing instead of esacping
2013-11-12 15:39:29 -05:00
cfc9a73851
Fixed not installing mootools symlinks in an out-of-source build
2013-11-08 18:54:46 +02:00
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
463d8a136f
Merge branch 'master' into mysql2PDO
...
Conflicts:
zm.conf.in
2013-11-08 11:22:09 -05:00
03809cfa0f
improve error reporting
2013-11-07 10:58:27 -05:00
4c6c415f02
fix: wrote dbCon instead of dbConn
2013-11-07 10:03:19 -05:00
be21a882ab
Merge pull request #242 from ZoneMinder/removeversionnumberfromzm.conf
...
Remove ZM_VERSION from zm.conf
2013-11-04 12:27:50 -08:00
51455b5c85
more updates and removal of escaping and quoting
2013-11-04 12:43:34 -05:00
f73585dbaa
Few web interface corrections regarding cURL
2013-11-04 17:28:15 +02:00
8e96df7643
Initial work on adding cURL to zoneminder
2013-11-04 16:52:21 +02:00
fd656c55cf
Changed default blend percentages and the dropdown list for alarm reference image blend
2013-11-04 12:10:53 +02:00
9d5ac7ae8c
Fix cmake installing wrong files in an out-of-source build
2013-11-04 09:56:40 +02:00
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
7989e8e980
Merge branch 'master' into mysql2PDO
2013-11-03 16:07:37 -05:00
2d0f4dffd1
Fix a missing NULL second paramter to dbFetchAll
2013-11-03 16:06:31 -05:00
6c6da67427
Merge branch 'master' into mysql2PDO
2013-11-03 15:57:45 -05:00
3fa91a30a3
allow the value side of config lines potentially be empty.
2013-11-03 15:52:37 -05:00
59b841958d
use parameter passing instead of explicit exscaping
2013-11-03 15:40:00 -05:00
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
b368d306b9
Fix marker-out-of-bounds crash when defining zone points
2013-11-02 15:56:42 -07:00
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
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
c2bd7c97ec
First attempt at enabling out-of-source building for zm with cmake
2013-10-31 18:10:00 +02:00
ae51ac5519
redo changes to use new dbFetch functions with parameter arrays
2013-10-18 14:24:08 -04:00
7fdb933d6b
rework dbQuery, dbFetchOne to take a parameters array, and use it
2013-10-18 14:15:24 -04:00
cde89a7144
more quoting removal, some slight optimisations
2013-10-17 21:03:24 -04:00
92591a6835
more removal of quotes
2013-10-17 17:05:50 -04:00
ef765afa2d
Merge branch 'master' into mysql2PDO
2013-10-17 17:02:44 -04:00
355c10c3a4
fix error when strict modes is on.
2013-10-17 17:02:17 -04:00
60e2703637
fix missing n
2013-10-17 17:01:37 -04:00
09fbdc9e35
forget the updates to this file
2013-10-17 16:57:05 -04:00
2a45506bff
more quoting removal
2013-10-17 16:15:04 -04:00
0979830b91
more removal of exra quotes
2013-10-17 15:54:17 -04:00
36c4fad644
remove extra quoets since dbEcape does quoting now
2013-10-17 15:35:23 -04:00
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
92d22b5202
Merge branch 'master' into mysql2PDO
2013-10-16 16:58:33 -04:00
b126c5ae7e
fix typo
2013-10-16 16:55:24 -04:00
9e2d7cfd24
initial convert to PDO with no testing
2013-10-16 16:07:58 -04:00
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
dff5b3aeb0
ZoneMinder Dutch Translation updates by Alco (a.k. nightcrawler)
2013-10-14 09:27:01 -04:00
d4654f63ae
merge modern into feature-h264-videostorage
2013-10-04 10:52:53 +13:00
d3d3460f21
merge master into modern
2013-10-04 10:40:30 +13:00
34f84a4097
Merge branch 'v1.26.4-beta'
2013-10-03 10:14:09 -04:00
64f28a8b97
Merge pull request #193 from kylejohnson/191
...
Moved writing of configure options from Controller to Model. Fixes #191 .
2013-10-02 05:28:57 -07:00
60bebadecf
Merge pull request #190 from kylejohnson/modern
...
Moved zmBandwidth option from cookie to Configure:: option. Might fix #175
2013-10-02 05:28:33 -07:00
d1c19036ec
Moved writing of configure options from Controller to Model. Fixes #191 .
2013-10-02 08:25:48 -04:00
19e5aec9ba
Use the global zmBandwidth variable from Configure::read in the layout
2013-10-02 08:18:17 -04:00
e3db6e0edc
Moved the zmBandwidth option from a cookie to global Configure:: option
...
In addition I'm no longer passing this option around, instead calling it
where needed. This _might_ fix #175 as the variable is being set very early on
in bootstrap.php
2013-10-02 08:09:30 -04:00
b0b0d8a521
Merge pull request #185 from kylejohnson/modern
...
Moved the Config tabs to the sidebar
2013-10-01 06:42:12 -07:00
38944fb994
Merge pull request #179 from WDKevin/modern
...
Added datetime picker support and implemented on events sidebar
2013-10-01 06:28:29 -07:00
83c744c7b7
Removed tooltips from jQuery UI
2013-10-01 08:39:16 -04:00
e61fbc4ba8
Bumped jQuery from 2.0.1 to 2.0.3
2013-10-01 08:39:02 -04:00
d3c221135d
Moved the Config tabs to the sidebar
2013-09-30 10:28:45 -04:00
84cd245462
Fixed full screen toggle so it stays in place when the page is scrolled
2013-09-29 14:08:58 -04:00
348399d61b
Tweaked the appearence of the filter by monitor panel on the Events page
2013-09-29 14:05:25 -04:00
de99655196
Fixed select all bug after performing a search
2013-09-29 13:59:19 -04:00
f8ea2a777c
Improved the loading animation
2013-09-29 12:51:59 -04:00
33c0dff8a4
Fixed the search by date functionality
2013-09-29 11:36:23 -04:00
76c8190e8b
Update web frontend to correctly display video events
2013-09-29 12:23:28 +13:00
7e90d0f373
Added datetime picker support and implemented on events sidebar
2013-09-28 18:52:25 -04:00
48f11a8064
Add cmake to zoneminder
2013-09-28 12:59:50 +03:00
366a7c2541
Use a layout without a sidebar for the Config page
2013-09-27 20:51:34 -04:00
983aece616
Consolidate the sidebar for Monitors and Events index.
2013-09-27 20:45:25 -04:00
a852dee7bb
Initial commit of expanding and collapsing error log messages
2013-09-27 19:58:01 -04:00
0630478404
Cleaned up date and time formatting on events page
2013-09-27 18:52:26 -04:00
ef66285fa5
Added universal support for select all checkboxes and added one to the events page
2013-09-27 18:32:00 -04:00
516733a50e
Fixes a small bug with a second border on each monitor panel
2013-09-27 17:50:24 -04:00
a37e2fc168
Adds fullscreen button to hide and show header, sidebar and footer
2013-09-27 17:45:52 -04:00
73d9cfd3d9
Removed fullscreen CSS to be recomitted later
2013-09-27 17:39:24 -04:00
01b2617dd8
Fixes the fixed width bootstrap bug for containers
2013-09-27 17:37:48 -04:00
1f02255413
Put the sidebar into a panel
2013-09-27 09:17:54 -04:00
1887987841
Make the monitors index sidebar a little more terse
2013-09-27 08:42:46 -04:00
e4a05f0ae0
Don't load the masonry JS
2013-09-27 08:42:06 -04:00
8dc161d47a
Use css float, width and margin to position the monitors in the index view.
2013-09-27 08:40:52 -04:00
6e06a35982
Added bootstrap glyphicons
2013-09-27 08:21:19 -04:00
9566bfd31a
Display the monitors as "panels"
2013-09-26 13:46:58 -04:00
6b4e703388
Added help text to the Monitors General tab
2013-09-25 10:09:36 -04:00
5ae657d6b0
Added help text to the Monitors Buffers tab
2013-09-25 10:09:14 -04:00
47336fee15
Don't apply default classes to the Monitors edit and add checkboxes
2013-09-24 21:40:21 -04:00
7c32525c9a
Don't put the default div around the Monitors form close button
2013-09-24 21:35:47 -04:00
8fc599240e
Set the class of the default divs to form-group
2013-09-24 21:32:38 -04:00
ae895ad8b7
Set the width of the tab-content to 400px
2013-09-24 21:32:07 -04:00
11983ab039
Don't add a fieldset to the timestamp tab
2013-09-24 21:26:31 -04:00
3994378dd9
Don't use a horizontal form for Monitors add and edit views
2013-09-24 21:23:35 -04:00
29abee74ad
Included the create element instead of the end element
2013-09-24 21:16:44 -04:00
d8108fc6cd
Moved common Monitors add and edit form code to elements.
2013-09-24 21:14:56 -04:00
f3c235544d
Moved the common Monitors add and edit nav code to an element.
2013-09-24 20:43:48 -04:00
186f763a4c
Moved vars for Monitors edit and add views to appropriate elements.
...
This saves a bunch of redundant code, while putting the code in the
'right place'.
2013-09-24 20:34:36 -04:00
f385db2d80
Moved the scaling of streams from JS to PHP
...
The Monitor model is now smart enough to change the stream's scale.
It also has the option of not scaling at all (in the case of the
single monitor view).
2013-09-24 12:54:37 -04:00
5f103b35a4
Load masonry on all pages
2013-09-24 11:21:27 -04:00
87fe605435
Updated masonry from 3.0.0 to 3.1.2
2013-09-24 10:58:23 -04:00
88dbd8db1d
Removed the LiveStreamHelper completely.
...
No longer needed as of 2fa0d3a284
2013-09-24 09:18:01 -04:00
9ccf5c72ce
Forgot to remove debug() from a view
2013-09-24 09:12:42 -04:00
2fa0d3a284
Rewrote the way that monitor streams are created.
...
No longer need LiveStreamHelper, and the logic of which image to
display (live or placeholder) has been moved to the Moniors model.
This way should be much easier to understand and support. This also
fixes my 'ugly hack' in commit eed6c81287
2013-09-24 08:56:04 -04:00
22f9ba5c38
Write the daemon status to Configure
2013-09-24 08:55:46 -04:00
eed6c81287
An ugly hack to make the liveStreams display in both index and view views.
2013-09-23 21:51:02 -04:00
172d7a52d1
Revert "Wrapping the main content in a container to fix #169"
...
This reverts commit 8a9f9a8ab5
2013-09-23 15:22:07 -04:00
3f70f6714f
Removed an old </table> tag
2013-09-23 15:09:58 -04:00
8a9f9a8ab5
Wrapping the main content in a container to fix #169
2013-09-23 15:04:23 -04:00
7e91053761
increase the hegiht of the window a bit, the contents are larger
2013-09-23 10:03:33 -04:00
6d00540b5d
Improve Chrome browser support & log streaming events
2013-09-21 14:52:41 -05:00
2e8e3d55ad
Removed green version label and changed to red when a new version is available
2013-09-20 10:49:12 -04:00
0de88e7d68
Fixed small bug left over from testing
2013-09-20 10:49:12 -04:00
d78315de50
Polls the update check every 5 minutes and if an update is available it adds a message beside the version number in the footer. This should fix issue #130
2013-09-20 10:49:11 -04:00
99bae6386e
Merge branch 'monitorSize' of git://github.com/chriswiggins/ZoneMinder into modern
2013-09-20 17:49:04 +12:00
f8db56b308
Have the Events view view (not index) use the popup layout
2013-09-19 11:31:54 -04:00
0223aeb3ab
Set all event links to be colorboxes
2013-09-19 11:31:05 -04:00
9e782ed407
Adding the colorbox css and js to the default template
2013-09-19 11:30:25 -04:00
e0a7418d24
Adding the colorbot js
2013-09-19 11:29:42 -04:00
afa281a750
Adding the colorbox css
2013-09-19 11:29:29 -04:00
e936df0f0d
A minimum layout file for use with popups
2013-09-19 11:29:12 -04:00
ca8cc028ef
Display an HTML5 <video> for each event
2013-09-19 09:12:05 -04:00
8aec78258b
Create a video for each event view.
...
This determines the appropriate video format based on the user agent,
creates the video, and then returns the video path to the view.
2013-09-19 09:10:57 -04:00
5844a1cc89
Added a function which creates videos from event jpgs
2013-09-19 08:57:54 -04:00
a49e66889d
Move JS to main.js
2013-09-19 21:10:41 +12:00
133b061179
Add code for dynamically scaling monitor images on home screen. Add new no-image image
2013-09-19 20:56:09 +12:00
5178d4fa37
Added "Function" column to the $monitors array to fix issue 140
2013-09-18 17:24:52 -04:00
d7fd5566a7
Fixes issue 129 - Bandwidth is now updated in the UI after changing it
2013-09-18 17:10:17 -04:00
bf8f799c4c
Moved delete button to the sidebar
2013-09-18 16:46:44 -04:00
0cf11adb99
Removed logging line from deleteSelected function
2013-09-18 15:55:50 -04:00
c6bbdac0d7
Added ability to delete multiple events at once
2013-09-18 15:53:35 -04:00
0f25bec1d6
Fixes to monitor sorting and reordering
2013-09-18 13:23:16 -04:00
bcaa0ac36c
Added missing jquery-2.0.1.min.map file
2013-09-18 13:16:10 -04:00
b08a8252c4
Merge branch 'dukess-master' into v1.26.4-beta
...
Conflicts:
scripts/zmupdate.pl.in
2013-09-18 13:03:54 -04:00
c9ad6e661a
Merge branch 'master' of https://github.com/dukess/ZoneMinder into dukess-master
2013-09-18 12:57:26 -04:00
4430399b1e
Removed logging of post data
2013-09-18 12:37:01 -04:00
6dfdba7023
Added ability to reorder monitors on the dashboard
2013-09-18 12:22:14 -04:00
f716fbb237
Open the Config Option tab by default
2013-09-17 12:48:38 -04:00
f7b7a49616
shoNoImage was always being called as the $mon variable was incorrect
2013-09-17 09:43:48 -04:00
ddec9a0dd8
Fixes 147 - there were unescaped quotes
2013-09-17 09:28:42 -04:00
17b60bf25f
Merge branch 'modern' of github.com:ZoneMinder/ZoneMinder into modern
2013-09-17 09:13:03 -04:00
e694616702
Reworked the Config view to display options in rows using bootstrap.
...
This commit fixes #134
2013-09-17 09:07:35 -04:00
064b86c95f
Added my events dir to the gitignore list
2013-09-17 08:54:53 -04:00
e0423570bd
Added classes to take care of smaller and larger displays
2013-09-17 08:50:46 -04:00
dc316b0aee
Add static image when the monitor/system is not enabled/running
2013-09-16 22:00:27 +12:00
6c60813a6f
Merge branch 'modern' of github.com:ZoneMinder/ZoneMinder into modern
2013-09-16 13:13:07 +12:00
7f1589a74e
Search for a different string in zmdc.pl to correctly determine if ZM is running or not
2013-09-16 13:11:01 +12:00
c6d1715948
Removed an unneeded div in the Events view.
2013-09-14 22:10:49 -04:00
3738c3866d
Added a link to each event row to delete that event.
...
This fixes #126 however that issue was not specific enough. This
commit allows a user to delete individual events. There is currently
no way to delete multiple events.
2013-09-14 22:09:28 -04:00
bf2e46f512
Added a function to delete events.
...
Currently this only allows single events to be deleted.
2013-09-14 22:05:08 -04:00
0b5a215dca
Use the HtmlHelper::tableHeaders helper to display the table headers
2013-09-14 21:03:31 -04:00
9ccf5c4ee8
Added a horizontal rule to the footer to help it stand out.
...
This isn't ideal (the footer should have css to make it stand out,
instead of an extra element).
2013-09-13 09:13:07 -04:00
16994dbdb2
Add some styling to the version number in the footer.
...
If there is an upgrade available, the label-info (blue) class is
applied.
If there is not an upgrade avaiable, the label-success (green)
class is applied.
2013-09-13 09:07:19 -04:00
b2ab1cea09
Initial commit of Version Controller and View
2013-09-13 08:55:46 -04:00
2f99274c0a
Initial commit of Version model
2013-09-13 08:44:21 -04:00
180d879894
Display the ZM version in the footer of all pages.
2013-09-13 08:43:11 -04:00
0437e6e5b6
Pass the zmVersion variable to all views
2013-09-13 08:42:55 -04:00
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
f0231a7d5f
Added some styling to the logs table
2013-09-12 20:10:51 -04:00
34b4ec0b94
Display elements properly for bootstrap. Also fixed element id's
2013-09-12 20:03:41 -04:00
d32bab4248
Use the Html, Form and Paginator helpers from BoostCake
2013-09-12 20:02:33 -04:00
e42afcd76a
Load all available CakePHP plugins
2013-09-12 20:01:31 -04:00
e1ce213f04
Adding the BoostCake plugin
2013-09-12 20:00:57 -04:00
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
ab1314f250
clean out autogenerated files
2013-09-12 14:43:57 -04:00
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
75acaea36e
Open the monitor edit general tab by default
2013-09-11 15:29:18 -04:00
6dbd10621d
Reworked to use Bootstrap tabs
2013-09-11 15:24:51 -04:00
e27a065039
Add the necessary class to allow these elements to display in tabs
2013-09-11 15:24:28 -04:00
cbf48a1d8f
Use bootstrap tabs instead of jquery tabs
2013-09-11 15:09:43 -04:00
b18b38c486
Apply bootstrap theme to the events table
2013-09-11 15:08:41 -04:00
9dfa3eb5af
Rework the config index view to use bootstrap tabs
2013-09-11 15:08:07 -04:00
d33f32f6ce
Moved the config indev view form to not enclose the tab list
2013-09-11 15:07:03 -04:00
c03c21895c
Display a red or green alert, depending on daemon status
2013-09-11 10:37:18 -04:00
62679e3ff1
Display monitors as bootstrap thumbnails in a grid view
...
This will need to be reworked to dynamically determine the number
of rows
2013-09-11 10:17:47 -04:00
dfa2d37c4d
Moved the daemonStatus to the header, from the footer
2013-09-11 10:17:10 -04:00
735f85a255
Renamed the thumb_width variable to be width as that is what my helper expects
2013-09-11 10:14:04 -04:00
6a65bef736
Display the system load and free disk space in the nav bar
2013-09-11 09:23:55 -04:00
dbba80fcbf
Added a function in AppModel to check the free disk space in the events directory
2013-09-11 09:23:13 -04:00
646b511cd4
Added a function in AppModel to check the System Load
2013-09-11 09:22:53 -04:00
c41810bbf1
Reworked the paginator number display to play nice with Bootstrap
2013-09-10 20:27:30 -04:00
fa3725d377
Put the sidebar into the Bootstrap sidebar
2013-09-10 20:19:03 -04:00
d9b6140bf8
Convert the Logs index view to use a bootstrap sidebar
2013-09-10 20:18:25 -04:00
09a3b9e353
Convert the default layout to use Bootstrap
2013-09-10 20:17:44 -04:00
88b8534efb
Adding bootstrap CSS and JS files
2013-09-10 19:06:10 -04:00
2a0613a370
Bunch of updates to css
2013-09-06 15:39:37 -04:00
5c857029ce
Merged the JS from config.js and events.js into main.js
2013-09-06 15:07:08 -04:00
9b22dae624
Adding the loading AJAX image to the header
2013-09-06 15:02:43 -04:00
c4283ad72e
Adding some base HTML to make the ajax view work
2013-09-06 15:01:59 -04:00
48d162d432
Adding a function to control the daemons (start, stop, etc)
2013-09-06 15:01:05 -04:00
6a9ce02870
Moving some of the monitor options to the controller
2013-09-06 15:00:01 -04:00
0a9e63ca2c
remove autogenerated files
2013-09-06 14:40:55 -04:00
c8ad6ae656
Fixes #107 for real this time.
2013-09-05 20:31:52 -04:00
c02d496d23
More CakePHP cleanup - missed it in 2c04d0774f
2013-09-05 10:52:55 -04:00
d47aaec775
Merge pull request #92 from knnniggett/patch-9
...
Update getBrowser() to match IE10
2013-09-03 06:38:13 -07:00
c5196407a9
Moved all of the Monitors HTML to elements
2013-09-01 17:50:26 -04:00
2f92689d7e
Resolving CVE-2013-0232 - this should fix #93 .
2013-08-30 21:53:19 -04:00
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
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
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
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
a186981278
Update monitor.php
...
Enable localization of the monitor function names in the monitor settings window.
2013-08-16 13:48:25 +02:00
0c098e2b0f
Update function.php
...
Enable localization of the monitor function names in the function window.
2013-08-16 13:41:33 +02:00
ff9cbeff6b
Update console.php
...
Enable localization of the monitor function names in the console.
2013-08-16 13:39:42 +02:00
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
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
9c7653ca68
Update timeline.php
...
Enable localization of the usage instructions in the Timeline window.
2013-08-15 18:58:08 +02:00
8ce4d302dd
Update montage.php
...
Enable localization of the dropdown box items in the montage window.
2013-08-15 18:56:01 +02:00
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
4d6b9f7276
More updates to the Hungarian translation. #Fixes #45
2013-08-15 09:39:45 -04:00
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
1fa04cc104
Update hu_hu.php
2013-08-14 22:38:37 +02:00
ee251b3c02
Removing lingering references to UsedPl
2013-08-13 12:34:59 -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
f1d9de75b0
Point root to the Monitors index action
2013-07-19 09:30:08 -04:00
46deb93f74
Events index view is now at a semi-usable state, similar to the original skin.
...
In the interest of releasing something, I am not going to use ajax here
for now. Goal is to have this view behave similar to the original Events
view in the original skin. Currently you can:
* Paginate events
* Filter events using the sidebar
Bug: Filter elements are unset when paginating.
2013-07-19 07:30:13 -04:00
ad0aaa6e93
Initial commit of Zone MVC
2013-07-18 08:08:07 -04:00
6ba1d8f041
Added the Js helper and RequestHandler component to AppController to be available app-wide.
2013-07-16 08:33:53 -04:00
e4ccd359cd
Allow setting of width with the live stream helper
2013-07-15 07:35:39 -04:00
4265e8b45f
Sort with newest at top, not bottom.
2013-07-11 12:09:45 -04:00
67ad15fdc5
Initial commit of the Logs Controller and View.
...
The log functionality is similar to that of the classic skin, though
with fewer options. Initial filtering support is for only component type.
Also displays a fixed last 100 log events, sorted by TimeKey ascending.
2013-07-11 12:06:12 -04:00
2ea43105ec
Merged config.js and events.js into main.js.
...
This should fix #15 as I'm keeping all JS in a single file, instead of
a file per page.
2013-07-11 12:00:01 -04:00
80ebaad07b
Initial commit of the Log model
2013-07-10 10:00:49 -04:00
64fba81f6a
Moved the navigation items to an ordered list
2013-06-25 12:21:21 -04:00
cdbb3d126e
Added Masonry from http://masonry.desandro.com/
...
Masonry is a JavaScript grid layout library, and it is going to make my
life easier on the Events page.
2013-06-22 21:53:53 -04:00
12537a7860
Added jquery-ui images and updated jquery-ui css to point to them.
2013-06-22 21:50:22 -04:00
e9e99261d9
Better styling of the Config page.
...
Added row highlighting, positioned all of the labels and inputs
appropriately, and added the description of the option.
2013-06-22 21:40:29 -04:00
bffe78904f
Display the correct input type for the config option.
...
I am keying the input type off of the 'Hint' and 'Type' columns
in the Config table. It would be easier if I just added an 'inputtype'
column to the Config table, and I might do that later, but I don't want to
mess with the database right now.
2013-06-22 11:59:46 -04:00
fe5df3eb8c
Also grab the Hint column from the Config table
2013-06-22 11:59:03 -04:00
5635b24897
Make the tab's first character uppercase
2013-06-21 22:22:54 -04:00
567c0c5c20
Switching on the category type to determine which type of input to display.
2013-06-21 22:20:16 -04:00
6faa248248
Sorting the Config results by Type (boolean, string, etc)
2013-06-21 22:19:27 -04:00
819f1b48d6
Filtering out the "hidden" category
2013-06-21 22:18:44 -04:00
d64a09576f
Split the config / options page into tabs based on Category.
...
Still a lot of work to do such as displaying the proper input
type based on option, however basic tabbing and saving works,
as does the on-hover tooltip (I think I put that in this commit).
2013-06-21 12:52:30 -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
964e1919bc
Initial commit of Filters MVC.
...
The filters will be split from the events in this interface, where
in the classic interface, they were combined.
2013-06-04 13:23:00 -04:00
f50bf834d9
Forgot to change $event to $value, and to move a <td> or two.
2013-05-30 23:00:09 -04:00
50085d48b5
Reworked the Events index view to display thumbnails by default.
...
The EventsController calls createListThumbnail() to build a list
of thumbnail data which is then passed to the view to be looped though.
Also had to change how I loop through $events so that I can match up the
indexes in $events with the indexes in $thumbData
2013-05-30 22:54:51 -04:00
3505f35a6d
Replaced my function for selecting and filtering events based on monitors
...
The new way of doing it leverages jquery-ui functions.
2013-05-30 22:46:27 -04:00
59a1740dca
Re-worked the Events index view to display the monitors as a list
...
This will allow me to use the jquery-ui selectabled on the list.
2013-05-30 22:43:48 -04:00
e80bd5ffd0
Updated the CSS for jquery-ui-selected elements
2013-05-30 22:36:51 -04:00
26c1110e3f
Function to return info necessary to create an HTML img tag for a given event.
...
This function determines the scaled width and height of the image for the
thumbnail, as well as other information relating to the frame with the
highest score in this event.
2013-05-30 22:31:55 -04:00
1ae5cdd291
Function to return components necessary to build src to an event thumbnail.
...
A lot of this code was re-worked from the original includes/functions.php
file found in the classic zoneminder skin to work with CakePHP.
Function seems to work, but looks like it could use some serious re-factoring.
2013-05-30 22:22:48 -04:00
22a73a3255
Added one of the hard coded options from the original config.php file
2013-05-30 22:03:20 -04:00
f4d2df3941
Function to determine the path to an event in the filesystem.
2013-05-30 20:30:09 -04:00
c2e2079818
Function to rescale dimenions of events.
2013-05-30 20:25:18 -04:00
e107e34164
Associated the Event Model with the Frame Model
2013-05-30 19:47:32 -04:00
fb97233869
Initial commit of Frame Model
2013-05-30 19:47:07 -04:00
26f99bf76b
Adding jQuery UI
2013-05-29 17:46:07 -04:00
633aa7a9ad
Initial support for filtering events.
...
First I tell extractNamedParams() which params I care about (ignore the rest),
then I loop through the returned results and build my query via named params.
Finally I pass the named params into the $conditions array for paginate to use.
2013-05-29 07:54:06 -04:00
cc4af23115
Removed the Config model from the Events controller.
...
Not needed since commit c408575075
2013-05-29 07:52:34 -04:00
fdb5fd5b57
An AJAX loading / spinner gif
2013-05-29 07:50:49 -04:00
870298082e
Minor styling to selected rows in the Events view.
2013-05-29 07:50:23 -04:00
984035dde3
Initial commit of events.js file; added it to all pages.
...
events.js should eventually be loaded in only the events view. This commit
creates #15 .
2013-05-29 07:47:27 -04:00
47af648803
Minor HTML updates so that I can better select elements with jQuery later on.
...
Wrapped the Events table in a div, and gave the id #Events to that div.
2013-05-29 07:45:47 -04:00
d5e60e8b78
Minor indenting, and added an empty placeholder $conditions array.
2013-05-29 07:44:30 -04:00
545826b55c
A method to make named parameters strongly defined.
...
Added a method that processes named parameters and ensures all mandatory ones
exist and substitutes missing optional ones with default values. This makes
named parameters strongly defined and easier to read.
Thanks to http://developinginthedark.com/posts/cakephp-tip-1-named-parameters
for the idea.
2013-05-29 07:37:00 -04:00
c408575075
Grab ZM_WEB_EVENTS_PER_PAGE from Configure instead of the database
2013-05-25 12:30:34 -04:00
6d2f7baf5d
Re-added the jQuery javascript engine
2013-05-25 12:22:23 -04:00
1795633b71
Added names to the tables and td for sorting the events list via js
2013-05-25 11:55:52 -04:00
60b67a1703
Removed the jquery helper. Going to keep my js code in seperate files for now
2013-05-25 11:54:34 -04:00
07ac7aaeb4
Use the jQuery javascript engine
2013-05-25 11:44:53 -04:00
13b7c4b04a
Write cached scripts
2013-05-25 11:43:22 -04:00
aa72855b28
Added jQuery 2.0.1 file
2013-05-25 11:39:24 -04:00
05c8ddf153
Reworked to allow displaying of monitors from many views with less code.
...
* Moved getStreamSrc from Monitors Controller to Monitors Model
* Minor indenting of code
* Removed some old code
* Changed how I lookup ZM_MPEG_LIVE_FORMAT from within getStreamSrc
* Changed Monitors View view to use divs instead of tables
2013-05-24 20:13:14 -04:00
7b98b62c16
Fixed some indenting
2013-05-22 21:19:10 -04:00
57c553e05f
Added LiveStream helper
2013-05-22 21:18:43 -04:00
155ec308a0
Replaced HTML image tag with LiveStream helper
2013-05-22 21:18:01 -04:00
f05c23b104
Created a helper for live video streams
2013-05-18 18:22:39 -04:00
c28a35ca31
Added a daemon status message to the footer of every page (whether or not ZM is running)
2013-05-17 09:03:30 -04:00
ae5a3d716c
Made zm.conf options available site-side
2013-05-17 09:02:34 -04:00
9628aff358
Load AppModel to AppController
2013-05-17 09:01:54 -04:00
195b5deac1
Added a function to check the status of the ZoneMinder daemons
2013-05-17 08:57:24 -04:00
f1a590c805
Made the options in the Config table available site-wide.
2013-05-17 08:42:32 -04:00
17c8b98a41
Moved all of the Events table stuff in the Monitors index view to the Events index view
2013-05-15 17:53:07 -04:00
869fb3f626
Changed the way that I am looking up monitors
2013-05-15 17:52:30 -04:00
0d004fb588
Changed some minor indents
2013-05-15 17:51:53 -04:00
343fd4c3b6
Removed the host field from the monitors query
2013-05-15 17:51:14 -04:00
176064343d
Moved the events table code frmo the Monitors controller to the Events controller
2013-05-15 17:50:46 -04:00
4022695961
Reworked the events paginate function, it now grabs only the needed fields, sorts properly, and limits based on the configured ZM_WEB_EVENTS_PER_PAGE option.
2013-05-15 17:46:11 -04:00
c47f450e41
Added the Monitor and Config model to the Events controller
2013-05-15 17:42:42 -04:00
2a3b649341
Forgot to pull out the Monitors schema before committing...
2013-05-15 08:42:39 -04:00
7913fbb49f
Added a link to the add monitors page
2013-05-15 08:36:05 -04:00
a1aed0ec03
First pass at ability to add monitors. Field names do not match database columns so not all values are saved
2013-05-15 08:35:49 -04:00
39e15b48a1
Replaced use of querybuilder functionality via find() with prebuilt queries via query(). This fixes #1 .
2013-05-14 22:52:47 -04:00
3a8481a591
cleanup
2013-05-10 14:02:22 -04:00
a468baf9eb
cleanup
2013-05-10 13:55:45 -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
1307ba41c8
Changed the event count lookups to use find() instead of custom functions
2013-05-08 09:37:56 -04:00
08f57b6b47
Made the footer link legible
2013-05-08 08:03:58 -04:00
0e8a96141e
Lack of newlines makes me cry
2013-05-08 07:56:11 -04:00
74008dcb8b
Moved some of the logic for determining video streaming options from the controller to the model
2013-05-07 11:15:06 -04:00
b5e15a1708
First pass of the Monitors view page with code to determine stream type (mpeg, jpeg), bitrate, fps, etc
2013-05-07 10:29:34 -04:00
a6bcd78e6e
Added a link to change the bandwidth
2013-05-06 19:53:38 -04:00
29784fa3d3
Set the zmBandwidth variable app-wide
2013-05-06 19:53:25 -04:00
82c14790c5
Added the live stream with hardcoded values
2013-05-06 19:38:22 -04:00
49a01a9c28
Initial commit of Bandwidth Model, View and Controller.
2013-05-06 19:37:22 -04:00
ac93b8318e
Added Cookie and Session components to the entire app, also set the zmBandwidth cookie to low by default
2013-05-06 19:36:34 -04:00
9052b7fda5
Added a style to make the header legible
2013-05-06 11:34:48 -04:00
69f9f446a8
Added Monitors, Events and Options index view to the header
2013-05-06 11:34:17 -04:00
f35e7cbe73
Initial commit of Config Controller and View.
...
* Allows basic updating of config options
* No validation yet
* All options are rendered as text boxes. Some need to be dropdown, etc.
2013-05-06 11:06:58 -04:00
869b84732d
Changed the primaryKey to the actual primary key of the Config table
2013-05-06 11:05:33 -04:00
5f7e4a3471
Overriding the primaryKey for the Events and Monitors models
2013-05-06 10:36:47 -04:00
03a9915138
Added the Config model
2013-05-06 08:42:05 -04:00
b6bf96b701
Added the list of distinct monitors to the monitors variable for later use with filtering
2013-05-06 08:40:25 -04:00
d4b0d05366
Added number of archived events per monitor to Monitors index view
2013-05-04 22:45:59 -04:00
3af0600917
Limited the number of fields returned when searching for associated events and zones
2013-05-04 22:41:27 -04:00
d681654e56
Moved events queries from the Monitors controller to the Monitors model
2013-05-04 19:42:37 -04:00
a56ae4ed42
Display last events per hour, day, week, month per monitor
2013-05-04 19:22:48 -04:00
20b024ef02
Added queries for last events per hour, day, week and month
2013-05-04 19:22:09 -04:00
c42ae4a91d
Moved the Html and Form helpers to the common AppController
2013-05-03 07:34:45 -04:00
cff58441fc
Fixed some indents
2013-05-02 21:31:05 -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
2cc0620edc
Added zone count to monitor index
2013-05-02 21:27:55 -04:00
2c04d0774f
Reverting my web changes in develop - keeping them in modern
2013-05-02 10:20:06 -04:00
b7d993839b
Added Zone model, as well as Monitor and Zone model association
2013-05-02 09:01:27 -04:00
12642e6c45
Added additional table columns as well as total event count per monitor
2013-05-02 08:56:51 -04:00
e782fbe38d
Defined associations between the Monitor and Event models
2013-05-02 08:55:59 -04:00
e2751c0597
Initial ability to edit limited options of existing monitors
2013-05-01 21:03:25 -04:00
6bc6610542
Added Monitors view view
2013-05-01 20:57:10 -04:00
1be91f67e3
Added Function and Source columns
2013-05-01 18:46:01 -04:00
055d8f8d0b
Initial commit of MVC for Monitors
2013-05-01 18:41:59 -04:00
a5e2f29a4b
Specified the specific table name for the Event model
2013-05-01 18:21:46 -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
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
33cbd89212
Migrate svn to git
2013-03-17 00:45:21 +01:00
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
a6c7acd02a
Some more progress on the deinterlacing code.
2012-07-13 20:11:16 +03:00
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
8f0ec42ba2
First work on adding built-in deinterlacing to ZM.
2012-07-13 20:11:16 +03:00
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
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
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
d5fbd351b3
Small corrections
2012-02-01 07:33:21 +02:00
be8ef02a7c
Small corrections
2012-02-01 07:33:21 +02:00
b4921c4403
1) Made 24bit the default target colorspace.
...
2) Changed crop info's layout.
2012-02-01 07:33:21 +02:00
066fe89718
Added automatic capture palette selection.
2012-02-01 07:33:21 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
a3ef933f2d
Check for json_last_error function existence before invoking.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3482 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-07-22 08:34:35 +00:00
b40669dc75
Updated Spanish translation
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3476 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-07-07 08:30:12 +00:00
07fca2ad9a
Fixed environment fetching when in cli mode and logfile error message.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3471 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-27 16:15:59 +00:00
7e55373b87
Fixed incorrect scaling of timeout on select call
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3470 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-27 16:15:16 +00:00
bf90ab8158
Added error trapping to log file exports.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3463 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-23 22:33:07 +00:00
1ce54fb0db
Enabled alternate selections when a filter has been chosen. Improved
...
styles for debug entries in log.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3462 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-23 21:53:45 +00:00
6ff385e407
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-21 09:19:10 +00:00
96249db582
eyeZm Plugin: Patched functions.php to check for ffmpeg codec support via -formats as well as -codecs
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3399 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-08 22:37:19 +00:00
b3d8279dfc
Fixed problem with transparency
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3373 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-27 10:41:43 +00:00
a6011b4f93
Fixed down/right PTZ image
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3372 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-27 08:39:22 +00:00
d2f5e9623c
Added checks for mismatches between system and database versions
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3364 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-25 09:15:14 +00:00
a20180aded
Updated to process other sections on top of SLANG
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3362 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-25 09:13:47 +00:00
7b43ac2645
Use JSON encoding for language independent serialisation (filters and control commands) rather than PHP serialisation. Removes dependency on rare PHP::Serialization perl module.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3357 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-23 16:18:18 +00:00
87124001ba
Added error checking to builtin JSON functions
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3351 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-23 15:15:37 +00:00
1d84fb8f7d
Added jsonDecode function and stop encoding single quotes in JSON encoder
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3350 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-23 13:17:12 +00:00
327ae02e9a
Regenerated.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3340 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-16 14:48:52 +00:00
24c3c068dd
Removed original apache config and merged with new one in misc
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3339 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-15 21:16:36 +00:00
47e8d6112a
Do not ignore return status of unlink
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3326 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 11:47:25 +00:00
249b53ec7e
When creating a monitor add it to the current group if any
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3325 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 11:46:55 +00:00
27fedec37b
Reordered monitor deletion to do primary activities first in case of deletions timing out
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3324 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 10:56:39 +00:00
bf101660b4
Added deletePath function and changed deleteEvent to use it.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3323 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 10:54:41 +00:00
e46acf74b0
Fixed broken previous commit.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3322 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 09:53:33 +00:00
40dfb5abde
Fixed potential issues with monitor deletion
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3321 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 09:50:28 +00:00
6a5f649092
Improved process control options, guesses less.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3320 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 09:35:39 +00:00
d0f8e7e1aa
eyeZm Plugin: Changed text on H264 splash page
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3317 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 00:10:17 +00:00
7c430cd7a5
eyeZm Plugin: Changed loading text for H264 splash screen
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3316 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 00:10:03 +00:00
6645cd0a8f
eyeZm Plugin: Removed -s tag from ffmpeg to allow it to automatically pick size, and added viewport meta-tag to h264 splash page
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3315 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 00:09:50 +00:00
f2caca6f2f
added single-shot when fps=0 for vcodec=mjpeg
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3314 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 00:09:34 +00:00
923fd832e5
Incremented to p2fs3, added rescaling support for 'vframe' action, added viewport tag to vfeed for mjpeg mode
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3313 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 00:09:20 +00:00
a1ccff276f
Auto-updated.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3310 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-03-02 12:35:17 +00:00
0327f0f751
Added Spanish translation
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3309 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-03-02 12:34:58 +00:00
0ff4e53832
Allow FPS reporting to be disabled by setting valure to zero
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3308 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-03-02 12:23:10 +00:00
f0a012ebfd
Fixed bug to do with V4L versions and monitor settings
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3307 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-03-02 12:04:52 +00:00
e3f8bdb6cd
XML (eyeZm) plugin: Now renamed plugin to eyeZm, along with all database variables. Note that this must still reside in the skins/xml path until iPhone apps can be moved over at a later point in time
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3306 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-19 20:25:54 +00:00
15de28e665
XML Plugin: Securing code by escaping SQL strings, and validating input parameters
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3305 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-19 20:25:22 +00:00
8048c1c355
Updated to allow the versions of video4linux to existed independently of each other. Ubuntu 11.04 oalyn has V4L2.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3302 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-15 21:59:06 +00:00
efa583aed0
Fixed JSON request queueing issue.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3299 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-15 11:17:44 +00:00
f4ee181a1b
Removed redundant overloaded code, now implmented directly in MooTools
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3298 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-15 11:17:30 +00:00
3b149bf552
Fixed JSON encoding bug
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3292 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-11 14:48:03 +00:00
49daed8658
Changed name of event variable as Chrome objects.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3289 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-08 14:30:59 +00:00
f92752b358
Added more content headers for video download.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3288 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 16:52:10 +00:00
240027dd98
Fixed javascript error due to archive button permissions - http://www.zoneminder.com/forums/viewtopic.php?t=15387
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3286 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 16:17:42 +00:00
45f1ee9c36
Fixed restricted user not being able to select a monitor in console - http://www.zoneminder.com/forums/viewtopic.php?t=15347
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3285 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 16:14:16 +00:00
c19b71975c
Fixed issue with deleteing current monitor grouyp - http://www.zoneminder.com/forums/viewtopic.php?t=15278
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3284 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 16:11:56 +00:00
dae7327e7e
Fixed enable/disable monitor from monitor settings - http://www.zoneminder.com/forums/viewtopic.php?t=15273
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3283 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 16:08:16 +00:00
48d287f9de
Fixed bug where unarchiving multiple events would not work - http://www.zoneminder.com/forums/viewtopic.php?t=15272
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3282 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 16:06:44 +00:00
98203e6c2f
Improved stream handling for single image mode, for Chrome etc.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3281 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 16:04:11 +00:00
ee3c2f84a4
Removed debug
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3280 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 15:36:20 +00:00
255cf27e49
Removed support for PHP 4.1.0
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3279 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 15:31:30 +00:00
5985897a5c
Modified and improved browser checking
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3278 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 15:29:06 +00:00
1027b1c75b
Prevented memory exhaustion in timeline view for very long events
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3277 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 15:28:49 +00:00
173de6debf
Replaced deprecated split function call
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3276 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 15:28:25 +00:00
ccfdd30988
Fixed typo in error message
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3275 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 15:28:01 +00:00
e1a9514262
Added Estonian language
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3274 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 15:27:32 +00:00
4cbe2fbad9
Updated mootools version number to 1.2.5
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3270 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-31 08:54:39 +00:00
f6bcc70b0d
Updated for new tokens
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3268 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-30 21:17:50 +00:00
5203205680
Improved formatting of options and help.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3229 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-20 18:38:24 +00:00
828e316885
Updated SVN header
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3226 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-17 18:20:54 +00:00
46358c84e9
Changed configure/build procedure to allow specified run, tmp and log dirs and avoid early replacement of configure variables in SQL defautl config.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3222 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-07 11:10:18 +00:00
04dbf0f016
Renamed zmHttpd conf file to zmApache
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3219 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-03 23:30:20 +00:00
dc9e2755b0
Added sample apache config file.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3218 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-03 23:27:58 +00:00
1a8d7c46fc
XML Plugin: Bugfix where EVENT_IMAGE_DIGITS other than 3 would not work. Now uses define
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3215 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-12-30 12:35:14 +00:00
14376ac519
Updated to mootools 1.2.5
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3214 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-12-13 22:37:57 +00:00
192b1310b8
Adding Display language item to hungarian file. Other languages need this
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3212 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-12-03 17:47:00 +00:00
4dc1fac544
XML Plugin: Added commenting for config.php defines
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3211 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-30 04:32:43 +00:00
00478b3ff2
Fixed id parsing.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3209 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-28 21:27:08 +00:00
6c547aba85
Fixed use of analysis images in getImageSrc function plus fixed implementation of overwrite flag in various functions.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3207 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-28 21:20:02 +00:00
79e24aef44
updated /web/skins/classic/views/options.php:
...
added tab for skin selection
updated /web/lang/en_gb.php:
added Display entry and SkinDescription entry
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3206 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-24 01:35:12 +00:00
f65edd0cc1
updated /web/skins/classic/views/options.php:
...
added tab for skin selection
updated /web/lang/en_gb.php:
added Display entry and SkinDescription entry
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3205 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-24 01:33:21 +00:00
635d8e1dad
Grab FFMPEG from ZM_PATH_FFMPEG (if available), more robust error checking against codecs and paths
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3203 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:09:51 +00:00
bd31f9ec4b
IP Address printout in XML Loggin
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3202 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:09:33 +00:00
069136fe53
Added vlog function to view log output, ability to redirect XML logging to it's own file
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3201 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:09:18 +00:00
18bcfcff7f
Added support for deep-event storage
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3200 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:08:48 +00:00
c7b3d04eed
Got rid of MJPEG code choice for viewing events, only MPEG-4 and H264 now. Added default bitrate for event viewing to config XML
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3199 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:08:33 +00:00
d3fa2b2df3
Changed default H264 bitrate for events to 128kbit
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3198 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:08:07 +00:00
f0165bab78
Prettied-up the splash screen for H264, modified FFMPEG encoding parameters for H264 slightly
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3197 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:07:52 +00:00
5ed6fccd20
- Incremented to p2fs2
...
- H264, MPEG-4 and MJPEG support for encoding of events through parameters now
- Display overlay of still-capture when streaming H264 (transparency)
- Introduced logXmlErr macro
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3196 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:07:37 +00:00
7ab4d4efbe
XML Plugin: Modified H264 behavior to utilize internal MPMoviePlayercontroller in eyeZm. Works more reliably now.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3195 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-15 21:35:29 +00:00
56018fc9b3
XML Plugin: Another bugfix in getEventPathSafe() to account for more variations in ZM installations
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3194 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-15 02:48:12 +00:00
f85c060ba6
XML Plugin: Check for ZM_DIR_EVENTS being defined in getEventPathSafe()
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3193 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-14 18:33:55 +00:00
e57c1b0331
XML Plugin: More config options added, stability fixes to H264 streaming
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3192 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-12 23:04:09 +00:00
78caa0adb0
XML Plugin: Added more XML Options along with H264 options. These will be disabled unless client ver >=1.2. Added ability to track client version in PHP
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3191 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-12 04:26:31 +00:00
461374dc2a
XML Plugin: Minor commit to impove h264 web-page appearance
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3187 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-11 07:57:46 +00:00
2d7979ac93
XML Plugin: Moved key XML Plugin options to database and updated ConfigAdmin/options.php to show XML Tab (new category 'XML' created). More H264 streaming updates
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3186 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-11 05:25:43 +00:00
97a99993d7
XML Plugin: Added preliminary H264 feed stream support
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3185 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-10 22:20:29 +00:00
f4b75d4f14
XML Plugin: Speed improvement where using inner join on Frames table was causing large delays for huge tables
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3184 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-10 01:32:14 +00:00
6307ecbb0c
XML Plugin: Checked for define of ZM_WEB_x_CAN_STREAM since 1.24.1 and .2 don't have this
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3182 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-08 17:23:13 +00:00
2a09efdfd4
XML Plugin: Looks like getEventPath is broken between 1.24.2 and 1.24.3, implement getEventPathSafe to workaround
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3181 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-07 04:05:16 +00:00
039358e00c
XML Plugin: Removing README
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3180 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-07 02:00:50 +00:00
2fc3936ec5
XML Plugin: vframe action checks if file exists and outputs image if not
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3179 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-07 01:23:08 +00:00
dd337affdc
XML Plugin: vframe action can now display alarm, regular and analyze frames based on input parameters, console can be sped-up by using 'nostatus' tag to skip daemon-check
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3178 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-06 01:37:32 +00:00
41405e1115
XML Plugin: Added vframe action, some more defines, condensed vevent parameter requirements
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3177 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-05 23:41:09 +00:00
1c7086dc39
XML Plugin: Modified event query to return frame scoring information along with the frame ID of the max. scoring frame
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3176 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-05 17:50:39 +00:00
d6575d90e1
XML Plugin: Split off actions from console.php into it's own file, actions.php
...
- Fixed bug where authentication wasn't being handled properly
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3175 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-05 16:48:57 +00:00
b60e60b062
XML Plugin: testing with eyeZm v1.1 and 1.24.3, bugfixes accordingly
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3174 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-04 19:25:34 +00:00
e86444cbc3
Importing initial XML Plugin files to build structure. Updated autoconf files to include Makefiles
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3173 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-04 07:07:40 +00:00
51a03d84ee
Updated with new bandwidth based stream config. Changed streaming to be more flexible.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3171 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 16:42:10 +00:00
32578e3fbf
Updated with new bandwidth based stream config. Fixed inadvertent triple equals comparison.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3170 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 16:41:00 +00:00
eda9757415
Updated with new bandwidth based stream config. Fixed inadvertent triple equals comparison.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3169 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 16:40:33 +00:00
9559ea297b
Updated with new bandwidth based stream config
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3168 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 16:39:47 +00:00
c7e4ebd85d
Updated with new bandwidth based stream config
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3167 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 16:36:50 +00:00
7e1979760e
Updated with new bandwidth based stream config
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3166 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 16:36:03 +00:00
825eda95a6
Regenerated
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3162 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 15:56:23 +00:00
70aee2ad56
Regenerated
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3160 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 15:50:41 +00:00
88a6371d46
Preserve replay mode in cookie
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3159 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 15:49:46 +00:00
9052dc1313
Corrected syntax error.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3158 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 15:46:57 +00:00
77a2d16493
Cosmetic/whitespace change
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3157 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 15:45:44 +00:00
1d77e03622
Updated skins/classic/includes/export_functions.php:
...
- time and date stamp in file name of master .html file modified: removed chars (i.e. :) that could trip up some browsers
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3150 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-10-20 18:13:29 +00:00
b5146a067c
Updated skins/classic/includes/export_functions.php:
...
- human-readable time and date stamp in file name of master .html file
- after download to client, master .html file is being removed from server
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3149 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-10-19 21:14:08 +00:00
b7d8f58929
Changed from
...
div.makeDraggable( { 'container': $('imageFrame'), 'onStart': setActivePoint.pass( i
), 'onSuccess': fixActivePoint.pass( i ), 'onDrag': updateActivePoint.pass( i ) } );
to
div.makeDraggable( { 'container': $('imageFrame'), 'onStart': setActivePoint.pass( i
), 'onComplete': fixActivePoint.pass( i ), 'onDrag': updateActivePoint.pass( i ) } );
So that motion detection areas are properly re-computed and updated in Zone config pages and db.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3144 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-10-12 22:50:49 +00:00
ee50a8c42e
Playback functionality embedded into exported jpeg event.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3131 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-09-29 16:19:41 +00:00
2709b3eec6
Stagecoach Wireless Second Test Commit:
...
commented string removed from file below to reverse first test commit
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3130 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-09-29 00:57:52 +00:00
80c5c3edb1
Stagecoach Wireless Test Commit:
...
commented string, will be removed with second test
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3129 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-09-29 00:55:10 +00:00
0cdc6e89ef
Added utility function
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3065 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-05-27 12:18:06 +00:00
60f0136ed3
Merged in image root changes
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3040 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-28 19:16:40 +00:00
255c311ef1
Updated by autoconf/automake
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3038 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-28 17:39:38 +00:00
2b375ef264
Changes to querying and probing.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3037 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-28 17:38:30 +00:00
ac0e0c9ca6
Fixed typo in Quicktime video
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3033 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-23 10:41:04 +00:00
9b31bf29e8
Added in image view to allow event root to be able web root
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3031 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-23 09:12:12 +00:00
1432bbed60
Changed splitcalls to explode
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3030 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-23 09:10:36 +00:00
a9c2044669
Changed split and ereg calls to explode and preg_match
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3029 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-23 09:00:31 +00:00
4f0c4cced0
Changed use of deprecated split function to explode
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3025 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-15 17:11:58 +00:00
63988218a7
Changed use of deprecated split function to explode
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3024 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-15 17:11:37 +00:00
6f464e7152
Changed use of deprecated split function to explode
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3023 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-15 17:11:17 +00:00
6659797e7d
Changed use of deprecated split function to explode
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3022 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-15 17:10:38 +00:00
bac71436fd
Changed use of deprecated split function to explode
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3021 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-15 17:10:10 +00:00
84e6d5142a
Seyi export bug fix.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3020 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-15 17:09:29 +00:00
aeee1aff69
Changed calls of deprecated split function to use explode
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3019 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-15 17:09:07 +00:00
5696516092
Updated Italian translation.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3010 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-01-14 10:12:11 +00:00
160c0d4fa2
Log missing view or request files.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2990 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-11-19 08:13:07 +00:00
266e669dde
Modified console filters to include archived events and fixed filters for timeline zooming.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2989 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-20 21:36:17 +00:00
f57480a6fe
Correctly location of favicon for mobile skin
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2988 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-18 20:15:49 +00:00
3ce4caa8e4
Corrected incorrect use of request variable
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2987 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-18 17:55:52 +00:00
97ba7a6684
Corrected some Mootools issues, autoCancel => link: cancel and onComplete => onSuccess. Also fixed montage alarm state class handling
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2986 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-16 17:13:16 +00:00
c2e251405e
Tweaked request timeout handling
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2985 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-16 17:11:29 +00:00
128fb0b07b
Fixed montage css behaviours
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2984 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-16 17:10:41 +00:00
2b519225dd
Fixed CSS typos
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2983 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-16 17:10:07 +00:00
1fad2d7ec9
Changed query separator to & and miscellaneous html fixes.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2982 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-16 17:09:16 +00:00
6fc7acb378
Changed query separator to & and added CDATA wrapper.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2981 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-16 17:04:44 +00:00
00d007cdf2
Fixed formatting.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2980 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-14 18:16:34 +00:00
a32d9e5fbc
Updated Makefiles
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2979 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-14 17:49:26 +00:00
e0801bc216
Updated to use mootools 1.2.3
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2978 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-14 17:38:13 +00:00
64b5290d14
Fixed broken link on time display
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2972 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-14 09:40:49 +00:00
b7405349c1
Removed bogus non-filter parameter
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2967 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-08 20:20:06 +00:00
93b955813f
Further PTZ preset tweaks
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2958 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-09-28 14:16:17 +00:00
1e2ecf0947
Updated Makefiles
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2957 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-09-28 13:35:23 +00:00
c5a0f98309
Factored out action and request control functionality. Added presets to mobile view for PTZ cams.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2956 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-09-28 13:34:10 +00:00
d77c2a48bd
Updated from forum.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2934 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-29 09:52:48 +00:00
8cad0dbd6a
Updated.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2933 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-24 10:27:28 +00:00
d529a079df
Fixed typo.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2930 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-22 11:23:28 +00:00
11a1cc2d41
Now supports custom perl install path
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2908 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-08 09:11:56 +00:00
3c10237833
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2905 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-28 08:47:59 +00:00
034f37cf4b
Applied contributed patch.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2890 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-25 18:03:46 +00:00
c652b358d7
Fixed issue with bogus empty lines after closing php tag.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2889 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-24 10:00:20 +00:00
6d19aa8742
Removed blank lines.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2872 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-13 10:58:00 +00:00
e5005b03b2
Fixed missing tag close.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2871 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-13 10:48:58 +00:00
e69489e841
Changes to stills event view for IE etc
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2866 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-08 11:21:28 +00:00
eaaaf88493
Applied 'mitch' IE compatibility patch.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2865 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-08 10:04:12 +00:00
282a542a6a
Ignore unparseable arp output.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2862 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-06 09:49:30 +00:00
d3787426f9
Fixed problem with 1 pixel gap in continuous events strip.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2861 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-06 09:49:09 +00:00
9116927ca2
Removed extranrous quote.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2860 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-06 09:48:01 +00:00
ce8e120765
Fixed undefined filterData when saving filters.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2847 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-14 10:13:06 +00:00
6f89730f2e
Fixed mootools extension.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2846 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-04 21:59:52 +00:00
56d87a15bc
Temporary checkin to disable mootools recursion issue.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2845 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-04 21:35:42 +00:00
72f908c4e7
Changed streaming to dynamically reduce frame rates if streams are sent too slowly. Made low bandwidth montage more resilient.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2844 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-03 12:10:54 +00:00
09bf78f865
Removed the stream scaling command as kills FireFox now.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2843 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-03 12:08:57 +00:00
bc8ba5d490
Changed extentsion of Request to mootools v1.2 format
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2842 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-03 12:07:45 +00:00
41f90e44ab
Removed weird line endings.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2841 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-03 12:06:45 +00:00
fa5db09a73
FIxed issues with negative FPS affecting streaming.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2839 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-01 19:39:23 +00:00
1edb48f358
Updated makefiles.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2838 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-01 09:06:12 +00:00
db81975d29
Fixes the standalone control view.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2837 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-01 08:37:10 +00:00
dc42b4a83b
Further mootools mods and slightly enlarged event view
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2836 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-01 08:01:49 +00:00
93d1cf8ed2
Updated makefiles
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2835 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-31 14:10:04 +00:00
b044291233
More mootools 1.2 migration mods.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2833 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-31 14:06:13 +00:00
595f303870
Updated with new probe settings.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2830 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-31 13:01:52 +00:00
62503acd16
Added monitor probe facility
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2829 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-31 13:00:49 +00:00
f5d7391e72
Changed Object reference to Hash for mootools 1.2
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2828 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-31 13:00:20 +00:00
54dc3b9668
Improved monitor naming checks and validation.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2826 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-31 10:55:19 +00:00
545ca029e3
Added next auto inc function
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2825 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-31 10:53:51 +00:00
3310ea3ae9
Added V4L version to presets and generic PAL/NTSC standards
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2823 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-30 12:00:14 +00:00
fc2a20bd5f
Further mootools migration
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2822 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-30 08:56:31 +00:00
2956b4bf14
Fixed issues with monitor creation/updating.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2821 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-30 08:56:15 +00:00
7b4c0fa926
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2820 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-27 16:01:59 +00:00
cfccc4b9bf
Updates to event export and javascript fixes.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2814 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-27 09:14:54 +00:00
75c654e654
Downgraded to support autoconf 2.59
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2812 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-23 21:59:13 +00:00
3069dc2402
Final timestamp update
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2802 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-09 12:45:32 +00:00
429884741a
Updated for timestamps
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2801 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-09 12:32:04 +00:00
133c9acfa0
Fixes and tweaks for filter view.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2800 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-09 12:28:45 +00:00
73ad3a7097
Changed types/order of stream status structs to work on 64 bit systems.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2797 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-08 14:34:09 +00:00
8613dc8f81
Updated
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2796 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-08 11:14:41 +00:00
f512cd91e7
Fixed issue with 'set' values.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2793 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-03 17:50:31 +00:00
e6530eda40
Added/update Chinese language files.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2792 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-03 17:48:41 +00:00
57f8127498
Slight revamp
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2782 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-19 14:17:33 +00:00
61089eeeb1
Added authentication hashed logins.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2781 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-19 14:06:39 +00:00
269306bc67
Fixed reordering down link issue.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2780 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-19 10:05:31 +00:00
66a19fe99b
Fixed control preset issue.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2779 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-19 09:45:29 +00:00
2f9524d00e
Fixed issue with default mobile view.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2761 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-16 18:12:15 +00:00
e3dce264e0
Fixed issue with exporting. Typo plus over-escaping.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2759 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-12 22:44:37 +00:00
8cc598d2f8
Fixed issue with default V4L version being v2 but default options displayed were for v1
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2758 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-12 22:44:11 +00:00
411952c3c7
Updated for 1.24.0
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2746 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-08 17:39:12 +00:00
22f22baa32
Updated
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2745 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-08 17:38:43 +00:00
c3fcf0a1e9
Added to SVN
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2744 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-08 17:24:07 +00:00
8560a5811c
Corrected sub-reference to language file.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2743 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-08 17:17:26 +00:00
e7955b81a7
Removed dodgy indentation
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2742 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-08 17:17:09 +00:00
20b7b21100
Update Swedish language file.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2741 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-05 14:57:23 +00:00
847606a200
Fixed further with editng control capabilities
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2737 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-30 17:43:29 +00:00
19ddc42f4b
Fixed bogus reference to $control
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2735 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 17:44:32 +00:00
c2cf6e31bc
Fixed issue with control edit screen losing changes.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2734 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 17:25:05 +00:00
cdc31b0e6d
Reduced initial events list load time.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2732 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 14:14:41 +00:00
56b5099c4c
Added window size for frame view
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2731 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 14:14:25 +00:00
e0310c0760
Commented out some V4L2 palette options.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2730 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 12:50:58 +00:00
e14efbd493
Updated generated files.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2726 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 11:24:01 +00:00
21d8d74a28
V4L2 updates
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2723 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-27 11:07:24 +00:00
b3b226ebe1
Changed labels to work better with ffmpeg monitors.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2720 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-21 17:45:30 +00:00
23d82a7e03
Added FFMPEG camera type
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2716 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-20 15:01:32 +00:00
d43d2289ed
Changes from updated build tools.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2714 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-20 14:54:50 +00:00
69f6270171
Fixed issue with X10 web commands.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2712 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-05 14:37:26 +00:00
4cf484e8ad
Changed > to >
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2711 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-06 00:54:15 +00:00
549aa39cbb
Updated autoconf/make files
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2710 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-06 00:05:56 +00:00
2419b6582e
Handle errors returned from Ajax more gracefully.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2709 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 23:58:58 +00:00
f2ad7cc770
Add offset to replay_rate to make it unsigned
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2708 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 23:56:15 +00:00
5d766dde92
Remove decorations from Cambozola applet and escape line endings in json values.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2707 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 23:44:43 +00:00
b8781904ca
Baselined rates and scales to base, replay_rate now short int.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2706 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 23:42:35 +00:00
69b9f78343
Added associate fetch function.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2705 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 23:15:08 +00:00
105c51b975
Adde in missing rename of showControls.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2696 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 19:06:35 +00:00
276533129d
Made DVR control appearance conditional on replay buffer being set
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2694 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 18:46:32 +00:00
50f60ab9d8
Added in conditional regexp http support
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2693 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 18:45:01 +00:00
f06b6cf60b
Added in define for prescence/abscence of libpcre
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2692 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 18:41:14 +00:00
6d78b17d90
Added CMD_VARPLAY to stream commands
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2687 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-11-03 13:16:47 +00:00
287517a84f
Actually added Notes to Events instead of Event
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2686 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-11-03 13:16:02 +00:00
8d42ead4d2
Added Notes to retrived Ajax event fields
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2685 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-11-03 13:15:02 +00:00
59b9f622d8
Strip out cr/lfs from JSON values
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2684 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-11-03 13:14:35 +00:00
7d96edeacd
Added .in files to svn
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2681 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-11-03 12:14:50 +00:00
e60149ce36
Modification to streaming to avoid making stream buffer if not required. Also cycle fix.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2679 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-29 23:08:21 +00:00
b7f97d388f
Added configuraion and detection of V4L2 to web interface.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2678 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-28 14:25:12 +00:00
9201e1319d
Fixed some php warnings.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2677 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-28 14:24:46 +00:00
9725a76371
Added default scale to getImagePath
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2673 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-28 12:49:04 +00:00
012ac787f6
Fixed filter execution issues.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2669 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-20 08:25:24 +00:00
81fd3aaa41
Restructured ajax to be consistent.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2668 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-16 16:12:23 +00:00
dc25beb8e4
Fixed MIME type issues.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2664 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-14 12:55:27 +00:00
ce58beb903
Fixed issues with filters
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2662 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-14 12:13:55 +00:00
c561a238a0
Fixed issues with event responses
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2661 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-14 12:13:44 +00:00
3663ea922b
Better handling of view only priveleges
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2658 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-09 09:15:53 +00:00
0a9298dbbe
Various web bugs fixed
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2651 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-07 09:02:17 +00:00
31d349124d
Fixed with montage when groups empty
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2649 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-05 20:07:22 +00:00
d2856ed019
Fixed issues with control capabilities and moveMap on watch view.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2648 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-05 19:58:13 +00:00
3714e5175c
Remove redundant initialisation
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2647 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-05 19:17:28 +00:00
7f7ba4d605
Fixed issue with incorrect monitor count in console
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2646 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-05 19:16:45 +00:00
8575b5f21a
Added mootols to distro
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2644 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-05 19:06:59 +00:00
1080485c33
Motage and event list issues, fixes.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2642 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-30 15:29:14 +00:00
8af774a98c
Fixes and patches.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2641 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-30 08:41:23 +00:00
323338b661
Applied Corey patch.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2640 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-29 13:15:13 +00:00
5bfe4b72c7
Fixed typo.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2637 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-29 11:42:59 +00:00
bec3dc9ff6
Fixed options issues including missing restart arning.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2636 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-29 08:55:25 +00:00
d4b0eaa554
Timeline revisions
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2635 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-29 08:16:34 +00:00
ef8f7b85fd
Continuing development and bugfixes
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2632 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-26 09:47:20 +00:00
ba788cc001
Fixed issues with creation, editing and deletion of monitors.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2626 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-01 16:43:34 +00:00
31a0762d9e
Fixed issues with remote method not being preserved.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2622 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-01 14:59:02 +00:00
45190dee61
Fixed options and user editing issues.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2621 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-01 14:05:06 +00:00
59ba3d4782
Whitespace
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2620 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-01 14:04:35 +00:00
0c2edfef4a
Corrected selection of LinkedMonitors.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2619 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-01 14:03:52 +00:00
64987d9399
Fixed incorrect assignment of empty user.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2618 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-01 14:03:01 +00:00
2133e94945
Omit Options link if permission insufficient.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2617 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-01 13:58:27 +00:00
b8d9bd68c2
Fixed null view file
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2616 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-01 12:39:24 +00:00
d6fc2d0cd5
Fixed display or error page.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2614 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-08-03 15:05:33 +00:00
bb2f87a6f0
Corrected undefined index warnings.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2613 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-08-03 15:04:44 +00:00
106882c161
Updated copyright notices
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2612 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-25 09:48:16 +00:00
0f0a8c004f
Changed skinSeq to skinBase
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2596 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-23 09:57:11 +00:00
5789f6a38e
Fixed to work with overriden skins
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2591 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-22 16:24:36 +00:00
b1c61a9eac
Made all but base point size proportional
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2590 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-22 16:23:49 +00:00
3fc9360255
Fxed MaxFPSs defaulting to 0.00 when not set.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2589 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-21 21:28:50 +00:00
62a8d6f9bc
Enlarged filter window.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2588 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-21 15:58:13 +00:00
6880f9e2bb
Removed unrequired Colours field
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2585 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-21 15:24:46 +00:00
77fd8dafbf
Added in better colour/palette initialisation for new monitors.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2581 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-21 15:19:25 +00:00
78f7038dc2
Fixed problem with options help and globals
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2576 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-18 15:01:38 +00:00
e10bd0c3e4
Fixed tabs
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2575 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-18 14:54:10 +00:00
03c66f87ef
Fixed up tabs
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2574 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-18 14:53:44 +00:00
44c54837c3
Fixed checkbox clearing not working and xhtml errors in layout.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2573 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-17 16:59:25 +00:00
7e40dc663c
Fixed canStreamApplet function call cockup
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2572 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 16:47:56 +00:00
8326e0d62e
Fixed js issues with IE
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2571 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 16:20:25 +00:00
0a20de9c1f
Set button states on editing a monitor
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2570 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 16:03:53 +00:00
58c861cd67
Fixed function call error
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2569 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 15:56:48 +00:00
4d71f97fb8
Formatting of th elements
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2568 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 15:52:22 +00:00
abaf825c95
Removed temp debug
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2567 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 15:52:09 +00:00
a65ab058db
Added simpler status query for still images
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2566 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 15:47:33 +00:00
acc47c04c9
Renaming and suppressed errors from sendto in case socket not open
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2565 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 15:19:12 +00:00
8418c4148e
Removed php code
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2564 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 15:18:40 +00:00
19fe97a8ca
Cosmetic change
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2563 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 14:03:18 +00:00
b78f172803
Removed further redundant classes
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2562 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:42:50 +00:00
1041bbc036
Eliminated bighead and smallhead classes
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2561 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:32:37 +00:00
9e90f0971a
Added ZM_BASE_PATH, may not be necessary though.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2560 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:23:32 +00:00
40393e50aa
Moved calendar path
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2559 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:22:22 +00:00
8107c93933
Changed OPT_MPEG to OPT_FFMPEG
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2558 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:21:26 +00:00
d83525cf76
New paths to mootools and favicon. Reset.css not just screen media.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2557 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:18:05 +00:00
37562208b6
Removed some redundant css definitions
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2556 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:17:26 +00:00
cd2f1ea795
Fixed for new path to skin graphics
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2555 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:16:57 +00:00
fad6b0ec11
PTZ control restructuring.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2554 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:16:19 +00:00
336ce62c15
Reorganised PTZ controls and layout somewhat
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2553 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:15:28 +00:00
4874433558
Moved favicon to graphics dir
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2552 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:14:19 +00:00
d840a3e4f2
Fixed up properties
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2551 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:13:17 +00:00
8b3ceb506b
Moved PTZ graphics
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2550 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:06:21 +00:00
1d0d430bb6
Moved favicon to graphics dir
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2549 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:06:07 +00:00
57fa598fd8
Removed session_write_close calls and fixed monitor action
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2545 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:44:39 +00:00
d6f85862ac
Fixed path to export functions
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2544 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:43:29 +00:00
eeea85bf7b
Removed spacer gif as not required.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2543 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:43:10 +00:00
decaf0ef31
Fixed broken default user reference
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2542 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:42:28 +00:00
e7c025712a
Fixed path to export functions
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2541 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:41:53 +00:00
5e4a953dcd
Adjusted layout
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2540 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:41:37 +00:00
5c9e835c73
Corrected error in configureButtons function
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2539 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:41:21 +00:00
a04b2b4f85
Corrected comments and added skin path as global js variable
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2538 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:40:53 +00:00
bfd67f69fd
Fixed to work properly with MPEG cameras and presets
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2537 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:40:21 +00:00
76345804e1
Fixed incorrect use of global
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2536 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:39:34 +00:00
f5c2733fb1
Fixed paths to montage css files and store layout as cookie
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2535 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:39:04 +00:00
0c91ea7d50
Fixed path to css
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2534 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:38:21 +00:00
ccfc7acbae
Correct path to control functions
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2533 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:37:59 +00:00
aed786dd0e
Fixed unquoted array indexes
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2529 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-15 21:24:31 +00:00
4f67ddd94a
Fixed language selection
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2528 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-15 21:24:14 +00:00
0c4b4ba445
Merged in changes from Axis MPEG
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2527 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-15 21:20:46 +00:00
95ac7dadb3
Fixed headerControl div positioning
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2523 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-15 09:04:45 +00:00
33f161fede
Removed redundant MONTAGE_WIDTH/HEIGHT
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2522 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-15 09:04:09 +00:00
f7c46aa838
Fixed OLANG issues
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2521 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-15 09:03:42 +00:00
c58b322a6e
Merged in mpeg_encode removal
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2520 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 15:56:52 +00:00
81065ba6dd
Removed learn state bits
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2510 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 14:42:20 +00:00
2824cb7355
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2508 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 13:54:50 +00:00
f2cd98f99b
Updates
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2507 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 13:37:06 +00:00
5621a3f283
Added retry on timeouts
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2505 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 13:31:47 +00:00
c617a8436c
Bug 434 - Added delete functionality back into DVR events view plus enhanced events scrolloing etc to support.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2391 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-04-21 13:52:05 +00:00
44943e21e9
Bug 477 - Switched device height and widths to be correct.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2388 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-04-15 14:02:53 +00:00
2cba5c3ecc
Bug 66 - Fixed 'prev' link in watch view.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2387 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-04-15 14:01:20 +00:00
d2c3591925
Changed 100's to SCALE_BASE where appropriate
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2386 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-04-15 13:35:20 +00:00
2549d98d1f
Bug 476 - Added pagination at bottom of events list as well as top.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2385 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-04-15 13:34:46 +00:00
4c452c22c3
Bug 470 - Fixed some anachronistic control script references
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2344 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-03-10 09:43:48 +00:00
002978a761
Indentation changes.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2343 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-03-10 09:43:18 +00:00
5335397f58
Bug 469 - Filter queries were urlencoded twice.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2341 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-03-10 09:37:52 +00:00
5ea3f88b18
Bug 463 - Moved xhtml header emission into each file to avoid inadvertent prepending of video downloads. Also autogenerate mime-type.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2314 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-20 23:11:25 +00:00
a426ed3d05
Bug 449 - Fixed typo in config name
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2309 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-13 23:44:06 +00:00
4ce40854ee
Cosmetic - Removed surplus space
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2304 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-13 22:42:33 +00:00
f786d38334
Bug 459 - Removed duplicate frame image
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2303 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-13 22:41:58 +00:00
569b669a9e
Bug 70 - Updated german language files, removed strtolowers and centered sequence images.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2298 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-10 23:07:02 +00:00
eaab76d075
Bug 448 - Fixed some references to old style filter constructs.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2293 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-10 22:13:16 +00:00
064d7e429e
Bug 451 - Strips slashes before escaping if magic quotes on.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2292 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-10 22:12:00 +00:00
3f953d9b24
Bug 444 - Update Hungarian translation (again)
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2291 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-10 21:58:00 +00:00
f960f55314
Bug 444 - Updated Hungarian translation
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2290 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-10 21:56:22 +00:00
abab524930
Bug 449 - Made Ajax request timeouts configurable.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2289 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-10 21:52:44 +00:00
4802f67587
Bug 440 - Fixed broken PTZ control commands
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2288 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-02 15:27:12 +00:00
9e13cae829
Bug 438 - Fixed various PTZ protocol and control issues.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2281 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-01-08 12:33:11 +00:00
88da842913
Bug 433 - Changed uses of Archive as noun to Archived.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2278 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-31 16:32:46 +00:00
a564a904cc
Bug 437 - Update Hungarian translation.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2277 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-31 16:31:57 +00:00
70284ed18a
Bug 435 - Removed duplicated buffer count tokens.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2276 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-31 16:18:55 +00:00
903cde75b5
Uodated for 1.23.1
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2275 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-29 19:07:44 +00:00
97dd987315
Bug 427 - Allow aspect ratio to be preserved in monitor size changes.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2271 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-29 18:48:16 +00:00
30c1a60294
Updated language files for 1.23.0
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2265 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-21 17:01:21 +00:00
9b7337045c
Fixed problem with Weekdays and filters.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2264 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-21 16:46:59 +00:00
6d20c94571
Bug 425 - Fixed issue with cycle view when no montage width/height defined.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2262 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-21 12:54:20 +00:00
66b7d3ec73
Bug 422 - Fixed issue with navigating view when no filter.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2261 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-21 11:58:04 +00:00
45cb0c2d22
Fixed undefined reference.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2260 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-21 11:35:49 +00:00
3e4496cad9
Fixed issue with Monitor sequences.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2259 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-21 11:35:23 +00:00
74a92765a4
Bug 419 - Mods to allow Konqueror to stream.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2255 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-09 16:28:12 +00:00
5aad02876b
Bug 418 - Fixed inconsistent Export permissions.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2251 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-08 18:42:38 +00:00
877605fe12
Fixed default view being ignored issue.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2247 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-23 13:02:52 +00:00
d51427e567
Commented out some non-error error_log calls.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2246 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-20 17:08:59 +00:00
dc8aa90860
Added stream replay mode control.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2245 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-20 17:06:45 +00:00
2457b6ddaa
Fixed broken control commands global reference.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2244 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-20 17:06:15 +00:00
48e80ea771
Corrected default label format.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2241 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-18 12:35:15 +00:00
c78fec4577
Fixed incorrect Video link.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2240 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-18 12:34:58 +00:00
4f426ba966
Added timeouts to Ajax requests.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2238 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-11 16:00:12 +00:00
9670d8b5f6
Fixed DB typos.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2237 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-11 15:59:59 +00:00
3e65614d4d
Added MooTools extension script
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2236 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-11 15:59:29 +00:00
54c577b3e3
Commented out non-error error_log entries
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2235 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-11 15:58:36 +00:00
f0e2175340
Fixed sql issue with changing monitor function.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2233 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-07 18:51:43 +00:00
69850ef6bc
Revamped Ajax request files and fixed force/disable alarm commands.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2231 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-04 17:33:45 +00:00
b75c33afa2
Fixed non-Pelco PTZ control protocols.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2230 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-04 17:31:25 +00:00
1e1ce0f448
Bug 388 - Updated Italian translation.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2227 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-24 10:44:44 +00:00
918e20b0e0
Removed version number from mootools include.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2226 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-24 10:39:17 +00:00
4c1d53ca1b
Fixed some javascript issues with IE.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2223 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-19 12:34:04 +00:00
e282b1695c
Updated with new language tokens.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2218 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-18 14:33:51 +00:00
160750f81c
Initial language edits.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2217 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-18 14:22:15 +00:00
b7ccd67ea7
Added annotations to DVR buttons.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2215 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-18 14:10:56 +00:00
27718cfbbd
Allow streamImg to refer to object as well as image.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2214 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-18 14:01:53 +00:00
691d80b3fa
Made options window slightly taller.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2212 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-18 14:01:06 +00:00
0ed68c6574
Bug 389 - Added Hungarian translation
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2210 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-18 11:17:31 +00:00
2f13397a03
Fixed xhtml issues.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2208 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-18 08:42:33 +00:00
3b4ea51be2
Bug 352 - Controls now disabled for unprivileged users.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2207 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-17 22:07:50 +00:00
8d205edbbd
Fixed typo.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2206 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-17 21:15:26 +00:00
72166a3bbf
Fixed typos in filter queries.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2205 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-17 20:38:33 +00:00
3427dfddd2
Bug 42 - Users can now change their own passwords.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2204 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-17 15:49:08 +00:00
b7d9da390b
Removed some extraneous urlencode functions.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2202 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-17 13:49:21 +00:00
6e871a7335
Bug 33 - Added ability to use jscalendar on date, date/time fields.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2201 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-17 13:48:40 +00:00
Isaac Connor
Kfir Itzhak
Kyle Johnson
m-bene
Kyle Johnson
Maciej Czerniak
Sune1337
Andrew Bauer
Justin Lawrence
Isaac Connor
Adam J. Henry
Scott Robinson
Miklos Marton
Edward Barnard
Philipp Rehs
David Nesting
kjohnson
Chris Wiggins
Isaac Connor
Kevin Crider
Knniggett
Serguei S. Dukachev
Richard Kojedzinszky
Isaac Connor
nagyrobi
nextime
stan
jaidhar
stagecoach
viseon