ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,758 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

574 Commits

Author SHA1 Message Date
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 9d8455daea fix size of filter popups 2015-12-21 15:18:05 -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 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
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 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 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 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 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 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 382ad0f390 put () after property names of Monitor object 2015-12-01 14:30:24 -05:00
Isaac Connor c2a7e0c587 fix size of monitor popup in flat skin 2015-11-25 15:39:46 -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
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
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 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
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
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
Pliable Pixels 727486d8f3 recaptcha now displays translated message if secret is wrong 2015-09-25 11:11:25 -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 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
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 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 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 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
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
Isaac Connor bb41ebf776 Merge branch 'master' into multi-server 
Conflicts:
	src/zm_monitor.cpp
 2015-08-31 16:03:40 -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 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 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
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
Linwood-F 987db68452 Fix extra image copy; fix options unset of exif toggle 2015-08-18 14:39:55 -04:00
Linwood-F 99c8af4a17 Bring up to date with master (mostly) 2015-08-17 22:52:51 -04:00
Isaac Connor 3462b0e0ab content for server edit popup 2015-08-17 12:42:20 -04:00
Isaac Connor 7eb07dbb65 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-08-17 12:30:54 -04:00
Robin Daermann e390200824 Small dark CSS fixes in frames and timeline view 2015-08-17 14:39:41 +02:00
Robin Daermann 299c629a20 Merge remote-tracking branch 'upstream/master' into large-timestamp 
Conflicts:
	CMakeLists.txt
	configure.ac
	version
 2015-08-17 13:42:36 +02:00
Andrew Bauer c17de4a00f add Exif checkbox to monitor 2015-08-16 17:56:03 -05:00
Andrew Bauer 32f6c92b02 replace php short open tag 2015-08-16 12:29:03 -05:00
Isaac Connor 4f07279d25 include server.php in autotools build 2015-08-16 12:25:23 -04:00
Isaac Connor 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
Isaac Connor 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
Isaac Connor c0517b11ae Merge branch 'master' into multi-server 2015-08-16 10:52:51 -04:00
Isaac Connor 9117e2949a add server.php. 2015-08-16 10:52:47 -04:00
Andrew Bauer c53bb7f56f change edit permission from system to groups 2015-08-15 13:45:43 -05:00
Andrew Bauer 1d688be1a1 propagate canEditGroup permission 2015-08-15 13:22:13 -05:00
Andrew Bauer c051f3482b add Groups to options again 2015-08-15 12:37:25 -05:00
Andrew Bauer 1d97e9d1f9 Add Groups column to options 2015-08-15 12:24:48 -05:00