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

1836 Commits

Author SHA1 Message Date
Isaac Connor 582cbe7567 Merge branch 'master' into multi-server 2015-10-15 09:01:19 -04: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
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 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
Andrew Bauer c78f39c106 Merge pull request #962 from Linwood-F/959-add-exif-date-time-to-images 
959 add exif date time to images
 2015-08-18 13:46:54 -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
Andy Bauer 64299082ad Send login activity to the zoneminder event log 2015-08-17 17:54:17 -05:00
Isaac Connor 3462b0e0ab content for server edit popup 2015-08-17 12:42:20 -04:00
Isaac Connor 6bd038cb29 don't add the api to autotools, because the autotools files are not present in there 2015-08-17 12:33:00 -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