zoneminder

Commit Graph

Author	SHA1	Message	Date
Isaac Connor	405078686a	update getStreamSrc to take a hash instead of an array of thing=thing	2017-06-08 14:01:22 -04:00
Isaac Connor	4889f3d0e8	rework logic in GetStreamImg a bit. If no frame is specified, then we can use snapshot...otherwise it should do the frame image!	2017-05-31 20:54:34 -04:00
Isaac Connor	29bcab9204	fix Debug to Logger::Debug	2017-05-18 13:54:06 -04:00
Isaac Connor	dd75c4676b	trivial updates (#1887 ) * merge some trivial updates from storageareas * fix the code to do zm.conf.new	2017-05-16 14:16:32 -04:00
Matt N	33092e4022	Allow API authentication using the `auth` query parameter containing an auth. hash. (#1845 ) * Allow API authentication using the `auth` query parameter containing an auth. hash. Fixes #1827 The same auth. hash for zms is used here. This allows consumers to use the API without sending the password in the query string and not require forging logins via the login form. * Move logger.php's global Debug function to Logger::Debug to avoid polluting globals This avoids a conflict with CakePHP when logger.php gets included indrectly from API code. * Protect action=login when ZM_ENABLE_CSRF_MAGIC is enabled	2017-05-15 21:51:48 -04:00
Manojav Sridhar	f50c0e2096	fix missing isset check, caused number of Undefined Property warnings	2017-02-18 11:15:43 -05:00
Isaac Connor	f6ea52280a	Update Event object to @iconnor's latest which brings us a createListThumbnail function copied from includes/functions	2017-01-02 10:34:15 -05:00
klemens	0d549f1db3	spelling fixes	2016-12-29 10:31:05 +01:00
Isaac Connor	9312eed17f	Merge branch 'master' into disk_space_in_events	2016-11-22 10:58:24 -05:00
Isaac Connor	240336e3ec	silence error when Event has no StorageId set	2016-08-12 15:20:21 -04:00
Isaac Connor	cd43d1fa7a	Rough in Event disk space reporting	2016-07-19 17:34:01 -04:00
Isaac Connor	c050969141	Merge object model classes from storageareas	2016-05-05 15:33:28 -04:00

12 Commits