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

310 Commits

Author SHA1 Message Date
Isaac Connor c1f30480e3 fix merge 2016-06-23 12:49:27 -04:00
Isaac Connor e29a0ebe71 Merge branch 'feature-h264-videostorage' into storageareas 2016-06-21 13:48:32 -04:00
Isaac Connor 31a5252afa apply btn and btn-primary styles to remaining buttons on console 2016-06-21 09:22:32 -04:00
Isaac Connor 4230bd1bd5 move the control_fields into the class so that it is available. 2016-06-20 12:46:23 -04:00
Isaac Connor 9c7b22086f introduce a hash to define the fields and default values of the control table. Primarily this is to prevent method warnings when a monitor is not controllable 2016-06-20 12:41:14 -04:00
Isaac Connor 1d1cedce95 use rand mofification like when re-establishing the stream instead of an Time(). Drop use of a tempImage as it doesn't seem to be used anywhere. Cleanup use of streamSrc. Introduce a function getStreamMode 2016-06-20 12:40:33 -04:00
Isaac Connor 26bba58c56 Merge branch 'master' into feature-h264-videostorage 2016-06-17 11:09:47 -04:00
Isaac Connor acba5bccf1 Always include the monitor Id in the tag id for the videostream 2016-06-14 12:38:37 -04:00
Isaac Connor 0f1a1a6294 log invalid calls to Monitor Object 2016-06-14 12:38:17 -04:00
Isaac Connor 94174a1fe2 use user= and pass= instead of auth hash 2016-06-07 15:47:59 -04:00
Isaac Connor 086d435712 send zmcCommand to api on server 2016-06-07 14:39:59 -04:00
Andrew Bauer a57a3d3186 Merge pull request #1501 from ZoneMinder/fix_zone_edit 
Fix zone edit
 2016-05-31 10:33:31 -05:00
Isaac Connor c25b680799 Merge branch 'fix_filter_actions' into storageareas 2016-05-27 11:12:18 -04:00
Isaac Connor 65e33d6c19 synchronize on capitalizing the word Auto. This should fix the losing of the checkboxes when you change a filter 2016-05-27 11:11:30 -04: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 8fabeb78d3 Merge branch 'fix_zone_edit' into storageareas 2016-05-24 15:55:49 -04: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 ae1eb94f27 fix getStreamHTML when using helper 2016-05-24 15:10:37 -04:00
josh4trunks 2ab79820a1 Add back changes 2016-05-22 08:08:12 -07:00
Isaac Connor e62ea454ba Merge branch 'master' into storageareas 2016-05-17 10:48:52 -04:00
Isaac Connor e4566f2e8e Merge branch 'update_image_view' into storageareas 2016-05-16 12:23:19 -04:00
Isaac Connor 235095ed5f fix URL to image view 2016-05-16 10:32:43 -04:00
Isaac Connor 2144cb7de6 fix body padding only for console and options 2016-05-12 10:45:13 -04:00
Isaac Connor 1530096560 whitespace/google code style 2016-05-12 10:17:41 -04:00
Isaac Connor a8de0bff71 Merge branch 'master' into storageareas 2016-05-09 19:30:02 -04:00
Isaac Connor 35783f7dc0 Merge branch 'mysql_fixes' into storageareas 2016-05-09 19:27:42 -04:00
Isaac Connor 7f9c70d521 when value to be stored is undefined or '', then set the field=NULL 2016-05-09 13:39:40 -04:00
Isaac Connor c050969141 Merge object model classes from storageareas 2016-05-05 15:33:28 -04:00
Isaac Connor 4b782efd54 Whitespace fixes 2016-05-05 15:30:24 -04:00
Isaac Connor 0e74778dda add find and find_all functions 2016-05-05 14:49:57 -04:00
Isaac Connor fe63e4af80 remove extra semi colon 2016-05-02 13:42:42 -04:00
Steve Gilvarry da157f5a1a Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-04-30 22:27:10 +10:00
Isaac Connor 0044161b9c Merge branch 'fix_zone_edit' into storageareas 2016-04-29 10:46:37 -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 af66105c37 Merge branch 'master' into storageareas 2016-04-29 08:28:53 -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 59db5d42e7 include Frame.php 2016-04-25 15:00:27 -04:00
Isaac Connor 4b4add49bd Merge /home/iconnor/sandbox/ZoneMinder.connortechnology into storageareas 2016-04-15 13:18:35 -04:00
Isaac Connor ccb5ea766d add the toggle for RecordAudio so that the checkbox works to turn off Audio 2016-04-15 13:16:52 -04:00
Isaac Connor 61bd60184a Merge branch 'random_fixes' into storageareas 2016-04-11 11:28:24 -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
Isaac Connor d493ca69a9 Merge branch 'master' into icon_video 2016-04-11 09:31:51 -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 78c6e14e0c Merge branch 'master' into storageareas 2016-04-09 14:52:28 -04: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 6bb95beb9a Merge branch 'svg_zones' into storageareas 2016-04-08 13:20:01 -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
Isaac Connor 7491aa4381 fix spelling mistake 2016-04-06 10:55:11 -04:00
Isaac Connor b4b622668c fix merge 2016-04-06 08:39:47 -04:00
Isaac Connor 9a795432cf merge all the commits from the messed up iconnor_video branch 2016-04-05 17:14:46 -04:00
Isaac Connor 60642c1fff Merge branch 'iconnor_video' into storageareas 2016-04-05 12:32:33 -04:00
Isaac Connor 238a25a302 Merge branch 'master' into iconnor_video 2016-04-05 09:38:59 -04:00
SteveGilvarry 4d7ded5ef0 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	configure.ac
	src/Makefile.am
	web/js/Makefile.am
 2016-04-05 22:06:14 +10: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 868e5a51fa Rename some of the columns names when laoding Control settings as they conflict with Monitor columns 2016-04-04 16:44:21 -04:00
