d25e75f485
Merge branch 'updated-console' of github.com:ZoneMinder/ZoneMinder into updated-console
2016-05-03 14:39:59 -04:00
c3628a8dfd
Merge branch 'updated-console' into storageareas
2016-05-03 14:34:58 -04:00
4defe92911
Merge branch 'master' into updated-console
2016-05-03 14:22:37 -04:00
36da4aed88
Push monitor view back to before I messed with it
2016-05-03 13:55:38 -04:00
b92c9f9be4
Add state modal to options view
2016-05-03 13:55:38 -04:00
3271d17a3a
Remove header from log view
2016-05-03 13:55:38 -04:00
464db86c53
Revert "Add sidebar and top nav to Monitors popup view"
...
This reverts commit 315fb3e857
2016-05-03 13:55:38 -04:00
44fbbee152
Major rewrite of states view. Now a modal on every page.
...
Read: No longer an HTML popup window.
* State html is now included toward the bottom of every page
* The states.js has been rewritten in jquery
* Applying, deleting or saving a state reloads the page after the POST is done
2016-05-03 13:53:30 -04:00
2e2cc3d9ab
Change 'marked' row style to bootstrap 'danger' and find it with jquery
2016-05-03 13:53:30 -04:00
62fc4dff7e
Change class of delete button to be red
2016-05-03 13:53:30 -04:00
0f5089bbf8
Fix button alignment on console page, and add button styling
2016-05-03 13:53:30 -04:00
f305a6ffc8
Replace console table css with styles from bootstrap
2016-05-03 13:53:30 -04:00
291179d3b1
Add side tab list to options page, and style it.
2016-05-03 13:51:54 -04:00
cf6f36b0e5
Add header to log view
2016-05-03 13:51:54 -04:00
3e51429fb0
Move skin and css changing up above the include of header.php so that the set cookie call will work
2016-05-03 13:51:54 -04:00
e435b3ebed
remove duplication
2016-05-03 13:51:54 -04:00
d698f2af14
Restyle the header. Full width, dark background, collapseable.
2016-05-03 13:51:54 -04:00
7a6dae69f0
Convert options layout to side-tabs, and improve readability
2016-05-03 13:51:54 -04:00
d12fc95ad1
Restyle options view with horizontal form layout
2016-05-03 13:51:54 -04:00
2214cb6389
Add styling to delete / save / add buttons in options.php
2016-05-03 13:51:54 -04:00
b317797a6c
Remove cancel button from options as it no longer makes sense.
2016-05-03 13:51:54 -04:00
2a9b10e80e
Update options.php to use bootstrap container
2016-05-03 13:51:54 -04:00
be8385535d
Oops. Move Console view outside of canView(system) restriction
2016-05-03 13:51:54 -04:00
858845e3a1
Add a link back to console in header
2016-05-03 13:51:54 -04:00
a8c7ec250d
Make the Options link a standard href (not a popup).
2016-05-03 13:51:54 -04:00
25c9328187
Move console php code to header as that code is now needed in additional views.
2016-05-03 13:51:54 -04:00
cd8e8d9685
Move the header into its own file, and include it in options view.
2016-05-03 13:51:34 -04:00
a4e07e9a73
Update options styling
2016-05-03 13:51:34 -04:00
2fff9a6a8b
Fix state link to do popup like before
2016-05-03 13:51:34 -04:00
3e59aca739
Additional footer padding
2016-05-03 13:51:34 -04:00
d6b0b637ea
Add styles to additional console buttons
2016-05-03 13:51:34 -04:00
c3cc5d46bd
Wrap footer in container-fluid
2016-05-03 13:51:34 -04:00
d7f471f41f
Restyle of Login page.
2016-05-03 13:51:34 -04:00
03c188db89
Move recaptcha javascript to actual <head> tag
...
The way it was handled previously resulted in invalid html, with an
extra <head> tag being inserteed inside the <body>.
2016-05-03 13:51:34 -04:00
aa3c99fc68
Initial major restyle of classic skin.
2016-05-03 13:51:34 -04:00
516bacdfd3
Merge branch 'updated-console' into storageareas
2016-05-03 13:38:57 -04:00
a1b4869ee6
Add state modal to options view
2016-05-03 13:33:22 -04:00
0a77da8a2f
Remove header from log view
2016-05-03 13:33:08 -04:00
550fdc9295
change thumbnail path to specify eid and fid instead of path to the jpg.
2016-05-02 13:42:15 -04:00
9d6a7541c8
add Id column to storage areas
2016-05-02 10:40:42 -04:00
da157f5a1a
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-04-30 22:27:10 +10:00
0044161b9c
Merge branch 'fix_zone_edit' into storageareas
2016-04-29 10:46:37 -04:00
be5f0cd4a9
replace OutputVideoStream and OutputImageStream with versions that return a string. Call getStreamHTML before we output the headers because we use streamMode and streamSrc in the header .js.php
2016-04-29 10:44:46 -04:00
59406fd03a
Merge branch 'master' into storageareas
2016-04-28 09:24:36 -04:00
ac5fdb8956
Merge pull request #1421 from connortechnology/fix_events_pagination
...
remove the if(pages>1) so that the if > line always happens
2016-04-28 21:43:54 +10:00
010f748016
fix clone merge
2016-04-26 15:02:34 -04:00
0adbaafd98
Merge branch 'master' into storageareas
2016-04-26 13:10:37 -04:00
fe9cb4b7ec
Merge pull request #1442 from ZoneMinder/fix_rotate
...
Fix rotate
2016-04-26 09:54:01 -05:00
851e8f46ff
redo fix_rotate
2016-04-25 15:57:39 -04:00
b50172fc2e
introduce a Frame object. Alter the image view to take just an fid, in which case it is the unique primary key Id of the Frame.
2016-04-25 14:59:55 -04:00
85798932ee
Use Event Width and Height, not the Monitor Width and Height. THe Monitor dimensions are not rotated
2016-04-25 14:10:26 -04:00
fed575bdb4
add some missing () on class method calls. Remove some no longer needed global 's and some empty lines
2016-04-25 08:56:21 -04:00
f3a2f9e223
Revert "Add sidebar and top nav to Monitors popup view"
...
This reverts commit 315fb3e857
2016-04-24 14:15:42 -04:00
802a8928d0
Revert "Add missing <form> back to monitor view"
...
This reverts commit cc08607939
2016-04-24 14:15:33 -04:00
cc08607939
Add missing <form> back to monitor view
2016-04-24 14:03:04 -04:00
08fb74c992
Major rewrite of states view. Now a modal on every page.
...
Read: No longer an HTML popup window.
* State html is now included toward the bottom of every page
* The states.js has been rewritten in jquery
* Applying, deleting or saving a state reloads the page after the POST is done
2016-04-24 00:48:16 -04:00
81757a0465
Merge pull request #1418 from pliablepixels/1417-clone-monitor
...
Clone feature added
2016-04-20 13:02:10 -05:00
ba3f9d1b9a
Merge branch 'master' into storageareas
2016-04-19 12:03:21 -04:00
b2d02a64f4
reload stream after error
2016-04-19 12:02:58 -04:00
10589ee913
Change 'marked' row style to bootstrap 'danger' and find it with jquery
2016-04-18 15:38:10 -04:00
2c5e04a9af
Change class of delete button to be red
2016-04-18 15:38:01 -04:00
7504d69dea
Fix button alignment on console page, and add button styling
2016-04-18 15:25:48 -04:00
c9b81e07c2
Replace console table css with styles from bootstrap
2016-04-18 15:20:32 -04:00
bc99e4c476
whitespace changes
2016-04-17 09:29:14 -04:00
50f2747bb4
remove the if(pages>1) so that the if > line always happens
2016-04-15 16:11:53 -04:00
b57abb4e54
revert
2016-04-15 12:50:51 -04:00
804ac1de81
Clone feature added
2016-04-14 13:53:10 -04:00
6ca40966a1
remove teh dropdown-ness of the montage options
2016-04-12 08:52:26 -04:00
61bd60184a
Merge branch 'random_fixes' into storageareas
2016-04-11 11:28:24 -04:00
851a81eff7
Merge pull request #1406 from ZoneMinder/svg_zones
...
replace the static zone image with a stream, and use SVG to draw the zones
2016-04-11 11:14:11 -04:00
d493ca69a9
Merge branch 'master' into icon_video
2016-04-11 09:31:51 -04:00
39a30ff51b
refresh parent when cancel is clicked
2016-04-10 15:59:13 -05:00
e5bf2d245c
quit the stream in zones.php when zone.php is called
2016-04-10 15:33:55 -05:00
fbb2a527e6
remove setButtonState. it is not needed.
2016-04-10 07:55:45 -05:00
988d611d03
remove unused code
2016-04-09 21:37:00 -05:00
e7d35d16bc
add monitor alarm state and fps to zone edit view
2016-04-09 21:34:30 -05:00
78c6e14e0c
Merge branch 'master' into storageareas
2016-04-09 14:52:28 -04:00
0c8e0ac220
change quotes to prevent php7 complaint
2016-04-09 11:24:59 -04:00
6d27a857aa
put a zones class on the svg
2016-04-08 14:38:50 -04:00
c73e768f1f
put in the onclick for the zone to open the edit page
2016-04-08 14:25:19 -04:00
b10c6ee093
fix Monitor capitalisation
2016-04-08 14:23:44 -04:00
758a0341ce
convert monitor to object
2016-04-08 14:09:59 -04:00
f749ff47ea
convert to monitor object
2016-04-08 13:40:32 -04:00
0ce85137dc
remove points. Don't need them here
2016-04-08 13:39:31 -04:00
56a91ed4b2
rename monitor object from Monitor to monitor. Remove points in zone list.
2016-04-08 13:37:29 -04:00
8735f1ac73
convert to monitor object
2016-04-08 13:37:01 -04:00
6bb95beb9a
Merge branch 'svg_zones' into storageareas
2016-04-08 13:20:01 -04:00
f20945bf84
update zone points in SVG
2016-04-08 13:13:10 -04:00
7da6e1e5a1
use stream for image, add SVG polygon
2016-04-08 12:36:09 -04:00
256df08af4
update SVG polygon points on point update
2016-04-08 12:32:26 -04:00
45d58c3ad6
convert points to circles, because squares are not centered on the point.. but a circle is
2016-04-08 11:17:16 -04:00
79552e5393
use new getStreamHTML
2016-04-08 11:11:09 -04:00
3be3a3ada2
convert the monitor variable to a Monitor object, replace the static zone image with a stream, and use SVG to draw the zones
2016-04-08 10:46:51 -04:00
9a795432cf
merge all the commits from the messed up iconnor_video branch
2016-04-05 17:14:46 -04:00
60642c1fff
Merge branch 'iconnor_video' into storageareas
2016-04-05 12:32:33 -04:00
238a25a302
Merge branch 'master' into iconnor_video
2016-04-05 09:38:59 -04:00
4d7ded5ef0
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
configure.ac
src/Makefile.am
web/js/Makefile.am
2016-04-05 22:06:14 +10:00
a0e6c004a2
Merge pull request #1388 from ZoneMinder/reload_stream_on_error
...
try to reload the image stream on error.
2016-04-04 20:57:48 -05:00
4e9a925933
Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete
2016-04-04 20:52:49 -05:00
7ff8d36598
Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation
2016-04-04 20:44:53 -05:00
6c8e8368e1
rtsp should be lower case
2016-04-04 16:56:54 -04:00
6c92c0e3f7
Merge branch 'reload_stream_on_scale' into storageareas
2016-04-04 16:13:35 -04:00
98fce7c3c6
Merge branch 'reload_stream_on_error' into storageareas
2016-04-04 16:13:26 -04:00
123a1a898a
try to reload the image stream on error.
2016-04-04 15:04:09 -04:00
0b13f9d76f
reload stream on scale change
2016-04-04 14:58:07 -04:00
b3f0f5d0e8
Merge branch 'updated-console' into storageareas
2016-04-04 11:51:07 -04:00
197ae67313
Merge branch 'always_show_ptz' into storageareas
2016-04-04 11:47:29 -04:00
9dfe71ceb8
Always show events and always show ptz controls. Also clean out some commented out cruft
2016-04-04 11:39:12 -04:00
43e4052dd9
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-04-04 11:36:03 -04:00
dd153d8efb
add header.php to autotools build
2016-04-04 11:35:51 -04:00
315fb3e857
Add sidebar and top nav to Monitors popup view
2016-04-01 15:52:52 -04:00
96aa20fb79
value should be lower case when checking for rtsp
2016-04-01 15:43:59 -04:00
5f6d140de5
Load all event fields, so we know we have them deeper in the code.
2016-04-01 14:07:27 -04:00
92e0552f8e
Add side tab list to options page, and style it.
2016-04-01 14:02:19 -04:00
8c5d309feb
Add header to log view
2016-04-01 13:44:37 -04:00
fa3425f2b0
Merge branch 'updated-console' of github.com:ZoneMinder/ZoneMinder into updated-console
2016-04-01 13:43:26 -04:00
82b32578ec
Merge branch 'master' into iconnor_video
2016-04-01 12:54:09 -04:00
6816a4c75b
Merge branch 'iconnor_video' into storageareas
2016-04-01 11:35:38 -04:00
a2e228a5ca
put quotes aroudn the string
2016-04-01 11:01:16 -04:00
3140905d02
whitespace and structure changes to match google coding style. Use new htmlSelect function to build the select dropdowns. Use a monitor object instead of a newMonitor array
2016-04-01 10:35:34 -04:00
abcf48b65c
Merge branch 'master' into feature-h264-videostorage
2016-04-01 08:53:45 -04:00
e7ee464a17
Add a RecordAudio setting to the Storage Tab
2016-03-31 15:50:44 -04:00
c9a1a9020d
Merge h264
2016-03-31 11:03:36 -04:00
e5a36c02bd
Merge remote-tracking branch 'origin/master' into video_remote
2016-03-30 16:55:24 -04:00
ea49dc20d1
Merge branch 'master' into storageareas
2016-03-30 10:58:07 -04:00
e9c65785e8
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-03-30 10:56:53 -04:00
247cb3d0b2
Merge pull request #1360 from schrorg/monitornames-spaces
...
Allow spaces in monitor names
2016-03-30 09:17:57 -04:00
0ab6e27259
Use Monitor object
2016-03-29 14:35:12 -04:00
f0a307e082
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
...
Conflicts:
distros/ubuntu1504_cmake/control
2016-03-29 11:53:17 -04:00
1ea1852476
Do some Storage Areas support
2016-03-29 11:52:25 -04:00
c8c0586c66
Trim monitor names
2016-03-29 11:40:14 +02:00
6eda3eff72
do not set maxfps fields during onvif probe
2016-03-26 08:38:28 -05:00
71db9b84e6
Allow spaces in monitor names
2016-03-24 14:37:24 +01:00
757740ede5
Move skin and css changing up above the include of header.php so that the set cookie call will work
2016-03-23 16:12:51 -04:00
dd06db0bf0
remove duplication
2016-03-23 15:54:20 -04:00
a66e97de09
Merge & fix new console & options
2016-03-23 09:48:57 -04:00
3a8352eb6b
Merge branch 'master' into storageareas
2016-03-21 10:25:03 -04:00
dd937f7732
Restyle the header. Full width, dark background, collapseable.
2016-03-16 00:51:13 -04:00
897a0a995c
Convert options layout to side-tabs, and improve readability
2016-03-15 15:21:28 -04:00
183f58ad17
Restyle options view with horizontal form layout
2016-03-15 14:43:22 -04:00
694ad0b539
Add styling to delete / save / add buttons in options.php
2016-03-15 14:08:01 -04:00
bd30d40522
Remove cancel button from options as it no longer makes sense.
2016-03-15 14:03:17 -04:00
0004a1180e
Update options.php to use bootstrap container
2016-03-15 13:56:54 -04:00
26748c2de5
Oops. Move Console view outside of canView(system) restriction
2016-03-15 13:52:36 -04:00
f05c1548ce
Add a link back to console in header
2016-03-15 13:49:14 -04:00
299c61c1ec
Make the Options link a standard href (not a popup).
2016-03-15 13:47:31 -04:00
8070bf8700
Move console php code to header as that code is now needed in additional views.
2016-03-15 13:46:03 -04:00
49f46ac927
Move the header into its own file, and include it in options view.
2016-03-15 13:43:49 -04:00
8acfe1b0d8
Update options styling
2016-03-12 22:44:11 -05:00
2378c9a359
Fix state link to do popup like before
2016-03-12 20:44:42 -05:00
d202760d82
Additional footer padding
2016-03-12 20:37:07 -05:00
f5ba52824a
Add styles to additional console buttons
2016-03-12 20:36:39 -05:00
bebb1017fd
Wrap footer in container-fluid
2016-03-12 20:27:22 -05:00
5e2d4bc325
Restyle of Login page.
2016-03-12 20:11:32 -05:00
a403c1db8c
Move recaptcha javascript to actual <head> tag
...
The way it was handled previously resulted in invalid html, with an
extra <head> tag being inserteed inside the <body>.
2016-03-12 19:14:07 -05:00
71c35e712b
Initial major restyle of classic skin.
2016-03-12 03:28:02 -05:00
77f7a3642c
remove check for "selected" property
2016-03-09 10:34:06 -06:00
3280aff876
disable save button when nothing slected. fixes #1322
2016-03-09 09:43:44 -06:00
86dbe4fa15
define default for StorageId to prevent error message
2016-03-03 09:22:53 -05:00
bcb403bf08
Merge branch 'fix_setButtonStates' into storageareas
2016-03-03 09:08:37 -05:00
c0ed40fd06
fix structure of if/for
2016-03-03 09:06:57 -05:00
cedc46adf3
Merge branch 'fix_setButtonStates' into storageareas
2016-03-02 09:12:19 -05:00
bb0dcf3d43
fix setButtonStates. The checkboxes are an array.
2016-03-01 12:19:46 -05:00
3ce620eb89
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-02-27 19:46:56 +11:00
d40bf89b17
Remove Phone BW settings used with mobile skin
2016-02-26 22:43:37 +11:00
4837585601
Deleted eyezm options documentation and references to it in other areas of documentation. Removed zmstreamer.cpp.
...
Conflicts:
src/zmstreamer.cpp
2016-02-26 22:37:23 +11:00
5ff427d9e9
Removed Autotools Makefile.am
...
Conflicts:
Makefile.am
misc/Makefile.am
src/Makefile.am
web/includes/Makefile.am
web/js/Makefile.am
web/skins/classic/css/classic/views/Makefile.am
web/skins/classic/css/flat/views/Makefile.am
web/skins/classic/views/Makefile.am
web/skins/classic/views/js/Makefile.am
2016-02-26 22:19:02 +11:00
131d0daefe
fix syntax
2016-02-19 11:47:18 -05:00
5a2a4baa89
Must load StorageId as well when loading event
2016-02-19 09:47:19 -05:00
68babd783b
Merge branch 'master' into storageareas
2016-02-17 09:46:56 -05:00
172a4c6bd4
Add montagereview.php to autotools build.
2016-02-16 09:29:49 -05:00
292e3a141f
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-02-12 13:53:34 -05:00
5da8df45a7
Merge branch 'hide_rtspdescribe' into storageareas
2016-02-12 13:53:09 -05:00
5f217b48e0
When Protocol is HTTP, hide the RTSPDescribe line. Make it appear when Protocol is changed to RTSP
2016-02-12 13:52:59 -05:00
b7256a6891
Merge branch 'master' into storageareas
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
version
2016-02-10 09:17:40 -05:00
0b2a309014
Merge pull request #961 from Linwood-F/960-montage-review-new-feature
...
960 montage review new feature
2016-02-08 20:40:04 -06:00
e106a86f5e
Add Concurrent
2016-02-05 11:59:05 -05:00
555904c588
Add Storage column to console
2016-02-03 09:42:50 -05:00
cc2c1405ed
include Event.php
2016-02-01 14:59:06 -05:00
4e9e01836f
Use Event->Path instead of ZM_DIR_EVENTS
2016-02-01 13:41:57 -05:00
7301e803ed
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2016-01-30 15:45:08 +11:00
f16fb5c5f6
use eid and fid instead of specifying the path to the image
2016-01-14 13:34:12 -05:00
02f8fb80da
Put the monitor Id in the title so that it appears on mouseover.
2016-01-14 11:05:05 -05:00
7ce049dad1
add a title to each monitor with the name so that the mouseover will show it
2016-01-14 10:50:42 -05:00
818cd614eb
Merge branch 'multi-server' into storageareas
2016-01-08 10:17:37 -05:00
99dfaa97fa
User Name instead of ServerName and Hostname instead of ServerHostname
2016-01-08 10:15:21 -05:00
d13829c6f3
Add Hostname to list of servers, since we have the space for it.
2016-01-08 10:15:06 -05:00
270c737f40
Merge branch 'master' into storageareas
2016-01-05 09:36:36 -05:00
44f3b99d24
change logic to show server column if any servers are defined. Reason is that once you have setup 1, you want to know which cameras have not been assigned a server yet
2016-01-04 14:59:04 -05:00
75f6da3526
Merge branch 'multi-server' into storageareas
2016-01-04 14:53:52 -05:00
273ab6c5c6
Only show Server column when more than 1 Servers are defined
2016-01-04 14:51:24 -05:00
5c0e4aa172
Merge branch 'multi-server' into storageareas
2016-01-01 17:11:01 -05:00
cf7e168872
Fix populating the server filter and then fix filtering by server. Also introduce robustness and consolel ogging when a filter doesn't exist
2016-01-01 17:10:37 -05:00
468f997e4c
Soft error, with logging when the filter element doesn't exist
2016-01-01 16:36:29 -05:00
93dbc3f0c1
Merge multi-server updates and bump version
2016-01-01 16:31:02 -05:00
31ba0221ed
Add Server to filters and log results
2015-12-31 10:13:03 -05:00
983b47f6dc
Add Server columns
2015-12-31 09:09:57 -05:00
479e5df454
Add default events dir to dropdown
2015-12-22 10:53:39 -05:00
1aa79c306b
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-12-22 09:47:45 -05:00
a840246849
Add Server dropdown for ServerId
2015-12-21 14:29:53 -05:00
aa9a6ddcc3
populate dropdown with the available storage areas when StorageId is selected
2015-12-21 14:12:33 -05:00
dfd7986c01
Merge branch 'master' into multi-server
...
Conflicts:
distros/debian_cmake/links
distros/ubuntu1504_cmake/zoneminder.postinst
2015-12-21 12:57:45 -05:00
ca07b951cb
Merge branch 'master' into newpointone
...
Conflicts:
docs/installationguide/ubuntu.rst
2015-12-21 12:41:25 -05:00
872e5eff15
Merge branch 'multi-server' into newpointone
...
Conflicts:
web/lang/en_gb.php
web/skins/classic/views/filter.php
2015-12-21 11:35:16 -05:00
00c4eedb90
Add StorageId and StorageName to fields that we can filter on
2015-12-21 10:04:13 -05:00
b626712a2f
Add ServerId and ServerName to fields that we can filter on
2015-12-21 10:03:48 -05:00
e28e3c2b75
Merge branch 'master' into feature-h264-videostorage
2015-12-20 14:13:30 +11:00
e5f243a9f8
Merge branch 'maxfps' of https://github.com/knnniggett/ZoneMinder into knnniggett-maxfps
2015-12-19 08:16:20 -06:00
fb1766f21f
Add storage.php
2015-12-18 11:39:42 -05:00
09c75e2363
add a storage area editing page
2015-12-15 14:08:34 -05:00
20f9a01a66
Add a Storage tab, to provide a place to define your storage areas
2015-12-15 11:13:21 -05:00
14dc447145
add a Storage Area dropdown to set where this monitor will storage it's events
2015-12-15 11:13:00 -05:00
14cde582cf
Merge branch 'multi-server' into multiserverplusstorage
...
Conflicts:
src/zm_monitor.h
2015-12-14 16:55:26 -05:00
b2b1afa8ad
Merge master
2015-12-14 15:49:32 -05:00
f54b8c27ee
upgrade montage to use Monitor object and getStreamSrc which knows which server to connect to
2015-12-02 12:10:32 -05:00
34f6590107
upgrade montage to use Monitor object and getStreamSrc which knows which server to connect to
2015-12-02 12:10:26 -05:00
aa91e69a9b
add monitorUrl to be used to target the recording server for the monitor
2015-12-01 15:17:49 -05:00
342326e159
append monitorUrl to thsiURL to get access to the recording server for the monitor stream
2015-12-01 15:17:25 -05:00
382ad0f390
put () after property names of Monitor object
2015-12-01 14:30:24 -05:00
5ea11a8bfe
use webvvt to overlay timestamp (honoring Monitor.LabelFormat) to videos in timeline and event
...
also fixed bug which prevented seeking in timeline video preview
2015-11-18 21:21:56 -08:00
fc85ccbf5f
Set value for Hostname to avoid php warning. fix save button. Can't use it to pass action value because it gets translated.
2015-11-11 16:43:23 -05:00
05a2445b7a
better way of detecting showing image or video in timeline and event view
...
instead of Monitor.VideoWriter, Event.DefaultVideo is used, so even if
VideoWriter/SaveJPEG option is changed, a valid image or video will always be
displayed for historical events in both timeline and event view
this also fixes loading videos in timeline view
2015-10-24 22:22:52 -07:00
d8494aba2d
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_remote_camera_rtsp.h
web/skins/classic/views/monitor.php
2015-10-23 22:07:22 +11:00
2237391876
white spacing, and fix loading of Server objects in monitor
2015-10-15 09:28:35 -04:00
582cbe7567
Merge branch 'master' into multi-server
2015-10-15 09:01:19 -04:00
59b0675588
only expose monitor info which are being used in client
2015-10-02 20:04:10 -07:00
2fd6cbe742
fix timeline view for SaveJPEGs monitors (without enabled VideoWriter)
2015-10-01 22:41:31 -07:00
d9355064e7
fixed orange display for monitor mode
2015-10-01 11:35:38 -04:00
e4d51e1819
Merge branch 'master' into multi-server
2015-09-28 10:04:23 -04:00
727486d8f3
recaptcha now displays translated message if secret is wrong
2015-09-25 11:11:25 -04:00
23b549a471
recaptcha fixes to avoid lockout
2015-09-24 15:44:35 -04:00
25ab1f6ddd
fixed recaptcha showing up pre DB update
2015-09-23 10:54:24 -04:00
23d5e0e95b
fixed recaptcha showing up pre DB update
2015-09-23 10:50:15 -04:00
ba1100fc03
continue conversion from array to class of Monitor
2015-09-17 16:06:47 -04:00
aac45e54b8
monitor array to class
2015-09-17 15:35:38 -04:00
c415399043
add Hostname to Server
2015-09-17 15:35:27 -04:00
366c4ec676
monitor array to class
2015-09-17 15:35:09 -04:00
4a65ae1d2a
fix error in display of Server
2015-09-17 15:34:48 -04:00
0f181b72d1
include Server object and display the server column
2015-09-16 14:51:23 -04:00
e172911088
include Server object and fix Server dropdown
2015-09-16 14:51:05 -04:00
681718e908
init to avoid error message
2015-09-16 11:07:08 -04:00
535a760f26
Merge branch 'master' into multi-server
...
Conflicts:
configure.ac
2015-09-16 09:12:55 -04:00
4fa6948e5c
add form validation for server editing. Currently just requires a name
2015-09-16 09:12:21 -04:00
04fcc253bd
Merge pull request #1048 from pliablepixels/1046-google-recaptcha
...
Google recaptcha
2015-09-01 08:18:54 -05:00
2481c7a22e
Handled situation where user enables captcha but forgets to supply keys
2015-08-31 20:39:43 -04:00
bb41ebf776
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
2015-08-31 16:03:40 -04:00
73fa051ef8
Google recaptcha
2015-08-29 13:29:52 -04:00
395e628541
Merge branch 'new_rtsp_describe' of https://github.com/knnniggett/ZoneMinder into knnniggett-new_rtsp_describe
...
Conflicts:
CMakeLists.txt
configure.ac
version
2015-08-29 07:57:18 -05:00
75919c9cd5
Merge branch 'master' into multi-server
...
Conflicts:
docs/installationguide/ubuntu.rst
misc/apache.conf.in
src/zm_monitor.cpp
2015-08-27 10:34:47 -04:00
1cf54d2e38
Merge pull request #1026 from schrorg/blacken-zones
...
Add new zone type - privacy zones
2015-08-27 09:14:16 -04:00
6093587ff2
Merge pull request #1039 from pliablepixels/1038-fixing-state-mgmt-1030-isActive-fix
...
1038 fixing state mgmt 1030 is active fix
2015-08-27 09:08:50 -04:00
dc8a3769e7
Make the capture process restart if a Privacy zone got changed
2015-08-27 09:45:12 +02:00
08d177185c
added oninput for text field handling
2015-08-26 11:22:09 -04:00
02a6443c3b
Cleaned up button handling
2015-08-26 11:21:29 -04:00
a995d72ebd
add warning and help text for maxfps fields
2015-08-22 12:36:49 -05:00
2fbf79674b
Add RTSP Describe checkbox to web console
2015-08-21 10:32:50 -05:00
5b465194f8
Renamed 'Blacken' zone type to 'Privacy'
2015-08-20 17:37:59 +02:00
b5fc6a9091
Make web correctly recognize new zone type
2015-08-20 15:09:02 +02:00
12da43afe7
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 14:01:28 -04:00
880e77b096
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 13:30:48 -04:00
fe3595bfa1
Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_update-1.28.101.sql
src/zm_monitor.cpp
src/zm_monitor.h
version
2015-08-18 20:20:53 -05:00
68adcc9e67
Merge branch 'large-timestamp' of https://github.com/schrorg/ZoneMinder into schrorg-large-timestamp
...
Conflicts:
CMakeLists.txt
configure.ac
src/zm_monitor.cpp
src/zm_monitor.h
version
2015-08-18 14:07:38 -05:00
987db68452
Fix extra image copy; fix options unset of exif toggle
2015-08-18 14:39:55 -04:00
99c8af4a17
Bring up to date with master (mostly)
2015-08-17 22:52:51 -04:00
3462b0e0ab
content for server edit popup
2015-08-17 12:42:20 -04:00
7eb07dbb65
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-08-17 12:30:54 -04:00
299c629a20
Merge remote-tracking branch 'upstream/master' into large-timestamp
...
Conflicts:
CMakeLists.txt
configure.ac
version
2015-08-17 13:42:36 +02:00
c17de4a00f
add Exif checkbox to monitor
2015-08-16 17:56:03 -05:00
32f6c92b02
replace php short open tag
2015-08-16 12:29:03 -05:00
4f07279d25
include server.php in autotools build
2015-08-16 12:25:23 -04:00
99d674ef78
remove code that put a * next to the server name. It was copied from the user list and indicated the logged in user.
2015-08-16 12:22:31 -04:00
b3240bbc8f
set name=action on submit tag, and remove stuff that we don't want right now
2015-08-16 12:21:52 -04:00
c0517b11ae
Merge branch 'master' into multi-server
2015-08-16 10:52:51 -04:00
9117e2949a
add server.php.
2015-08-16 10:52:47 -04:00
c53bb7f56f
change edit permission from system to groups
2015-08-15 13:45:43 -05:00
1d688be1a1
propagate canEditGroup permission
2015-08-15 13:22:13 -05:00
c051f3482b
add Groups to options again
2015-08-15 12:37:25 -05:00
1d97e9d1f9
Add Groups column to options
2015-08-15 12:24:48 -05:00
85e2b165b1
bump version to 1.28.101
2015-08-15 12:01:57 -05:00
dff624a42c
Merge pull request #985 from ZoneMinder/fix_state_load
...
fix #948 1
2015-08-11 10:45:16 -05:00
078e18e6c5
Add label size to monitor options (frontend part)
...
This commit adds the option "Font size" to monitor options in the
timestamp panel. Includes translations of "Font size" for german
(de_de), french (fr_fr) and spanish (es_es). All other language files
contain the english text.
2015-08-10 15:35:19 +02:00
3b5638e54d
Fix omitted reference to gif file
2015-08-09 13:12:45 -04:00
6425df76c7
Switch to the standard routine in web functions include for auth
2015-08-09 13:10:43 -04:00
7a76cb3df1
Add security for those using authorization
2015-08-09 12:24:04 -04:00
9d7dc0d81b
Safari compatibility changes
2015-08-07 23:27:26 -04:00
bf655b6656
Corrections from askers testing.
2015-08-07 22:26:03 -04:00
3ce365ea8c
Tweaks to live display to remove sliders in fit mode and general fixes
2015-08-06 15:42:04 -04:00
4c8d7d7f62
quiet error when no Servers in Servers table
2015-08-04 11:48:04 -04:00
e178e1b1d6
fix #948 1
2015-08-04 11:37:11 -04:00
278434ec3f
Fix regression in last commit where ALL not working
2015-08-03 22:00:00 -04:00
76c037f06a
Fix bug in scale calling to zms
2015-08-03 16:36:14 -04:00
e7264a8167
Minox fixes, make live mode default, 1 hour default
2015-08-03 15:31:13 -04:00
42f77377f2
Add a fit feature to fit all monitos on screen
2015-08-02 16:15:18 -04:00
4354cbeecb
More minor changes, last in prelude of next version
2015-07-30 19:01:27 -04:00
3e85d57710
New version with added live view
2015-07-30 12:06:52 -04:00
42e021e652
Merge pull request #976 from SteveGilvarry/FrameImageGen
...
Dynamically create jpegs from video file for viewing in browser
2015-07-28 10:10:38 -05:00
5c44285f98
dynamically create jpegs from video file for viewing in browser
2015-07-29 00:24:05 +10:00
7502e5b3e3
added control for video playback rate
...
Conflicts:
web/skins/classic/views/event.php
2015-07-29 00:07:19 +10:00
477c34cc2c
Added missing brackets
2015-07-28 23:08:45 +10:00
6c8dbb8bea
Typo
...
added missing "
2015-07-28 23:08:10 +10:00
2d4c2bbe0a
Beautify!
...
Make the code somewhat readable.
2015-07-28 23:05:06 +10:00
46204c2768
local storage of video js plugin
2015-07-28 23:03:59 +10:00
2e8d88915b
removed redundant field in sql query
...
Conflicts:
web/skins/classic/views/event.php
2015-07-28 23:02:56 +10:00
05e82d2a96
proof of concept for dynamic/automatic video rotation using video-js plugin zoomrotate
...
Conflicts:
web/skins/classic/views/event.php
2015-07-28 22:55:27 +10:00
f09a551d6a
Merge branch 'master' into feature-h264-videostorage
2015-07-28 21:06:52 +10:00
911f0fad28
Use destination color from CSS in transition effect in log view (instead
...
of #000000 )
2015-07-27 09:53:59 +02:00
1c8363cc29
Do not display 0.00 for AnalysisFPS
2015-07-24 00:27:47 +02:00
649a39b372
Replace analysis interval parameter by analysis framerate
2015-07-23 16:36:30 -04:00
a091ad16f3
Final cleanup before pull request
2015-07-23 15:36:21 -04:00
b88403cd41
Minor corrections based on feedback to date
2015-07-23 15:01:53 -04:00
132e0a1798
Add analysis fps paramter to monitors
2015-07-22 21:38:35 +02:00
84ed491765
Initial Montage Review for people to take a look at
2015-07-22 13:51:31 -04:00
a6b7c6e99f
Add analysis interval parameter to monitors
2015-07-21 22:52:52 +02:00
02ee745167
parameter to defined should be in quotes
2015-07-17 10:09:22 -04:00
560a4cccbe
Show correct part of URL (hostname) for ffmpeg sources in console
2015-07-17 13:59:40 +02:00
ace8597b8d
Merge branch 'master' into multi-server
2015-07-14 16:10:51 -04:00
04366e752a
add Servers to options, a server editing popup and a server selection to monitors
2015-07-09 11:41:46 -04:00
1a0d4d2221
Console now shows custom run state in header (if applicable)
2015-06-21 09:31:21 -04:00
b6af731400
Add translate options for h264 Storage options in Monitor and update en_gb file
2015-06-10 23:41:17 +10:00
9b06b1399c
Merge branch 'master' into feature-h264-videostorage
...
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
src/zm_ffmpeg_camera.cpp
web/skins/classic/views/event.php
web/skins/classic/views/monitor.php
web/skins/classic/views/timeline.php
2015-06-10 23:09:30 +10:00
f99c5f3627
use correct tag for the frame popup so that it gets the correct popup window size
2015-06-03 12:09:38 -04:00
bf4038a724
followup changes based on comments in #833
2015-05-21 12:23:31 -05:00
3a94712db2
add translate function
2015-05-10 08:10:30 -05:00
8a1625463c
Merge pull request #823 from ZoneMinder/fix_session_concurrency
...
close the session before requiring the page contents to fix the concurre...
2015-05-09 17:50:18 -05:00
01af58018b
close the session before requiring the page contents to fix the concurrency issue that exists due to using the file-backed session.
2015-04-20 13:06:34 -04:00
81eaf44595
Fix a bad SLANG key in monitor.php
2015-04-18 19:37:56 +02:00
216348274b
Remove a remaining hardcoded string
2015-04-18 18:14:36 +02:00
ac8ace33f8
Remove hardcoded localized strings and update lang files
2015-04-18 17:14:14 +02:00
98d91ded90
Found some introduced short tags
2015-04-08 20:13:27 +10:00
45fd7f1eca
Found some old open tags left over
2015-04-08 20:11:26 +10:00
fd94d22b0e
Fixed a missing bracket post merge and also SQL_values now used for EventID and Monitors
2015-03-22 17:31:22 +11:00
b3313edde0
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
...
Conflicts:
web/skins/classic/views/event.php
2015-03-21 23:49:56 +11:00
362153cb3a
Also fix video.pho which has the same problem.
2015-02-23 14:34:13 -05:00
bff26154b0
Also fix video.pho which has the same problem.
2015-02-23 14:31:15 -05:00
c9f109bc27
also fix timeline which has the same problem
2015-02-23 14:27:35 -05:00
dd714665bd
use explode instead of preg_split
2015-02-23 14:18:10 -05:00
bd3a9806b8
Fix sql query when user is limited to specific monitors
2015-02-23 14:16:04 -05:00
851a246cf2
Revert "Fix sql query when user is limited to specific monitors"
...
This reverts commit 41b581552e
2015-02-23 14:10:53 -05:00
41b581552e
Fix sql query when user is limited to specific monitors
2015-02-23 14:10:18 -05:00
9b0c8085eb
Merge pull request #720 from knnniggett/zmonvif
...
Don't show ONVIf probe link when ONVIF support is not enabled
2015-02-21 15:50:07 -05:00
7ef503ff59
User configurable arp tool
2015-02-21 13:08:04 -06:00
b000b997e9
Merge pull request #709 from ZoneMinder/find_arp
...
try harder to find arp.
2015-02-21 11:53:26 -06:00
4182fb3295
Don't show ONVIf probe link when ONVIF support is not enabled
2015-02-21 11:12:07 -06:00
438456ce93
include output if can't find arp
2015-02-19 15:43:34 -05:00
9f3ff787d1
Merge branch '478-onvif-support' of https://github.com/altaroca/ZoneMinder into altaroca-478-onvif-support
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
distros/redhat/archive/zoneminder.el6.spec
distros/redhat/zoneminder.el6.spec
web/skins/classic/views/monitor.php
2015-02-18 18:53:47 -06:00
13c6be548d
If type -p doesn't work, try which, and if that doesn't work just try /usr/sbin/arp. Also don't bother with escapeshellcmd because these are not user inputs.
2015-02-17 15:39:59 -05:00
79c82ea880
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
2015-02-17 23:16:42 +11:00
ada53bbb28
Testing videojs for video playback
2015-02-16 19:43:13 +11:00
2b00ebd02c
if path results in an empty string, set it to something so that the link is there when type is vlc
2015-02-03 10:52:49 -05:00
bf688f2d39
trival quoting changes and missing semi colons
2015-02-02 19:06:45 -05:00
690a2f083e
fix montage layout broken by my skin merging
2015-02-02 19:06:20 -05:00
9fe5b08726
Fix bracket issues post merge
2015-01-06 15:12:09 +10:00
a44f83cb7d
#658 Fix error message for finding arp path
2015-01-05 07:58:39 +11:00
ddae55a1c9
Merge pull request #645 from ZoneMinder/skin_css_default
...
Skin css default
2014-12-29 12:00:44 -05:00
b79c2c1604
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
...
Conflicts:
web/skins/classic/views/event.php
web/skins/classic/views/timeline.php
Also reapplied required PHP Short Tags fix to a event.php and monitor.php that got impacted in merge.
2014-12-25 08:24:48 +10:00
07123c6b7f
Fix array mkssing comma
2014-12-25 05:42:51 +11:00
1131809c92
format duration into HH:MM:SS
2014-12-19 10:18:27 -05:00
b4d4dd6e6a
Update Jpeg and Video options for passthrough options
2014-12-19 07:21:00 +11:00
05206279df
add missing commas
2014-12-18 09:44:04 -05:00
478c9bc630
add custom lines for loading the available skins and css options
2014-12-18 09:34:14 -05:00
45feac3d36
Merge pull request #640 from jrd288/offer_login
...
Offer login prompt instead of throwing error
2014-12-16 09:35:08 -05:00
c28206e8d1
Merge pull request #632 from ZoneMinder/better_security
...
better fix for the view=console security flaw.
2014-12-16 08:34:14 -06:00
52d3ec7142
Fixed autotools build to reflect file name change
...
postlogin.js -> postlolgin.js.php
2014-12-15 18:11:06 -05:00
f4289cd253
postlogin.js replaced by postlogin.js.php
2014-12-15 17:38:18 -05:00
10dba9b4c2
Offer login instead of error
...
When a user accesses a view but receives an error, and is not logged
on, he is offered a login prompt instead. The login prompt saves the
original query URL in a hidden field, and postlogin redirects back to
the original URL once the user has logged on.
If the user is logged in and there is an error, no login prompt is
shown.
This allows the user to click an event link in an e-mail and then log
in before being shown the event, instead of requiring going back
through the front ZM page to log in.
2014-12-15 17:17:03 -05:00
3c8153c9b4
better fix for the view=console security flaw.
...
This does it in index.php,so it guards all pages, and also just changes the view to login, so instead of giving an error, it presents you with the login, which I think is better.
2014-12-12 09:38:54 -05:00
b1aa349f11
add check to see if user has rights to view this monitor
2014-12-12 09:32:03 -05:00
74da3e9c02
fix auth requirement by checking for user when AUTH is on
2014-12-11 17:09:18 -05:00
e87e69fa57
Ran script to replace all Short open tags
2014-12-05 10:44:23 +11:00
bf33eab17c
Merge branch 'video' into feature-h264-videostorage
...
Conflicts:
src/CMakeLists.txt
src/Makefile.am
src/zm_event.cpp
web/skins/classic/views/js/event.js
2014-12-02 20:58:35 +11:00
cc85424999
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_ffmpeg_camera.cpp
2014-12-02 20:18:24 +11:00
af0d9a1065
bug fix for listing the css options.
...
use SELECTED="SELECTED" instead of just SELECTED
2014-12-01 15:58:00 -05:00
b04099b96c
Missed mkv in timeline.js
2014-12-01 21:55:43 +11:00
2de8dae172
Make timeline open event.mp4 instead of mkv
2014-12-01 13:33:18 +11:00
617179b649
spaces to tabs, hide video stuff if video writer is turned off
2014-11-28 16:47:16 -05:00
69090563d5
Merge branch 'master' into video
...
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
2014-11-28 14:23:05 -05:00
593f0781d6
this css directory was moved under /web/skins/classic/css/views so we don't need to have it in the SUBDIRS
2014-11-26 11:57:35 -05:00
193cb71b71
Add option for setting css to use with the skin. Also happens to add missing elements of the table for the skins tab and cleans up some spacing. Also, use a variable to tell whether to reload the page or not, which is required after you change the skin or css.
2014-11-26 11:55:53 -05:00
a412799003
Move the skins/classic/views/css dir under skins/classic/css/classic/views and update Makefile.am's to match
2014-11-26 11:29:04 -05:00
70c63bd394
Merge branch 'master' into storageareas
...
Conflicts:
db/zm_create.sql.in
distros/debian/control
distros/ubuntu1204/changelog
src/CMakeLists.txt
src/zm_config_defines.h
src/zm_monitor.h
2014-11-19 14:11:39 -05:00
9c30b806f2
don't require SystemView to view/select groups.
...
Change the way the groups ine is displayed to give people some idea that it might have something to do with grouping
use _POST instead of _REQUEST
2014-11-13 10:38:20 -05:00
8d71d4de03
Swap to mp4 container
2014-11-09 18:15:43 +11:00
4245928b35
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
web/skins/classic/js/skin.js
2014-10-12 20:10:36 +11:00
f1b2ba091c
Update meta makefiles
2014-09-12 16:06:19 +02:00
2018228daf
fix V inputs
2014-08-21 11:58:51 -04:00
f93a28f2be
fixup multibuffering so it can have a null value which makes it fall back to config table
2014-08-21 11:13:38 -04:00
5f1fda43a0
Basic support for SOAP 1.1 and 1.2
2014-08-17 21:24:27 +02:00
99e794a97b
Removed hard coded binary path and perl binary location
2014-08-07 18:25:07 +02:00
0834e1b61d
I see no reason for these to be posts. They retrieve info, that's it.
2014-07-29 16:15:31 -04:00
96322dd59c
remove v4l tab that I never used
2014-07-29 14:45:02 -04:00
b2f1c2fe68
Merge branch 'v4l_to_monitor'
2014-07-24 14:35:23 -04:00
b3f078eaa5
add the word disabled after function if the monitor is not enabled.
2014-07-23 15:46:37 -04:00
a91331de66
Added basic ONVIF support views
2014-07-14 20:59:36 +02:00
0a2515c00e
Added basic ONVIF support
2014-07-14 20:36:18 +02:00
edd794a993
ensure captures_per_frame >0
...
add missing lang entries for MultiBuffer and CapturesPerFrame
2014-07-14 14:07:28 -04:00
9385471392
move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera
2014-07-13 16:39:27 -04:00
2be38d7f32
fix problem editing users, a semi-colon screwed up the if statement.
...
Also change behaviour so that if a user is specified, and doesn't load, generate an error.
This also removes a search for empty user id in the db
2014-07-08 10:52:55 -04:00
48d961082c
Determine full path to arp
2014-07-05 11:11:36 -05:00
9a0eb63df2
Merge pull request #415 from m-bene/selectSkin
...
make skin selection persistent
2014-07-04 12:57:37 -05:00
5aad658262
Fixes errors when opening Filters (issue #34 )
2014-07-04 11:00:00 -05:00
17d7404c93
Merging master again
2014-06-28 22:50:28 +10:00
623837115b
fix missing ARRAY() around params to dbFetchOne
2014-06-25 14:01:45 -04:00
11718f0559
The users tab should always be available. It is useful to configure users BEFORE turning on auth.
2014-06-25 13:39:31 -04:00
5217bb668a
Merge remote branch 'origin/master' into video
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2014-06-06 09:25:05 +03:00
3267b59cb5
Add html5 video control to timeline and event to support mkv playback
2014-05-30 12:40:33 +10:00
df3ab025f8
Imported missing files from master to feature-h264-videostorage
2014-05-30 01:47:52 +10:00
82447ebb27
remove unwanted comment change
2014-05-17 22:05:57 +02:00
f62afdb8cc
add select list for rtsp method for ffmpeg and libvlc
2014-05-17 20:41:22 +02:00
de107f77ba
fix option help text for overlooked languages
2014-05-17 04:51:01 +02:00
9a71a0068a
add help window for ffmpeg/libvlc options
2014-05-17 04:33:33 +02:00
ceff5a98ea
add generic Option field to ffmpeg and libvlc cameras
2014-05-05 13:29:12 +02:00
b197f985e0
make expiry date relative (~10years)
2014-05-01 09:53:45 +02:00
ed7ca66045
make skin selection cookie persistent
2014-05-01 09:37:39 +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
0d7c52dc1f
Merge remote branch 'origin/master' into video
...
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
2014-04-17 13:26:00 +03: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
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
9a714f8d6d
Fix 'Undefined index: filter' php warnings for filter view when called without filter arguments
2014-04-07 16:11:48 +02:00
d6a27b31e8
fix extra }
2014-03-24 13:44:06 -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
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
26777487dc
add feature to extend preclusive zone alarm state by x frames
2014-03-09 17:05:39 +01:00
c2b93c3caf
Merge remote branch 'nagyrobi/patch-26' into nagyrobi
2014-02-26 09:32:58 -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
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
d20e0ee2e7
Temporary workaround to show all ptz control types regardless of monitor source type.
2014-02-13 08:43:19 -06: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
b3af313370
Merge pull request #282 from scottgrobinson/master
...
Add zmMontageScale so montage scale is also 'saved'
2014-01-02 11:18:39 -08: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
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
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
3393a63525
more updates
2013-12-17 12:53:15 -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
55dadcf758
Network Detection Support for Wansview
...
Basis support for Wansview Cams
Tested with NC541W
2013-11-30 20:46:59 +01:00
1519db78ce
add ServerHost filter
2013-11-13 10:13:09 -05:00
a155082997
use parameter passing instead of esacping
2013-11-12 15:39:29 -05: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
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
2d0f4dffd1
Fix a missing NULL second paramter to dbFetchAll
2013-11-03 16:06:31 -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
ae51ac5519
redo changes to use new dbFetch functions with parameter arrays
2013-10-18 14:24:08 -04:00
cde89a7144
more quoting removal, some slight optimisations
2013-10-17 21:03:24 -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
2a45506bff
more quoting removal
2013-10-17 16:15:04 -04:00
36c4fad644
remove extra quoets since dbEcape does quoting now
2013-10-17 15:35:23 -04:00
34f84a4097
Merge branch 'v1.26.4-beta'
2013-10-03 10:14:09 -04:00
6d00540b5d
Improve Chrome browser support & log streaming events
2013-09-21 14:52:41 -05:00
ab1314f250
clean out autogenerated files
2013-09-12 14:43:57 -04:00
c8ad6ae656
Fixes #107 for real this time.
2013-09-05 20:31:52 -04: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
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
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
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
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
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
7cf5475542
Merge ../ZoneMinder-kfir into kfir-proper
...
Conflicts:
configure
src/Makefile.am
src/Makefile.in
2013-05-02 21:28:51 -04:00
2c04d0774f
Reverting my web changes in develop - keeping them in modern
2013-05-02 10:20:06 -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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Isaac Connor
Kyle Johnson
Isaac Connor
Steve Gilvarry
Andrew Bauer
arjunrc
Isaac Connor
Robin Daermann
Andrew Bauer
Isaac Connor
Isaac Connor
SteveGilvarry
Heng Liu
Linwood-F
Michael
user
Emmanuel Papin
jrd288
Jan M. Hochstein
Kfir Itzhak
Will W
m-bene
Sune1337
Scott Robinson
Edward Barnard
Kyle Johnson
Philipp Rehs
David Nesting
Isaac Connor
Isaac Connor
nagyrobi
nextime
stan
jaidhar
stagecoach
viseon