7ad19be0d7
Merge branch 'server_path_prefix' into storageareas
2018-11-23 13:29:01 -05:00
c5f7fb7b18
Merge branch 'master' into server_path_prefix
2018-11-22 10:04:33 -05:00
ca8770bd5a
Merge branch 'fix_rce' into storageareas
2018-10-24 10:17:16 -04:00
2024df4393
use json_encode/decode instead of serialize/unserialize to pass onvif probe results around. Also clean up some code/ add some missing things. Fixes #2271 and #2272
2018-10-24 09:49:56 -04:00
9c437b0303
Merge branch 'add_export_to_filter' into storageareas
2018-09-25 14:35:19 -04:00
60b952ab86
Merge branch 'master' into storageareas
2018-09-13 16:20:36 -04:00
e21a7a769b
add ExportCompress
2018-09-05 11:13:32 -04:00
d5cab088d6
Merge branch 'master' into add_export_to_filter
2018-09-05 10:33:10 -04:00
f4c2d8adea
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-03 12:29:09 -04:00
b1fe80a0bd
Add JSON/MaybeXS to dependencies, replacing JSON/Any
2018-08-30 18:30:33 -04:00
4e32089a48
Merge branch 'master' into storageareas
2018-08-30 14:51:27 -04:00
8f0fb0843a
Add Privacy Statement ( #2194 )
...
* initial implementation of privacy popup
* split the privacy text and run it through translate
* change style of toggle button, validate the form
* fix copy/paste error
* fix typos
* display privacy view inline rather than popup
* display privacy inline if show_privacy flag set
* redirect to console after selection is made
* typo
* css formatting
* update privacy verbiage
* create and load default.php
* fix typos
* fix erroneous copy/paste
2018-08-30 13:25:02 -04:00
6e5472d305
Merge branch 'master' into server_path_prefix
2018-08-22 12:57:16 -04:00
d768f5f7fc
Merge branch 'master' into storageareas
2018-08-13 15:35:55 -04:00
15a6eb7e78
Revert "Add Privacy Statement ( #2176 )" ( #2179 )
...
This reverts commit 56f4d768c2
2018-08-13 15:33:43 -04:00
026390ccd8
Merge branch 'master' into storageareas
2018-08-13 15:26:29 -04:00
56f4d768c2
Add Privacy Statement ( #2176 )
...
* initial implementation of privacy popup
* split the privacy text and run it through translate
* change style of toggle button, validate the form
* fix copy/paste error
* fix typos
* display privacy view inline rather than popup
* display privacy inline if show_privacy flag set
* redirect to console after selection is made
* typo
* css formatting
* update privacy verbiage
* push privacy text to all language files
2018-08-13 15:23:44 -04:00
8a936cdcc9
Merge branch 'master' into add_export_to_filter
2018-07-11 16:43:02 -04:00
e6a9422636
Add entry for StorageArea
2018-07-10 12:26:25 -04:00
a0992baa16
Add entry for SignalCheckPoints
2018-07-10 12:25:36 -04:00
ee017a1ef7
Add PathPrefix to language
2018-07-09 14:29:40 -04:00
26b2887d6b
Add Export Matches
2018-07-08 15:21:07 -04:00
348468a98d
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-26 22:09:48 -04:00
86b2f6a12e
New Monitor Type - Website ( #2065 )
...
* implement website monitor
* don't check certain fields when using website monitor
* continue to fix javascript errors for website monitors
* check $monitor, not $new_monitor here
* add website monitor documentation
was somehow left out of the initial commit
* fix corruption of functions.php
* add missing comma
* remove errors by testing for existence of key. If it's a new monitor, then none of the keys will be valid
* If the monitor type is WebSite, then default Status to Running.
* put back start function that got lost in merge. Don't start StreamCmd's if it's a WebSite
* Add midding comma
* Hide unrelated tabs when type is WebSite. Put back input fields for Type=WebSite
* Don't show control or any of the status fields for WebSite type monitors
* add some parenthesis to ensure order of operations, seems to fix fps and status fields not being shown for regular monitors
2018-04-26 17:18:36 -04:00
00e82fb751
Implement MonitoServerId,StorageServerId,FilterServerID in Filters
2018-04-25 13:05:19 -07:00
bb924ee078
add report_event_audit
2018-04-10 13:06:01 -07:00
85bb26668e
translate Statuses beter
2018-04-03 12:30:57 -07:00
b8f6c2277f
clone icons
2018-03-24 10:21:59 -04:00
a9d6bd22bc
shortened monitor add
2018-03-24 09:59:08 -04:00
dcfae11fc7
fix typos
2017-12-18 13:16:54 -05:00
e7a43b2618
fix, don't set the storage path to NULL
2017-12-06 10:11:59 -08:00
3e7c573da5
Add download video option to events view
...
Creates a new popup window for downloading event video files with no directory structure in the archive
2017-12-03 14:42:07 -05:00
207b66c8fa
add Edit Layout
2017-10-30 16:29:46 -04:00
82fbec697f
add IS and IS NOT as filter operators so that we can do IS NULL and IS NOT NULL because = NULL and !=NULL are not valid
2017-10-27 08:37:53 -07:00
653d213d62
Add EndTime and DiskSpace to Filters
2017-10-25 11:11:19 -07:00
354262c557
wip nvsocket
2017-10-03 13:28:56 -07:00
4be133ed09
remove btn styles from buttons. make groups, cycle, montage, montage review non-popups. Add datetime filters to montagereview. Fix dark skin
2017-09-30 14:19:32 -04:00
bc1b770c14
add translation for AddNewStorage
2017-09-26 11:27:55 -04:00
d9c665b021
Merge branch 'fix_crash_with_invalid_zones' into storageareas
2017-03-17 09:35:11 -04:00
b791504598
Wording of help text fixes
2017-02-06 08:01:04 +11:00
9716c4ef89
Add Option help
2017-02-05 18:43:47 +11:00
899b1b82b9
Merge branch 'filter_by_runstate' into storageareas
2017-01-14 17:07:20 -05:00
242e5a56d8
rough in the ability to filter on RunState
2017-01-14 16:55:28 -05:00
5ae34a7561
Merge branch 'master' into storageareas
2017-01-02 09:39:10 -05:00
0d549f1db3
spelling fixes
2016-12-29 10:31:05 +01:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
96b5af9021
Merge branch 'fix_onvif' into storageareas
2016-10-04 15:00:28 -04:00
6814bcc791
add NoDetectProfiles instead of reusing NoDetectedCameras
2016-10-04 14:33:38 -04:00
b10c79b4f7
Add translation for 'Montage Review'
2016-09-09 13:26:19 +02:00
2b4bad86cb
Merge branch 'master' into storageareas
2016-09-13 10:21:10 -04:00
0adbaafd98
Merge branch 'master' into storageareas
2016-04-26 13:10:37 -04:00
804ac1de81
Clone feature added
2016-04-14 13:53:10 -04:00
6816a4c75b
Merge branch 'iconnor_video' into storageareas
2016-04-01 11:35:38 -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
ea49dc20d1
Merge branch 'master' into storageareas
2016-03-30 10: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
ab05d52a0a
Update en_gb.php
...
typo
2016-03-28 08:35:34 -05:00
af68fd20a8
Some Translations for Monitor names with spaces
2016-03-24 14:51:24 +01:00
9c98ccbb75
Fix spelling in ffmpeg options help: s/verbosiy/verbosity/
2016-03-20 16:13:53 +00:00
020731a89e
Fix typo in ffmpeg options help: s/passwd/passed/
2016-03-20 16:10:49 +00:00
ae58da31ea
Changed WSDiscovery from 1.1 to 1.0
2016-03-19 19:04:09 +01:00
e67f247374
add ConcurrentFilter translation
2016-02-05 11:58:20 -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
818cd614eb
Merge branch 'multi-server' into storageareas
2016-01-08 10:17:37 -05:00
d48ec1cfbe
Add AddNewServer and Hostname entries
2016-01-08 10:15:41 -05:00
1aa79c306b
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-12-22 09:47:45 -05:00
c03088e1b5
Just say Storage Area instead of Storage Id /Name. Same with Server
2015-12-21 14:32:42 -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
2548ec3bc0
Add Attr lines for StrageId and StorageName
2015-12-21 10:10:53 -05:00
6f5c70dd5d
Add Attr lines for ServerId and ServerName
2015-12-21 10:10:11 -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
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
23b549a471
recaptcha fixes to avoid lockout
2015-09-24 15:44:35 -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
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
c17de4a00f
add Exif checkbox to monitor
2015-08-16 17:56:03 -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
649a39b372
Replace analysis interval parameter by analysis framerate
2015-07-23 16:36:30 -04:00
132e0a1798
Add analysis fps paramter to monitors
2015-07-22 21:38:35 +02:00
a6b7c6e99f
Add analysis interval parameter to monitors
2015-07-21 22:52:52 +02:00
b6af731400
Add translate options for h264 Storage options in Monitor and update en_gb file
2015-06-10 23:41:17 +10:00
0e7fa89dd1
Fix: typo in options_libvlc
...
Fixed typo in the OPTIONS_LIBVLC help.
2015-04-22 15:26:33 +03:00
ac8ace33f8
Remove hardcoded localized strings and update lang files
2015-04-18 17:14:14 +02: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
2b53e439b9
Add Capture Resolution to replace Capture Width and Capture Height
2015-02-11 13:14:51 -05:00
641c94d5be
add CSSDescription which is used on the options tab for skin
2014-11-26 11:57:01 -05:00
2bf9080ca9
ensure captures_per_frame >0
...
add missing lang entries for MultiBuffer and CapturesPerFrame
2014-11-14 17:17:09 +01:00
5c6fe54265
Persistance and UI for ONVIF monitor options
2014-11-14 17:17:09 +01:00
fb31f7f15f
Added basic ONVIF support
2014-11-14 17:00:16 +01:00
f1b2ba091c
Update meta makefiles
2014-09-12 16:06:19 +02:00
e065e2b3cc
add V4L
2014-07-24 11:37:10 -04: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
a81b9b8ce2
change examples for options
2014-05-17 21:48:08 +02:00
9a71a0068a
add help window for ffmpeg/libvlc options
2014-05-17 04:33:33 +02:00
Isaac Connor
Isaac Connor
Andrew Bauer
Isaac Connor
Pliable Pixels
digital-gnome
APHW2 MFGENG
SteveGilvarry
klemens
Andy Bauer
Isaac Connor
corax
Robin Daermann
Jon Burgess
Jan M. Hochstein
Isaac Connor
SteveGilvarry
Andrew Bauer
Emmanuel Papin
Lihis
m-bene