Isaac Connor
45fc689203
implement Width and Height functions, and test for image rotation and output opposite dimension. Fixes #1220
2016-01-04 13:15:50 -05:00
Isaac Connor
f72260733c
Only do CORSHeaders if there is more than 1 server
2016-01-04 09:38:24 -05:00
Isaac Connor
d256530896
return early if no servers are defined instead of logging a warning
2016-01-04 09:36:45 -05:00
Isaac Connor
33b8405e0d
Merge branch 'multi-server' into storageareas
2016-01-03 11:57:07 -05:00
Isaac Connor
c639822d62
When Server is not set, us ZM_BASE_PATH
2016-01-03 11:55:53 -05:00
Isaac Connor
bf2195828f
Merge branch 'multi-server' into storageareas
...
Conflicts:
docs/installationguide/index.rst
2016-01-02 14:42:47 -05:00
Isaac Connor
bd71c4999d
test for Server in servers_by_Id as well as just having a value for ServerId. Fixup export as well.
2016-01-02 14:36:37 -05:00
Isaac Connor
5c0e4aa172
Merge branch 'multi-server' into storageareas
2016-01-01 17:11:01 -05:00
Isaac Connor
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
Isaac Connor
468f997e4c
Soft error, with logging when the filter element doesn't exist
2016-01-01 16:36:29 -05:00
Isaac Connor
ec7504f925
Translate ServerId to Server in Log record before sending back
2016-01-01 16:33:28 -05:00
Isaac Connor
93dbc3f0c1
Merge multi-server updates and bump version
2016-01-01 16:31:02 -05:00
Isaac Connor
12ee147bc7
Add a find_all function to return an array of Server objects
2015-12-31 10:13:48 -05:00
Isaac Connor
bfe4175fdf
Add Server to filters and log results
2015-12-31 10:13:25 -05:00
Isaac Connor
31ba0221ed
Add Server to filters and log results
2015-12-31 10:13:03 -05:00
Isaac Connor
983b47f6dc
Add Server columns
2015-12-31 09:09:57 -05:00
RBxx
0ccce76ef8
Convert ru_ru.php to UTF-8
...
In koi8-r encoding, some menu items are not displayed in the web interface. With UTF-8 encoding all displayed correctly.
2015-12-31 16:58:56 +03:00
Isaac Connor
492550b5ef
Merge branch 'storageareas' into newpointone
...
Conflicts:
scripts/zmaudit.pl.in
2015-12-24 12:36:40 -05:00
Isaac Connor
45987e92a9
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2015-12-24 12:34:55 -05:00
SteveGilvarry
1ff2043774
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2015-12-23 19:24:08 +11:00
Isaac Connor
479e5df454
Add default events dir to dropdown
2015-12-22 10:53:39 -05:00
Isaac Connor
eccfced6d4
Merge branch 'multi-server' into newpointone
...
Conflicts:
distros/ubuntu1204/apache.conf
2015-12-22 09:54:13 -05:00
Isaac Connor
6df1425897
Slight update to allow the instantiation with no row or Id
2015-12-22 09:52:33 -05:00
Isaac Connor
1aa79c306b
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-12-22 09:47:45 -05:00
Isaac Connor
658e130d33
sync up to c39 version
2015-12-22 09:44:46 -05:00
Isaac Connor
9d8455daea
fix size of filter popups
2015-12-21 15:18:05 -05:00
Isaac Connor
c03088e1b5
Just say Storage Area instead of Storage Id /Name. Same with Server
2015-12-21 14:32:42 -05:00
Isaac Connor
a840246849
Add Server dropdown for ServerId
2015-12-21 14:29:53 -05:00
Isaac Connor
aa9a6ddcc3
populate dropdown with the available storage areas when StorageId is selected
2015-12-21 14:12:33 -05:00
Isaac Connor
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
Isaac Connor
ca07b951cb
Merge branch 'master' into newpointone
...
Conflicts:
docs/installationguide/ubuntu.rst
2015-12-21 12:41:25 -05:00
Isaac Connor
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
Isaac Connor
2548ec3bc0
Add Attr lines for StrageId and StorageName
2015-12-21 10:10:53 -05:00
Isaac Connor
6f5c70dd5d
Add Attr lines for ServerId and ServerName
2015-12-21 10:10:11 -05:00
Isaac Connor
00c4eedb90
Add StorageId and StorageName to fields that we can filter on
2015-12-21 10:04:13 -05:00
Isaac Connor
b626712a2f
Add ServerId and ServerName to fields that we can filter on
2015-12-21 10:03:48 -05:00
Isaac Connor
27597c3401
Merge branch 'master' into storageareas
...
Conflicts:
docs/installationguide/ubuntu.rst
2015-12-20 11:19:44 -05:00
Isaac Connor
37212dcf2e
Merge pull request #1196 from pliablepixels/api-more-security
...
Api more security
2015-12-20 10:22:40 -05:00
SteveGilvarry
e28e3c2b75
Merge branch 'master' into feature-h264-videostorage
2015-12-20 14:13:30 +11:00
arjunrc
6e606aa74b
removed issue #
2015-12-19 19:04:27 -05:00
arjunrc
38b4785557
PP - Gone,flitted away, Taken the starts from the night and sun, From the day! Gone, and a cloud in my heart. - Tennyson
2015-12-19 18:36:38 -05:00
arjunrc
c4461c328e
initial user role support
2015-12-19 17:45:03 -05:00
arjunrc
b4fdaa9b4d
initial user role support
2015-12-19 17:44:46 -05:00
arjunrc
e812398fb9
initial user role support
2015-12-19 17:44:39 -05:00
arjunrc
f56688e7c2
initial user role support
2015-12-19 17:44:16 -05:00
arjunrc
028c9b956c
check for opt_use_api, also pull in user roles support
2015-12-19 17:44:02 -05:00
Andy Bauer
e5f243a9f8
Merge branch 'maxfps' of https://github.com/knnniggett/ZoneMinder into knnniggett-maxfps
2015-12-19 08:16:20 -06:00
Steve Gilvarry
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
Isaac Connor
a0f8e8be4b
increase width and height of monitors popup to fit new fields
2015-12-18 13:43:16 -05:00
Isaac Connor
ee42174002
Merge branch 'master' into storageareas
2015-12-18 13:42:15 -05:00
Isaac Connor
983d87f69b
increase height and width of groups window to fit buttons in
2015-12-18 13:34:44 -05:00
Isaac Connor
ca45ac23fa
increase height of group edit window
2015-12-18 13:30:42 -05:00
Isaac Connor
9782204548
include Storage.php
2015-12-18 12:13:26 -05:00
Isaac Connor
fb1766f21f
Add storage.php
2015-12-18 11:39:42 -05:00
Isaac Connor
09c75e2363
add a storage area editing page
2015-12-15 14:08:34 -05:00
Isaac Connor
8f141305b7
add default parameter in constuctor
2015-12-15 13:27:57 -05:00
Isaac Connor
c345d697b2
missed dbServer -> dbStorage
2015-12-15 11:21:52 -05:00
Isaac Connor
6ce7952acb
Merge branch 'multi-server' into storageareas
2015-12-15 11:20:01 -05:00
Isaac Connor
aaa9f3bcc9
Handle case where parameter is not passed to constuctor
2015-12-15 11:19:50 -05:00
Isaac Connor
20f9a01a66
Add a Storage tab, to provide a place to define your storage areas
2015-12-15 11:13:21 -05:00
Isaac Connor
14dc447145
add a Storage Area dropdown to set where this monitor will storage it's events
2015-12-15 11:13:00 -05:00
Isaac Connor
9ffbaabde5
add save and delete actions for Storage
2015-12-15 11:12:33 -05:00
Isaac Connor
c07c63cde6
Check for setting of IdOrRow. When loading from db, using FETCH_CLASS, the constructor is called without arguments
2015-12-15 11:12:21 -05:00
Isaac Connor
14cde582cf
Merge branch 'multi-server' into multiserverplusstorage
...
Conflicts:
src/zm_monitor.h
2015-12-14 16:55:26 -05:00
Isaac Connor
b2b1afa8ad
Merge master
2015-12-14 15:49:32 -05:00
Isaac Connor
6cfd993890
Merge branch 'master' into multi-server
2015-12-09 10:43:38 -05:00
Isaac Connor
53dec9f26d
check for setting of __REQUEST['object'] to silence php NOTICE
2015-12-09 10:43:23 -05:00
Isaac Connor
6d34f8f424
Use Monitor class instead of old sql
2015-12-09 09:23:42 -05:00
Isaac Connor
e6c9830728
Use Monitor class instead of old sql
2015-12-09 09:23:36 -05:00
Isaac Connor
f2065e2fcb
Merge branch 'one_eighth' into multi-server
2015-12-08 08:47:35 -05:00
Isaac Connor
d6b2e1959f
add a 1/8th scale option, which is useful for 1920x1080 streams
2015-12-08 08:40:44 -05:00
Isaac Connor
3c86965760
Merge branch 'master' into multi-server
...
Conflicts:
web/skins/classic/js/flat.js
2015-12-04 15:31:30 -05:00
Isaac Connor
f54b8c27ee
upgrade montage to use Monitor object and getStreamSrc which knows which server to connect to
2015-12-02 12:10:32 -05:00
Isaac Connor
34f6590107
upgrade montage to use Monitor object and getStreamSrc which knows which server to connect to
2015-12-02 12:10:26 -05:00
Isaac Connor
961dc90b0e
add Server function
2015-12-02 11:21:04 -05:00
Isaac Connor
b8fb711593
only do CORS if Origin is set
2015-12-02 11:02:47 -05:00
Isaac Connor
41d92bbf94
need to include Server class
2015-12-02 10:26:11 -05:00
Isaac Connor
62adb756a9
put back CORS validity checking code
2015-12-02 10:12:20 -05:00
Isaac Connor
644080fd41
call CORSHeaders
2015-12-02 10:05:27 -05:00
Isaac Connor
3f8a45bbbb
Add a function to setup CORS access headers
2015-12-02 10:05:03 -05:00
Isaac Connor
a799a1ce79
Make Server constructor take a row or an id
2015-12-02 10:04:47 -05:00
Isaac Connor
aa91e69a9b
add monitorUrl to be used to target the recording server for the monitor
2015-12-01 15:17:49 -05:00
Isaac Connor
342326e159
append monitorUrl to thsiURL to get access to the recording server for the monitor stream
2015-12-01 15:17:25 -05:00
Isaac Connor
95f002c7d6
convert monitor hash accesses to function calls
2015-12-01 15:16:53 -05:00
Isaac Connor
c5d57b5b64
convert monitor hash accesses to function calls
2015-12-01 15:16:43 -05:00
Isaac Connor
945949ebc0
fix __call to actually return the value
2015-12-01 15:16:18 -05:00
Isaac Connor
2dfa6d6bae
add Url and __call functions
2015-12-01 15:16:07 -05:00
Isaac Connor
382ad0f390
put () after property names of Monitor object
2015-12-01 14:30:24 -05:00
Isaac Connor
e85ba683e1
improve constructor to handle numeric as well, and give error when something else
2015-12-01 14:29:57 -05:00
Isaac Connor
e4f5f76782
rewrite constructor to take a row as well as an Id
2015-12-01 14:03:55 -05:00
SteveGilvarry
220ee5e516
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2015-11-29 13:17:22 +11:00
Isaac Connor
c2a7e0c587
fix size of monitor popup in flat skin
2015-11-25 15:39:46 -05:00
Isaac Connor
f7cc2fb44f
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
2015-11-23 10:42:14 -05:00
Isaac Connor
4d6c4355db
Merge branch 'master' into multi-server
2015-11-20 16:07:50 -05:00
Heng Liu
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
Kyle Johnson
c0216f74cb
Merge pull request #1164 from abishai/master
...
compat for php 5.4. Fixes #1163
2015-11-16 09:28:03 -07:00
Kyle Johnson
5add10289b
Merge pull request #1136 from pliablepixels/1135-events-API-prev-next
...
added prev/next event ids
2015-11-16 09:23:36 -07:00
abishai
551194227d
compat for php 5.4
2015-11-15 21:40:25 +00:00
Isaac Connor
a0d4934b84
Have PDO actually throw exceptions on db errors. Prior to this it would have been just failing silently. Also, fix a . to -> in the exception catcher.
2015-11-11 16:56:28 -05:00
Isaac Connor
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
Heng Liu
4e263f5913
Merge branch 'master' into feature-h264-videostorage
...
Conflicts:
src/zm_ffmpeg.h
2015-11-04 14:39:52 -08:00
Pliable Pixels
7cbad44ae4
also return the prev and next events for the same monitor as the current event
2015-11-04 14:23:28 -05:00
Pliable Pixels
e3d06ca103
added prev/next event ids
2015-11-02 16:54:52 -05:00
Heng Liu
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
Andy Bauer
cb7acb36ab
Use relative URL's instead of absolute
2015-10-24 13:04:54 -05:00
SteveGilvarry
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
Isaac Connor
2237391876
white spacing, and fix loading of Server objects in monitor
2015-10-15 09:28:35 -04:00
Isaac Connor
582cbe7567
Merge branch 'master' into multi-server
2015-10-15 09:01:19 -04:00
Heng Liu
59b0675588
only expose monitor info which are being used in client
2015-10-02 20:04:10 -07:00
Isaac Connor
6570a8d855
fix Server->Hostname()
2015-10-02 18:22:19 +00:00
Andrew Bauer
13aab8a1be
Merge pull request #1113 from baffo32/1112-detect-missing-content
...
Fatal if content dirs are unwritable
2015-10-14 06:49:33 -05:00
baffo32
da8e9dd81b
Remove reference to php.ini from timezone error
2015-10-13 16:55:38 -04:00
baffo32
250c3c31e1
Revised source-install specific recommendation.
2015-10-13 16:45:31 -04:00
baffo32
362b190641
Fatal if content dirs are unwritable
2015-10-12 16:16:22 -04:00
baffo32
4a280a73d1
Use Fatal function to report bad timezone
2015-10-12 15:43:24 -04:00
baffo32
d20478a15f
Detect invalid timezones
2015-10-12 13:22:30 -04:00
baffo32
7190b532dd
Fatal error if date.timezone is unset
2015-10-12 13:07:07 -04:00
Isaac Connor
1d173a9bf0
Merge pull request #1083 from pliablepixels/1082-monitor-orange
...
fixed orange display for monitor mode
2015-10-06 08:36:35 -04:00
Isaac Connor
e12640ec73
Merge branch 'no_overwrite_zm_conf' into multi-server
2015-10-02 15:34:14 +00:00
Isaac Connor
00ef849908
fix line testing for Hostname
2015-10-02 15:29:17 +00:00
Isaac Connor
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
Heng Liu
2fd6cbe742
fix timeline view for SaveJPEGs monitors (without enabled VideoWriter)
2015-10-01 22:41:31 -07:00
Isaac Connor
ea87ffe66f
merge master, bump version to 1.28.108
2015-10-01 11:52:49 -04:00
Pliable Pixels
d9355064e7
fixed orange display for monitor mode
2015-10-01 11:35:38 -04:00
Kyle Johnson
9c7a15daf7
use deleteAll() vs. delete() when deleting an Event's Frames
2015-09-30 13:53:23 -06:00
Kyle Johnson
1937814c82
Update API Frame Model to new Primary Key. Fixes #663
2015-09-29 14:39:24 -06:00
Isaac Connor
d39f57c4ff
Merge pull request #1073 from pliablepixels/1072-events-API-delete-fix
...
Delete fixes for Events
2015-09-28 14:46:01 -04:00
Pliable Pixels
a00fed480d
Delete fixes for Events
2015-09-28 14:41:36 -04:00
Isaac Connor
cb18adef5c
increase min height of zone edit popup so that buttons are visible
2015-09-28 13:01:07 -04:00
Isaac Connor
4e2ed00027
widen zone edit popup to fit the image
2015-09-28 12:54:54 -04:00
Isaac Connor
7d52c0b784
widen events popup to fit the thumbnail
2015-09-28 12:44:58 -04:00
Isaac Connor
e4d51e1819
Merge branch 'master' into multi-server
2015-09-28 10:04:23 -04:00
Isaac Connor
b53603dee1
Merge pull request #1066 from pliablepixels/1065-recaptcha-ui-fix-when-vars-dont-exist
...
fixed recaptcha showing up pre DB update
2015-09-28 10:00:46 -04:00
Pliable Pixels
ee78ae5c49
restart monitor when edited via APIs
2015-09-28 09:31:57 -04:00
Pliable Pixels
727486d8f3
recaptcha now displays translated message if secret is wrong
2015-09-25 11:11:25 -04:00
Pliable Pixels
d751c3ad61
recaptcha now displays translated message if secret is wrong
2015-09-25 11:11:15 -04:00
Pliable Pixels
e5a6889253
fixed conflict
2015-09-24 15:51:16 -04:00
Pliable Pixels
939bdc90ef
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into 1065-recaptcha-ui-fix-when-vars-dont-exist
2015-09-24 15:45:34 -04:00
Pliable Pixels
23b549a471
recaptcha fixes to avoid lockout
2015-09-24 15:44:35 -04:00
Isaac Connor
e4b0e74f69
merge master
2015-09-24 10:01:27 -04:00
Pliable Pixels
5ca00c2ef5
fixed constant check when not defined
2015-09-24 09:57:53 -04:00
Pliable Pixels
ae6fd7daea
fixed constant check when not defined
2015-09-24 09:57:43 -04:00
Pliable Pixels
48071d7dfc
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into 1065-recaptcha-ui-fix-when-vars-dont-exist
2015-09-24 09:38:57 -04:00
Pliable Pixels
25ab1f6ddd
fixed recaptcha showing up pre DB update
2015-09-23 10:54:24 -04:00
Pliable Pixels
23d5e0e95b
fixed recaptcha showing up pre DB update
2015-09-23 10:50:15 -04:00
Isaac Connor
fbc4f77491
Merge pull request #1049 from knnniggett/core.php
...
remove core.php, modify core.php.default
2015-09-23 09:07:29 -04:00
Dmitry Smirnov
333e7ec67b
header typo corrections
2015-09-19 17:39:54 +10:00
Isaac Connor
ba1100fc03
continue conversion from array to class of Monitor
2015-09-17 16:06:47 -04:00
Isaac Connor
4c2545a5ca
Merge branch 'master' into multi-server
2015-09-17 15:39:26 -04:00
Isaac Connor
aac45e54b8
monitor array to class
2015-09-17 15:35:38 -04:00
Isaac Connor
c415399043
add Hostname to Server
2015-09-17 15:35:27 -04:00
Isaac Connor
366c4ec676
monitor array to class
2015-09-17 15:35:09 -04:00
Isaac Connor
4a65ae1d2a
fix error in display of Server
2015-09-17 15:34:48 -04:00
Isaac Connor
01718aaffb
consturctor just takes an id
2015-09-17 15:34:26 -04:00
Isaac Connor
13327b7651
Load Controls if appropriate
2015-09-17 15:34:09 -04:00
Isaac Connor
52cdb8a05a
add Monitor class
2015-09-17 15:29:36 -04:00
Isaac Connor
c0139e87ad
define ZM_BASE_PROTOCOL
2015-09-17 15:14:43 -04:00
Isaac Connor
ac5f42efcf
add a class for Server objects
2015-09-16 15:16:07 -04:00
Isaac Connor
a8ba32db64
add Server.php to autoconf build
2015-09-16 14:51:59 -04:00
Isaac Connor
0f181b72d1
include Server object and display the server column
2015-09-16 14:51:23 -04:00
Isaac Connor
e172911088
include Server object and fix Server dropdown
2015-09-16 14:51:05 -04:00
Isaac Connor
73badd1c2d
check for value of ZM_SERVER_NAME and ZM_SERVER_HOST and include it in the error message
2015-09-16 11:12:04 -04:00
Isaac Connor
681718e908
init to avoid error message
2015-09-16 11:07:08 -04:00
Isaac Connor
535a760f26
Merge branch 'master' into multi-server
...
Conflicts:
configure.ac
2015-09-16 09:12:55 -04:00
Isaac Connor
4fa6948e5c
add form validation for server editing. Currently just requires a name
2015-09-16 09:12:21 -04:00
Isaac Connor
fb872315d1
add an error log entry for unknown action
2015-09-16 08:38:53 -04:00
Isaac Connor
b680aa41c5
save should be Save
2015-09-15 17:26:31 -04:00
Isaac Connor
d235733290
Need to include logger if we are going to use Error
2015-09-14 15:57:22 -04:00
Andrew Bauer
04fcc253bd
Merge pull request #1048 from pliablepixels/1046-google-recaptcha
...
Google recaptcha
2015-09-01 08:18:54 -05:00
Pliable Pixels
2481c7a22e
Handled situation where user enables captcha but forgets to supply keys
2015-08-31 20:39:43 -04:00
Pliable Pixels
22a7a1d53d
Handled situation where user enables captcha but forgets to supply keys
2015-08-31 20:39:28 -04:00
Isaac Connor
bb41ebf776
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
2015-08-31 16:03:40 -04:00
Andy Bauer
827eebd38c
remove core.php, modify core.php.default
2015-08-29 14:53:39 -05:00
Pliable Pixels
feeb890be2
removed recaptcha client dependency
2015-08-29 15:14:20 -04:00
Pliable Pixels
f7fea2fe48
Removed dependency on recaptcha client library
2015-08-29 15:13:15 -04:00
Pliable Pixels
73fa051ef8
Google recaptcha
2015-08-29 13:29:52 -04:00
Andy Bauer
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
Isaac Connor
f5ba7cb208
restore
2015-08-27 11:39:16 -04:00
Isaac Connor
c48bd3ebca
restore
2015-08-27 11:37:33 -04:00
Isaac Connor
b2699237c7
put back mootools
2015-08-27 11:35:47 -04:00
Isaac Connor
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
Isaac Connor
1cf54d2e38
Merge pull request #1026 from schrorg/blacken-zones
...
Add new zone type - privacy zones
2015-08-27 09:14:16 -04:00
Isaac Connor
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
Robin Daermann
d68e8e8f68
Restart capture process after deleting a Privacy zone
2015-08-27 10:12:54 +02:00
Robin Daermann
dc8a3769e7
Make the capture process restart if a Privacy zone got changed
2015-08-27 09:45:12 +02:00
Pliable Pixels
08d177185c
added oninput for text field handling
2015-08-26 11:22:09 -04:00
Pliable Pixels
02a6443c3b
Cleaned up button handling
2015-08-26 11:21:29 -04:00
Isaac Connor
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
Pliable Pixels
a6f296d84e
Grey color for disabled buttons
2015-08-25 12:29:40 -04:00
Andrew Bauer
a995d72ebd
add warning and help text for maxfps fields
2015-08-22 12:36:49 -05:00
Andrew Bauer
2fbf79674b
Add RTSP Describe checkbox to web console
2015-08-21 10:32:50 -05:00
Isaac Connor
22275e661c
Tell cake to use the same session id as classic ui
2015-08-21 09:03:44 -04:00
tikismoke
52d3fdf471
Update README.md
...
little correction
2015-08-21 11:29:35 +02:00
Robin Daermann
5b465194f8
Renamed 'Blacken' zone type to 'Privacy'
2015-08-20 17:37:59 +02:00
Robin Daermann
b5fc6a9091
Make web correctly recognize new zone type
2015-08-20 15:09:02 +02:00
Isaac Connor
41637278c9
merge master
2015-08-19 16:08:12 -04:00
Isaac Connor
12da43afe7
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 14:01:28 -04:00
Isaac Connor
880e77b096
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 13:30:48 -04:00
Andrew Bauer
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
Andrew Bauer
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