mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-02-01 10:01:07 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,341 Commits 66 Branches 101 Tags
cf7e1688722c49ae11a50c1d2181124b8e7a94de
Commit Graph

130 Commits

Author SHA1 Message Date
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
6df1425897 Slight update to allow the instantiation with no row or Id 2015-12-22 09:52:33 -05:00
Isaac Connor
aaa9f3bcc9 Handle case where parameter is not passed to constuctor 2015-12-15 11:19:50 -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
e6c9830728 Use Monitor class instead of old sql 2015-12-09 09:23:36 -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
62adb756a9 put back CORS validity checking code 2015-12-02 10:12:20 -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
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
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
Isaac Connor
4d6c4355db Merge branch 'master' into multi-server 2015-11-20 16:07:50 -05: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
2237391876 white spacing, and fix loading of Server objects in monitor 2015-10-15 09:28:35 -04:00
Isaac Connor
6570a8d855 fix Server->Hostname() 2015-10-02 18:22:19 +00:00
Isaac Connor
00ef849908 fix line testing for Hostname 2015-10-02 15:29:17 +00:00
Isaac Connor
e4d51e1819 Merge branch 'master' into multi-server 2015-09-28 10:04:23 -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
23b549a471 recaptcha fixes to avoid lockout 2015-09-24 15:44:35 -04:00
Pliable Pixels
ae6fd7daea fixed constant check when not defined 2015-09-24 09:57:43 -04:00
Isaac Connor
ba1100fc03 continue conversion from array to class of Monitor 2015-09-17 16:06:47 -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
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
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
535a760f26 Merge branch 'master' into multi-server 
Conflicts:
	configure.ac
 2015-09-16 09:12:55 -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
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
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
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
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
Andrew Bauer
2fbf79674b Add RTSP Describe checkbox to web console 2015-08-21 10:32:50 -05: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
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