Isaac Connor 711343a5cc fix ZM_SERVER_ID instead of ZM_SERVER 2016-04-04 16:34:21 -04:00
Isaac Connor ec6782a663 fix ZM_SERVER_ID instead of ZM_SERVER 2016-04-04 16:33:46 -04:00
Isaac Connor bc9760ce79 Merge branch 'master' into storageareas 2016-04-04 16:13:17 -04:00
Isaac Connor 02eb36040a fix bad code 2016-04-04 12:01:37 -04:00
Isaac Connor faa75bbe39 fix wrong brace and needs quotes 2016-04-04 12:00:29 -04:00
Isaac Connor 197ae67313 Merge branch 'always_show_ptz' into storageareas 2016-04-04 11:47:29 -04:00
Isaac Connor c8fa0a9b4f Merge branch 'master' into feature-h264-videostorage 2016-04-04 10:14:15 -04:00
Isaac Connor 8a2605578a fix type in htmlSelect 2016-04-01 15:43:40 -04:00
Isaac Connor d71eaa66ec use view_video.php as a short-term fix for viewing video 2016-04-01 15:43:31 -04:00
Isaac Connor ca96481036 fix thumbnail generation from video file 2016-04-01 13:02:31 -04:00
Isaac Connor cbebdfe670 add Time function to get unixtime from StartTime 2016-04-01 13:00:59 -04:00
Isaac Connor 6ebd71f980 instead of loading and looking at current recording settings, check to see if the images exist. If not, generate them from the video file 2016-04-01 12:51:09 -04:00
Isaac Connor 6816a4c75b Merge branch 'iconnor_video' into storageareas 2016-04-01 11:35:38 -04:00
Isaac Connor 59bf780537 introduce htmlSelect as a better version of buildSelect 2016-04-01 10:35:59 -04:00
Isaac Connor c074f6e0bf Add a set function to take an array of value to set in the Object 2016-04-01 10:34:40 -04:00
Isaac Connor c9a1a9020d Merge h264 2016-03-31 11:03:36 -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
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
SteveGilvarry 24ebc33ea4 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-03-09 20:54:11 +11: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
SteveGilvarry 3ce620eb89 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-02-27 19:46:56 +11: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
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