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

375 Commits

Author SHA1 Message Date
Isaac Connor 2018228daf fix V inputs 2014-08-21 11:58:51 -04:00
Isaac Connor 6564c4359b adjust monitor popup height 2014-08-21 11:15:35 -04:00
Isaac Connor 707f2e84db increase monitor popup height to fit v4l settings in 2014-08-21 11:14:48 -04:00
Isaac Connor f93a28f2be fixup multibuffering so it can have a null value which makes it fall back to config table 2014-08-21 11:13:38 -04:00
Isaac Connor 0834e1b61d I see no reason for these to be posts. They retrieve info, that's it. 2014-07-29 16:15:31 -04:00
Isaac Connor 96322dd59c remove v4l tab that I never used 2014-07-29 14:45:02 -04:00
Isaac Connor b2f1c2fe68 Merge branch 'v4l_to_monitor' 2014-07-24 14:35:23 -04:00
Isaac Connor b3f078eaa5 add the word disabled after function if the monitor is not enabled. 2014-07-23 15:46:37 -04:00
Isaac Connor edd794a993 ensure captures_per_frame >0 
add missing lang entries for MultiBuffer and CapturesPerFrame
 2014-07-14 14:07:28 -04:00
Isaac Connor 9385471392 move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera 2014-07-13 16:39:27 -04:00
Isaac Connor 8f88e2a6c0 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-07-08 10:54:16 -04:00
Isaac Connor 2be38d7f32 fix problem editing users, a semi-colon screwed up the if statement. 
Also change behaviour so that if a user is specified, and doesn't load, generate an error.
This also removes a search for empty user id in the db
 2014-07-08 10:52:55 -04:00
Andrew Bauer 371c1bae3d Merge pull request #359 from knnniggett/eyezm 
fix eyezm authentication issue
 2014-07-07 17:57:48 -05:00
Andrew Bauer 5c8c00c1ab Fix double login issue with eyezm 2014-07-07 17:48:33 -05:00
Isaac Connor 70471936a7 get rid of escapeSql and replace it's calls with new PDO-style calls to FetchOne FetchALl,e etc 2014-07-07 10:06:50 -04:00
Andrew Bauer 48d961082c Determine full path to arp 2014-07-05 11:11:36 -05:00
Andrew Bauer c2e2a12995 Merge pull request #406 from m-bene/focusPopup 
focus popup windows
 2014-07-04 13:00:45 -05:00
Andrew Bauer 9a0eb63df2 Merge pull request #415 from m-bene/selectSkin 
make skin selection persistent
 2014-07-04 12:57:37 -05:00
Andrew Bauer 5aad658262 Fixes errors when opening Filters (issue #34) 2014-07-04 11:00:00 -05:00
stevegilvarry a8d60aa727 Fixed missing $ on ARRAY(event[id]). Fixes #455 2014-07-02 23:58:44 +10:00
Isaac Connor 623837115b fix missing ARRAY() around params to dbFetchOne 2014-06-25 14:01:45 -04:00
Isaac Connor 5fac727c2f Users tab should always be available 2014-06-25 13:40:37 -04:00
Isaac Connor 11718f0559 The users tab should always be available. It is useful to configure users BEFORE turning on auth. 2014-06-25 13:39:31 -04:00
tim 8ac6ce17bc Fixed issue DateTime handling in filter queries that broke timeline view. 2014-06-15 13:05:25 -07:00
Kfir Itzhak 5fea101294 Merge pull request #421 from m-bene/ffmpegoptions 
Add optional options field for ffmpeg and VLC source types
 2014-05-18 18:07:42 +03:00
m-bene 82447ebb27 remove unwanted comment change 2014-05-17 22:05:57 +02:00
m-bene f62afdb8cc add select list for rtsp method for ffmpeg and libvlc 2014-05-17 20:41:22 +02:00
m-bene de107f77ba fix option help text for overlooked languages 2014-05-17 04:51:01 +02:00
m-bene 9a71a0068a add help window for ffmpeg/libvlc options 2014-05-17 04:33:33 +02:00
m-bene ceff5a98ea add generic Option field to ffmpeg and libvlc cameras 2014-05-05 13:29:12 +02:00
m-bene b197f985e0 make expiry date relative (~10years) 2014-05-01 09:53:45 +02:00
m-bene ed7ca66045 make skin selection cookie persistent 2014-05-01 09:37:39 +02:00
Isaac Connor 8da9383d5d use PDO style 2014-04-30 10:09:27 -04:00
Isaac Connor e94fca2778 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-04-30 10:01:29 -04:00
Isaac Connor b3226223f8 remove uses of dbEscape 2014-04-30 10:01:10 -04:00
m-bene 2881e6b643 focus popup windows 2014-04-26 04:07:33 +02:00
Kfir Itzhak 1f29aa432a Minor corrections to the cURL source type in the web interface 2014-04-23 12:12:41 +03:00
Kfir Itzhak 3cee6a133d Merge remote-tracking branch 'Sune1337/motion/FrameSkip' 
Conflicts:
	db/zm_update-1.27.1.sql
	web/lang/nl_nl.php
 2014-04-22 20:13:11 +03:00
Kyle Johnson fd4f77b145 Merge pull request #381 from m-bene/flatLayout2 
Fix window sizes and input field sizes for flat skin
 2014-04-18 09:40:00 -04:00
m-bene b56093a637 Fix window sizes and input field sizes for flat skin 2014-04-11 09:53:46 +02:00
m-bene f737af15b9 Fix reload loop on switching skins 2014-04-11 09:40:23 +02:00
Sune1337 6c637947e2 Ability to skip frames in motion detection. 
The reason for this is to make it possible to reduce CPU-load if split-second motion detection is not required.
 2014-04-10 14:59:34 +02:00
Kyle Johnson db5a8fe194 Merge pull request #375 from m-bene/flatLayout 
Fix small / cropped DRV controls in event view.  Fixes #356
 2014-04-09 16:45:15 -04:00
m-bene bd5e25644e same dvr controlls in event as in monitor 2014-04-09 20:19:23 +02:00
Andrew Bauer 35468af815 Merge pull request #338 from m-bene/extendPreclusive 
add feature to extend preclusive zone alarm state by x frames
 2014-04-08 08:04:37 -05:00
m-bene 9a714f8d6d Fix 'Undefined index: filter' php warnings for filter view when called without filter arguments 2014-04-07 16:11:48 +02:00
Andrew Bauer fec72f05d0 fix eyezm authentication issue 2014-03-25 18:48:20 -05:00
Isaac Connor d6a27b31e8 fix extra } 2014-03-24 13:44:06 -04:00
Isaac Connor 957d6f123f remaining conversions 2014-03-22 14:16:56 -04:00
Isaac Connor bfb52ab9aa fix groups 2014-03-21 23:10:13 -04:00