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

203 Commits

Author SHA1 Message Date
Isaac Connor b4b622668c fix merge 2016-04-06 08:39:47 -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
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 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
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 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
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