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

231 Commits

Author SHA1 Message Date
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
tikismoke 52d3fdf471 Update README.md 
little correction
 2015-08-21 11:29:35 +02:00
Andrew Bauer 68adcc9e67 Merge branch 'large-timestamp' of https://github.com/schrorg/ZoneMinder into schrorg-large-timestamp 
Conflicts:
	CMakeLists.txt
	configure.ac
	src/zm_monitor.cpp
	src/zm_monitor.h
	version
 2015-08-18 14:07:38 -05:00
Andrew Bauer 66ec84fdea Merge pull request #1008 from pliablepixels/993-API-Auth 
Included logic to not enforce authentication in API layer if ZM auth is off
 2015-08-11 14:51:02 -05:00
Pliable Pixels a64f7c0036 Included logic to not enforce authentication in API layer if ZM_OPT_USE_AUTH is disabled 
If ZM auth is off, API won't work. Changed this to make sure API disables auth if ZM disables auth
 2015-08-11 14:47:49 -04:00
Isaac Connor 3e5170678e Merge pull request #1006 from pliablepixels/993-API-Auth 
I was using the wrong field to check for portal authentication
 2015-08-10 15:58:50 -04:00
Pliable Pixels f7025aaa26 I was using the wrong field to check for portal authentication 
Should be user.Username instead of username
 2015-08-10 15:55:44 -04:00
Pliable Pixels 2b0a975fef Bumped up # of events per API to 100 instead of 25 2015-08-07 16:25:48 -04:00
Pliable Pixels 38799050ef APIs will be served only if user is logged into the ZM portal 2015-08-07 16:14:02 -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
Isaac Connor fadfc01d81 TUrn on sessions and auth 2015-06-30 11:27:33 -04:00
Isaac Connor e0d2a14f3c add in User Model/Controller and rough in auth. 2015-06-30 11:27:17 -04:00
Andrew Bauer 1b2f214340 Dumb down Crud from 4.0 -> 3.0.10 2015-06-30 10:26:29 -05:00
Isaac Connor ba3eaf6457 Tell cake to use the same session id as classic ui 2015-06-30 11:24:14 -04: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 efbbcadc7dad9aa52a7aab0483546eab48840ae6.
 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