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

179 Commits

Author SHA1 Message Date
Isaac Connor c9a1a9020d Merge h264 2016-03-31 11:03:36 -04:00
Isaac Connor e5a36c02bd Merge remote-tracking branch 'origin/master' into video_remote 2016-03-30 16:55:24 -04:00
Isaac Connor 50f9241c14 When no Id is specified, default to ZM_DIR_EVENTS 2016-03-29 15:38:53 -04:00
Isaac Connor cfa11b95dc Add missing Server and Storage Area filters 2016-03-29 12:27:23 -04:00
Isaac Connor d91045319d Use Event object delete method in deleteEvent 2016-03-29 12:07:13 -04:00
Isaac Connor 655116eea9 add LinkPath and delete methods 2016-03-29 11:49:15 -04:00
Isaac Connor 0d8c63f578 Merge branch 'master' into storageareas 2016-03-02 09:11:55 -05:00
Andy Bauer 466f2b2ae3 change multi-server error message text 2016-03-01 11:12:54 -06:00
Isaac Connor e2d892961b use storage area paths in getting analyze images and frame stills 2016-02-19 09:46:56 -05:00
Isaac Connor 51d814ad46 add concurrent to save filter 2016-02-05 11:58:05 -05:00
Isaac Connor 0674fa2d7a Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-02-04 12:21:33 -05:00
Isaac Connor 89cff287cd Merge branch 'master' into storageareas 2016-02-04 12:14:16 -05: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 08858685c5 add find_all function to Storage 2016-02-03 09:43:02 -05:00
Isaac Connor 9543a8a364 Add Event.php to autoconf build 2016-02-01 13:08:48 -05:00
SteveGilvarry 7301e803ed Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
 2016-01-30 15:45:08 +11:00
Isaac Connor e057d8d722 rough in an Event object. 2016-01-14 13:34:51 -05:00
Isaac Connor 4520902dd2 use trim on values when saving. 2016-01-14 09:37:41 -05:00
Isaac Connor 69ddc7d34c Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-01-04 14:38:37 -05:00
Isaac Connor b9f17a18d6 Merge branch 'multi-server' into storageareas 2016-01-04 14:09:41 -05:00
Isaac Connor f5db14d823 return empty for the non multi-server case 2016-01-04 13:46:05 -05:00
Isaac Connor 5144d3befb Merge branch 'rotate_dimensions_when_image_is_rotated' into storageareas 2016-01-04 13:19:09 -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 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 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 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
SteveGilvarry e28e3c2b75 Merge branch 'master' into feature-h264-videostorage 2015-12-20 14:13:30 +11:00
Isaac Connor 9782204548 include Storage.php 2015-12-18 12:13:26 -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 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 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