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

162 Commits

Author SHA1 Message Date
Andrew Bauer a57a3d3186 Merge pull request #1501 from ZoneMinder/fix_zone_edit 
Fix zone edit
 2016-05-31 10:33:31 -05:00
Andrew Bauer 1972c4116b Merge pull request #1486 from connortechnology/update_image_view 
Update image view
 2016-05-26 09:05:14 -05:00
Isaac Connor a8e407172a split out versus get functionality in includes/functions. Fix positioning of svg over image stream 2016-05-24 15:50:22 -04:00
Isaac Connor 89f58daf89 Merge branch 'master' into fix_zone_edit 2016-05-24 15:30:56 -04:00
Isaac Connor 235095ed5f fix URL to image view 2016-05-16 10:32:43 -04:00
Isaac Connor 1530096560 whitespace/google code style 2016-05-12 10:17:41 -04:00
Isaac Connor c050969141 Merge object model classes from storageareas 2016-05-05 15:33:28 -04:00
Isaac Connor be5f0cd4a9 replace OutputVideoStream and OutputImageStream with versions that return a string. Call getStreamHTML before we output the headers because we use streamMode and streamSrc in the header .js.php 2016-04-29 10:44:46 -04:00
Isaac Connor 5e20831030 Don't return of disk_free_space returns false, just log it. 2016-04-28 09:29:40 -04:00
Isaac Connor d847d66e99 handle disk_free_space error 2016-04-26 14:40:40 -04:00
Isaac Connor 851a81eff7 Merge pull request #1406 from ZoneMinder/svg_zones 
replace the static zone image with a stream, and use SVG to draw the zones
 2016-04-11 11:14:11 -04:00
Andy Bauer e5bf2d245c quit the stream in zones.php when zone.php is called 2016-04-10 15:33:55 -05:00
Isaac Connor feb7b36f11 use a local variable to prevent modifying the arguments 2016-04-09 11:23:52 -04:00
Isaac Connor ce6f8da098 Use PDO::error_string instead of mysql_error 2016-04-09 11:23:35 -04:00
Isaac Connor e90024c0d0 Better Error logging on disk_total_space failure 2016-04-09 09:27:12 -04:00
Isaac Connor 3056069f3f introduce getStreamHTML which returns the required HTML to give you a live image 2016-04-08 11:06:34 -04:00
Andy Bauer 4e9a925933 Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete 2016-04-04 20:52:49 -05:00
Andy Bauer 7ff8d36598 Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation 2016-04-04 20:44:53 -05:00
Isaac Connor 711343a5cc fix ZM_SERVER_ID instead of ZM_SERVER 2016-04-04 16:34:21 -04:00
Isaac Connor 02eb36040a fix bad code 2016-04-04 12:01:37 -04:00
Laercio Motta ad912a6c6b Improve test multiserver restart camera. (FIX) 
Check if the server is correctly before restart cam and multiserver is activate.
 2016-03-31 09:45:13 -03:00
Laercio Motta 2f27818e5b Improve test multiserver restart cam. 
Test if correct server from camera edit settings.
 2016-03-31 09:23:01 -03:00
Andy Bauer 466f2b2ae3 change multi-server error message text 2016-03-01 11:12:54 -06:00
SteveGilvarry d40bf89b17 Remove Phone BW settings used with mobile skin 2016-02-26 22:43:37 +11:00
SteveGilvarry 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
Andrew Bauer ab7b4ab3e6 Merge pull request #1221 from ZoneMinder/rotate_dimensions_when_image_is_rotated 
implement Width and Height functions, and test for image rotation and…
 2016-02-04 10:17:19 -06:00
Isaac Connor 4520902dd2 use trim on values when saving. 2016-01-14 09:37:41 -05:00
Isaac Connor f5db14d823 return empty for the non multi-server case 2016-01-04 13:46:05 -05:00
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 c639822d62 When Server is not set, us ZM_BASE_PATH 2016-01-03 11:55:53 -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 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