35 Commits

Author	SHA1	Message	Date
Isaac Connor	fcc507b93e	whitespace/tabs updates	2017-01-08 16:12:19 -05:00
Isaac Connor	2901043bc9	re-organize streams to support source=event&mode=single from zms.	2015-07-30 14:16:04 -04:00
Pliable Pixels	e332fc36a9	Fixed Configs API to return all values	2015-07-21 13:28:37 -04:00
Isaac Connor	ace8597b8d	Merge branch 'master' into multi-server	2015-07-14 16:10:51 -04:00
Pliable Pixels	444d978c81	Added API routing	2015-07-13 18:55:28 +00:00
Isaac Connor	04366e752a	add Servers to options, a server editing popup and a server selection to monitors	2015-07-09 11:41:46 -04:00
Isaac Connor	42ac3ceb3b	Merge branch 'master' of github.com:ZoneMinder/ZoneMinder	2015-07-09 11:00:05 -04:00
Isaac Connor	51631b84b4	cleanup generated files	2015-07-09 10:59:45 -04:00
Andrew Bauer	8406818b00	Merge pull request #921 from pliablepixels/master ... Added "RewriteBase /zm/api" for API routing	2015-07-05 08:34:28 -05:00
Pliable Pixels	3a9c941213	Added "RewriteBase /zm/api" for API routing	2015-07-05 08:59:07 -04:00
Andrew Bauer	1b2f214340	Dumb down Crud from 4.0 -> 3.0.10	2015-06-30 10:26:29 -05:00
Isaac Connor	4be341986f	Merge pull request #897 from pliablepixels/881-api-branch ... Fixed events API to remove thumbnail code	2015-06-22 13:01:15 -04:00
Pliable Pixels	719a903d43	Fixed events API to remove thumbnail code	2015-06-20 20:08:10 -04:00
Pliable Pixels	138e931e24	Fixed events API to remove thumbnail code	2015-06-20 19:57:55 -04:00
pliablepixels	7112001b64	getVersion.json now returns both ZM version and API version	2015-06-13 16:33:15 +00:00
pliablepixels	12ba217de0	Added API version in addition to ZM version, also added loadConfig code that was there in the angular-ui branch but not merged to master	2015-06-13 16:32:37 +00:00
Isaac Connor	bda35ed4d6	fix bootstrap.ini substitution	2015-06-12 11:12:58 -04:00
Andrew Bauer	d915d859ed	Convert Crud to submodule	2015-06-11 11:56:39 -05:00
Ubuntu	dd9603f70f	Merged Angular UI branch API to master	2015-06-11 02:58:58 +00:00
Kyle Johnson	35530c627a	Initial commit of Logs MVC	2014-11-15 19:03:40 +00:00
Kyle Johnson	0129ca5f74	Rework the ConfigParser component.	2014-11-15 19:03:10 +00:00
Kyle Johnson	e7d726bf75	Don't print out the Config string to the file system.	2014-11-15 19:02:54 +00:00
Kyle Johnson	fcaa67e3c3	Slight refactor of ConfigParser Component. Needs more work.	2014-11-15 19:02:18 +00:00
Kyle Johnson	cf3d0f962c	Add view for Configs Edit	2014-11-15 19:02:03 +00:00
Kyle Johnson	9f80a7d5f5	Show a list of Config Key:Value pairs	2014-11-15 19:01:32 +00:00
Kyle Johnson	9268c503af	Do not display the "hidden" config category	2014-11-15 19:01:19 +00:00
Kyle Johnson	b9f54056da	Add component for dumping Config table as HTML	2014-11-15 18:59:58 +00:00
Kyle Johnson	de631075d3	Return possible source types ni DB via API	2014-11-15 18:59:24 +00:00
Kyle Johnson	0d57306790	Find category configs only when $category is not null. API	2014-11-15 18:58:58 +00:00
Kyle Johnson	9f150c4e46	Revert "Find category configs only when $category is not null. API" ... This reverts commit efbbcadc7d.	2014-11-15 18:58:51 +00:00
Kyle Johnson	b88febeaee	Find category configs only when $category is not null. API	2014-11-15 18:58:43 +00:00
Kyle Johnson	0a7ba112ab	API support for querying config categories. ... Either return a list of distinct categories, or all configs under a certain category	2014-11-15 18:55:20 +00:00
Kfir Itzhak	afd4e451fd	Add the web/api folder to cmake	2014-04-30 12:16:46 +03:00
Kyle Johnson	40e929e7a6	Changed the API readme to be ZoneMinder-relevant	2014-04-29 20:49:54 +00:00
Kyle Johnson	f1f3de6d7d	Moved the api to underneath the web directory	2014-04-29 20:41:04 +00:00