20c295ad0c
Merge remote-tracking branch 'upstream/master' into feature-plugins
...
Conflicts:
.travis.yml
CMakeLists.txt
Makefile.am
bootstrap.sh
configure.ac
distros/debian8/control
distros/debian_cmake/control
misc/Makefile.am
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
src/CMakeLists.txt
src/Makefile.am
src/zm_monitor.cpp
src/zm_monitor.h
src/zmstreamer.cpp
web/lang/ru_ru.php
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-04-07 00:00:38 +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
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
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
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
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
f54b8c27ee
upgrade montage to use Monitor object and getStreamSrc which knows which server to connect to
2015-12-02 12:10:32 -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
a700cbffdb
Merge remote-tracking branch 'upstream/master' into feature-plugins
...
Conflicts:
CMakeLists.txt
configure.ac
src/zm_monitor.cpp
src/zm_monitor.h
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/es_es.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/views/monitor.php
2015-11-08 21:06:21 +11: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
366c4ec676
monitor array to class
2015-09-17 15:35:09 -04:00
4fa6948e5c
add form validation for server editing. Currently just requires a name
2015-09-16 09:12:21 -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
02a6443c3b
Cleaned up button handling
2015-08-26 11:21:29 -04: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
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
1d688be1a1
propagate canEditGroup permission
2015-08-15 13:22:13 -05:00
911f0fad28
Use destination color from CSS in transition effect in log view (instead
...
of #000000 )
2015-07-27 09:53:59 +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
eff56664c3
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support
...
Conflicts:
web/lang/de_de.php
web/skins/classic/views/monitor.php
web/skins/classic/views/plugin.php
2015-05-28 23:43:13 +02:00
2b770b2f58
Add an error message if plugin option is not valid
2015-05-16 06:12:38 +02:00
676968ed04
Add list option for plugins
2015-05-14 11:38:38 +02:00
3a94712db2
add translate function
2015-05-10 08:10:30 -05:00
49116a27d7
Fix a conflict with php variable
2015-05-06 23:16:09 +02:00
63158ebe7d
Improve management of plugin options
2015-03-08 13:13:49 +01:00
9929233e75
Merge branch 'master' into plugin_support_test
...
Conflicts:
configure.ac
web/lang/fr_fr.php
2015-02-25 23:14:25 +01: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
5060fc490f
Merge branch 'master' into plugin_support_test
2015-02-15 15:03:23 +01:00
690a2f083e
fix montage layout broken by my skin merging
2015-02-02 19:06:20 -05:00
39d270a8c3
Fixed autotools build to reflect file name change
2014-12-21 16:52:01 +01:00
cb3b8a901e
Merge branch 'master' into plugin_support_test
...
Conflicts:
distros/debian/control
web/skins/classic/views/js/Makefile.am
2014-12-21 16:49:25 +01: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
SteveGilvarry
Andrew Bauer
Isaac Connor
Isaac Connor
Robin Daermann
Andrew Bauer
Isaac Connor
SteveGilvarry
Pliable Pixels
Emmanuel Papin
jrd288