91 Commits

Author	SHA1	Message	Date
Andy Bauer	2dda2d9e1e	remove unneeded, empty files	2016-12-26 09:49:14 -06:00
Pliable Pixels	192d0dbb45	added TimeZone get API	2016-10-18 14:07:31 -04:00
Pliable Pixels	92d7cad5f1	enabled utf8	2016-09-21 11:53:34 -04:00
Pliable Pixels	1440dd9265	retab	2016-09-03 15:02:32 -04:00
Pliable Pixels	7bf0b3c423	readded forMonitor - removed by mistake	2016-09-03 14:51:24 -04:00
Pliable Pixels	9a4330eb59	#1537 Zones Controller not returning all zones	2016-09-03 14:46:47 -04:00
Isaac Connor	55f5db55dd	implement suggested code to stop the monitor when Function is set to None	2016-09-01 11:43:20 -04:00
Isaac Connor	b4aec41d3d	fix warnings and move User import up higher to where it needs to be	2016-06-21 09:09:58 -04:00
Isaac Connor	dbdd1ae51e	remove debug logging	2016-06-07 16:26:58 -04:00
Isaac Connor	f26c9168c4	if user=&pass= are in request, use them for auth	2016-06-07 16:25:35 -04:00
Andrew Bauer	ceaacf91bf	Merge pull request #1470 from connortechnology/api_improvements ... Api improvements	2016-05-25 12:45:03 -05:00
arjunrc	4018cab743	don't pass partial data to daemoncontrol	2016-05-19 14:53:16 -04:00
arjunrc	b513bcef82	icon's gonna kill me	2016-05-10 20:09:41 -04:00
arjunrc	af3cae578e	fixed verbose handling bug for status command on zmu	2016-05-10 20:07:28 -04:00
arjunrc	8d5f2a8e5d	added iconnor's change back	2016-05-10 19:17:09 -04:00
arjunrc	df830a5190	resolved merge conflicts	2016-05-10 19:15:00 -04:00
arjunrc	2888142e68	added status command to retrieve alarmed status of monitor in addition to on/of	2016-05-10 16:55:43 -04:00
Steve Gilvarry	b03d2660cb	Merge pull request #1455 from ZoneMinder/api_servers ... rough in Server object support	2016-05-10 08:00:58 +10:00
Joshua Ruehlig	e12160456b	Support user defined MySQL Port/Socket in API	2016-05-09 00:24:08 -07:00
Isaac Connor	966a9dcd8d	Merge pull request #1467 from ZoneMinder/api_fixes ... Don't pass request data as a monitor array to daemonControl	2016-05-07 18:25:35 -04:00
Isaac Connor	e35b0a1eb2	Merge pull request #1469 from pliablepixels/1468-api-consoleEvents-alarmedFrames ... added alarmed frames filter	2016-05-07 17:06:37 -04:00
arjunrc	be329e1e0d	switched to named param format, more flexible, in line with other APIs	2016-05-07 16:28:25 -04:00
arjunrc	8347b69b09	added alarmed frames filter	2016-05-07 14:26:09 -04:00
Isaac Connor	6d991a1c6c	Merge pull request #1466 from pliablepixels/1465-api-alarm-on-off ... added alarm enable/disable	2016-05-07 11:26:49 -04:00
arjunrc	6f9cc0f19f	to be safe, lets add system edit permissions, so rogue users can't turn alarms OFF	2016-05-07 11:01:03 -04:00
Isaac Connor	15977f1a3c	Don't pass request data as a monitor array to daemonControl	2016-05-07 10:56:38 -04:00
arjunrc	0280ae4dd5	added alarm enable/disable	2016-05-07 10:37:42 -04:00
Isaac Connor	01aa2c9319	change permissions to stream permissions for view	2016-05-02 19:48:24 -04:00
Isaac Connor	75f9fde920	rough in Server object support	2016-05-02 10:41:25 -04:00
Isaac Connor	ce69f24bdd	use zm.conf values for database connection	2016-04-30 08:11:39 -04:00
Isaac Connor	532fb77ecb	As well as writing zm.conf contents into the Configure object, define them, like we do in the regular UI. Also remove unneeded quotes	2016-04-30 08:09:56 -04:00
arjunrc	8a47241e18	address issue #1335	2016-03-12 08:07:25 -05:00
SteveGilvarry	b294f210dc	Update to CakePHP 2.8.0 copy in lib folder	2016-02-25 23:25:24 +11:00
arjunrc	6e606aa74b	removed issue #	2015-12-19 19:04:27 -05:00
arjunrc	38b4785557	PP - Gone,flitted away, Taken the starts from the night and sun, From the day! Gone, and a cloud in my heart. - Tennyson	2015-12-19 18:36:38 -05:00
arjunrc	c4461c328e	initial user role support	2015-12-19 17:45:03 -05:00
arjunrc	b4fdaa9b4d	initial user role support	2015-12-19 17:44:46 -05:00
arjunrc	e812398fb9	initial user role support	2015-12-19 17:44:39 -05:00
arjunrc	f56688e7c2	initial user role support	2015-12-19 17:44:16 -05:00
arjunrc	028c9b956c	check for opt_use_api, also pull in user roles support	2015-12-19 17:44:02 -05:00
Kyle Johnson	5add10289b	Merge pull request #1136 from pliablepixels/1135-events-API-prev-next ... added prev/next event ids	2015-11-16 09:23:36 -07:00
Pliable Pixels	7cbad44ae4	also return the prev and next events for the same monitor as the current event	2015-11-04 14:23:28 -05:00
Pliable Pixels	e3d06ca103	added prev/next event ids	2015-11-02 16:54:52 -05:00
Kyle Johnson	9c7a15daf7	use deleteAll() vs. delete() when deleting an Event's Frames	2015-09-30 13:53:23 -06:00
Kyle Johnson	1937814c82	Update API Frame Model to new Primary Key. Fixes #663	2015-09-29 14:39:24 -06:00
Isaac Connor	d39f57c4ff	Merge pull request #1073 from pliablepixels/1072-events-API-delete-fix ... Delete fixes for Events	2015-09-28 14:46:01 -04:00
Pliable Pixels	a00fed480d	Delete fixes for Events	2015-09-28 14:41:36 -04:00
Pliable Pixels	ee78ae5c49	restart monitor when edited via APIs	2015-09-28 09:31:57 -04:00
Andy Bauer	827eebd38c	remove core.php, modify core.php.default	2015-08-29 14:53:39 -05:00
Isaac Connor	22275e661c	Tell cake to use the same session id as classic ui	2015-08-21 09:03:44 -04:00