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
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
Andrew Bauer
Isaac Connor
SteveGilvarry
Isaac Connor
Andrew Bauer
Isaac Connor
Isaac Connor
SteveGilvarry
Heng Liu
Pliable Pixels
Isaac Connor
Robin Daermann
Linwood-F
Michael
user
Emmanuel Papin