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
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
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
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
247cb3d0b2
Merge pull request #1360 from schrorg/monitornames-spaces
...
Allow spaces in monitor names
2016-03-30 09:17:57 -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
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
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
7c7d7b245c
Remove the XML skin folder
2016-02-26 22:30:20 +11:00
e6d57da0d4
Remove the mobile skin folder
2016-02-26 22:29:41 +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
632e9c8e53
Upgrade bundled jQuery ( Closes : #1263 )
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-18 00:28:30 +11:00
172a4c6bd4
Add montagereview.php to autotools build.
2016-02-16 09:29:49 -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
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
d3755611c5
Merge pull request #1247 from bodegard/master
...
Corrected DB update version comments, fixed typos, and skin font modification
2016-02-04 11:54:02 -05:00
2f80f26f92
Merge pull request #1232 from ZoneMinder/remove_google_fonts
...
remove Google open Sans external import
2016-01-23 10:24:49 -06:00
54a11175ff
Reduce default size of body font in Flat skin
2016-01-22 13:56:41 -06:00
1ca9ace84d
Fixed missing semicolons
2016-01-22 13:31:02 -06:00
3ebeaec8ab
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2016-01-10 20:59:01 -05:00
2d86e7713d
increase height of logout popup to fit content
2016-01-08 12:14:01 -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
53bd342f85
remove Google open Sans external import
2016-01-08 09:46:14 -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
273ab6c5c6
Only show Server column when more than 1 Servers are defined
2016-01-04 14:51:24 -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
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
1aa79c306b
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-12-22 09:47:45 -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
b626712a2f
Add ServerId and ServerName to fields that we can filter on
2015-12-21 10:03:48 -05:00
e5f243a9f8
Merge branch 'maxfps' of https://github.com/knnniggett/ZoneMinder into knnniggett-maxfps
2015-12-19 08:16:20 -06:00
e3d634e53e
Merge pull request #1182 from ZoneMinder/one_eighth
...
add a 1/8th scale option, which is useful for 1920x1080 streams
2015-12-19 14:07:18 +11:00
983d87f69b
increase height and width of groups window to fit buttons in
2015-12-18 13:34:44 -05:00
ca45ac23fa
increase height of group edit window
2015-12-18 13:30:42 -05:00
f2065e2fcb
Merge branch 'one_eighth' into multi-server
2015-12-08 08:47:35 -05:00
d6b2e1959f
add a 1/8th scale option, which is useful for 1920x1080 streams
2015-12-08 08:40:44 -05:00
3c86965760
Merge branch 'master' into multi-server
...
Conflicts:
web/skins/classic/js/flat.js
2015-12-04 15:31:30 -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
95f002c7d6
convert monitor hash accesses to function calls
2015-12-01 15:16:53 -05:00
382ad0f390
put () after property names of Monitor object
2015-12-01 14:30:24 -05:00
c2a7e0c587
fix size of monitor popup in flat skin
2015-11-25 15:39:46 -05: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
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
1d173a9bf0
Merge pull request #1083 from pliablepixels/1082-monitor-orange
...
fixed orange display for monitor mode
2015-10-06 08:36:35 -04:00
e12640ec73
Merge branch 'no_overwrite_zm_conf' into multi-server
2015-10-02 15:34:14 +00:00
cf5473836e
set default border on live streams so that when they alarm they don't jump around
2015-10-02 10:04:56 -04:00
ea87ffe66f
merge master, bump version to 1.28.108
2015-10-01 11:52:49 -04:00
d9355064e7
fixed orange display for monitor mode
2015-10-01 11:35:38 -04:00
cb18adef5c
increase min height of zone edit popup so that buttons are visible
2015-09-28 13:01:07 -04:00
4e2ed00027
widen zone edit popup to fit the image
2015-09-28 12:54:54 -04:00
7d52c0b784
widen events popup to fit the thumbnail
2015-09-28 12:44:58 -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
e4b0e74f69
merge master
2015-09-24 10:01:27 -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
333e7ec67b
header typo corrections
2015-09-19 17:39:54 +10: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
b2699237c7
put back mootools
2015-08-27 11:35:47 -04: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
c60d1cbeca
Merge pull request #1037 from pliablepixels/1036-flat-skin-grey-out-disabled-buttons
...
Grey color for disabled buttons
2015-08-25 12:50:50 -04:00
a6f296d84e
Grey color for disabled buttons
2015-08-25 12:29:40 -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
41637278c9
merge master
2015-08-19 16:08:12 -04: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
e390200824
Small dark CSS fixes in frames and timeline view
2015-08-17 14:39:41 +02: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
882bf76750
Merge pull request #986 from ZoneMinder/fix_948_3
...
quiet error when no Servers in Servers table
2015-08-11 10:45:04 -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
37e01b504b
Implemented #989 (highlight current row in tables) for dark CSS
2015-08-05 14:36:07 +02:00
c4f78d634c
CSS[skins/classic]: highlight current row in tables.
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-08-05 10:43:02 +10: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
651cffd3b5
Small color corrections in tabList
2015-07-27 10:07:01 +02:00
14ebd937c7
Added missing javascript file to Makefile.am
2015-07-27 09:53:59 +02:00
Isaac Connor
Andrew Bauer
Isaac Connor
Robin Daermann
Andrew Bauer
SteveGilvarry
Dmitry Smirnov
Brandon Odegard
Isaac Connor
Isaac Connor
Pliable Pixels
Linwood-F