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

4128 Commits

Author SHA1 Message Date
Kyle Johnson 055a494fe4 Add getDiskPercent function to the api 
Returns the amount of space used
 2014-11-21 22:15:32 +00:00
Kyle Johnson ffaa24d108 daemonCheck finds zmdc.pl via Configure::read 2014-11-21 21:42:21 +00:00
Kyle Johnson 0108f43cab Add function for making vars in zm.conf global in api 
This loops throgh zm.conf and sets each variable in it
as global in CakePHP via Configure::write.  The vars
can then later be read withing CakePHP via Configure::read
 2014-11-21 21:40:31 +00:00
Kyle Johnson 4da50a8199 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into bootstrap-skin 2014-11-21 21:06:32 +00:00
Kyle Johnson 403ece33bd Tell cmake to configure zm version and config path in cakephp 2014-11-21 21:04:46 +00:00
Kyle Johnson e541976b77 Grab system load from API and set with angular 2014-11-21 20:06:59 +00:00
Kyle Johnson 345f152181 Add function for returning system load via api 2014-11-21 19:49:03 +00:00
Isaac Connor 1a74a410c8 Merge pull request #589 from manupap1/fr_lang_fix 
Convert french lang file to UTF-8

Thanks again for your efforts!
 2014-11-21 09:05:46 -05:00
Emmanuel Papin 4e9c3494b8 Convert french lang file to UTF-8 2014-11-20 20:51:49 +01:00
Kyle Johnson f935fa6ca6 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into bootstrap-skin 2014-11-20 13:48:12 +00:00
Kyle Johnson 9dd1a2261f Output a real snapshot of the camera in console view 2014-11-20 13:47:41 +00:00
Kyle Johnson 2ae1880006 Initial commit of general purpose API event search 2014-11-20 13:46:49 +00:00
Kyle Johnson 4364c73143 Remake Options view with angular. Uses API. 2014-11-20 04:11:33 +00:00
Kyle Johnson ad65fa1820 Make Config table options available to angular 2014-11-20 04:10:01 +00:00
Kyle Johnson 92bfac0aad Add angular directive allowing elements to bind to html 2014-11-20 04:05:22 +00:00
Kyle Johnson 408c6111b8 Return specific configs as an HTML <form> in API 2014-11-20 04:04:23 +00:00
Kyle Johnson 4298d4a498 Fix <form> location in state.php 2014-11-20 03:40:15 +00:00
Andrew Bauer 83120e69b1 Merge pull request #584 from ZoneMinder/zmupdatefixes 
Zmupdatefixes
 2014-11-19 13:09:07 -06:00
Isaac Connor cc989dbe19 fix putting the mode back. I merged it to the wrong place 2014-11-19 13:54:10 -05:00
Isaac Connor f8dd2c6eaf Merge branch 'master' into controlversionfixes 2014-11-19 12:53:28 -05:00
Isaac Connor 793998484c Merge branch 'master' into zmupdatefixes 
Conflicts:
	scripts/zmupdate.pl.in
 2014-11-19 12:47:31 -05:00
Isaac Connor 790005c155 Include monitor name in log otput so we know which monitor we are talking about. This informaton is not included when the error occurs in zms. 2014-11-19 12:42:05 -05:00
Kyle Johnson c8a3cb9df9 Initial refactor of console view to use api & angular 
* Move eventCounts to the API and bind with angular
 * Display the console as a grid, rather than a table
 * Show only information we want to see
 2014-11-19 15:53:07 +00:00
Kyle Johnson a0f12575fe Add API function to return event counts for console view 2014-11-19 15:49:38 +00:00
Isaac Connor 4f9a2e1689 update Depends to match ubuntu. 2014-11-17 09:17:03 -05:00
Kyle Johnson 5eaedae973 Tell git to ignore cmake generated files 2014-11-16 01:14:20 +00:00
Kyle Johnson 64122b3b98 Set the logState in header via angular 2014-11-16 00:35:10 +00:00
Kyle Johnson 175e7d3e22 Initial commit of Host MVC. 
Used for daemonCheck, getLoad, etc
 2014-11-16 00:21:55 +00:00
Kyle Johnson f1a70076d0 Convert some of event view to angularjs 2014-11-15 23:51:31 +00:00
Kyle Johnson 5b4dfce34a Add Event controller and factory 2014-11-15 23:50:46 +00:00
Kyle Johnson 519a5e1612 Setup html5mode to enabled 2014-11-15 23:50:04 +00:00
Kyle Johnson 47770bffe4 Add <base> element to <head> so I can use $location.search 2014-11-15 23:49:18 +00:00
Kyle Johnson 1fc26c01ac Merge remote-tracking branch 'origin/master' into bootstrap-skin 2014-11-15 21:47:01 +00:00
Kyle Johnson 2db5d66134 Include state js and php in all pages. 
As we can now start / stop the software from any page, via a modal,
we need the state's php and js files to do so.
 2014-11-15 19:48:04 +00:00
Andrew Bauer 729d4dd9c4 Update README.md 2014-11-15 13:47:47 -06:00
Kyle Johnson f38a9c9f06 Add jquery 2014-11-15 19:46:34 +00:00
Kyle Johnson 36ebaaff33 Add HeaderController to the header nav 2014-11-15 19:45:18 +00:00
Andrew Bauer ef3f06bc62 Update README.md 2014-11-15 13:39:32 -06:00
Andrew Bauer 83026fba98 Update README.md 2014-11-15 13:38:51 -06:00
Kyle Johnson 58fbc6c833 Wrap pagination links in <li> instead of <p> 2014-11-15 19:38:45 +00:00
Kyle Johnson 4c0e2dc743 Include initial angularjs files 2014-11-15 19:34:00 +00:00
Andrew Bauer a9de2416b8 Update README.md 2014-11-15 13:19:02 -06:00
Andrew Bauer 32ee3e8431 Merge pull request #577 from knnniggett/zmeditconfigdata 
Add zmeditconfigdata.sh script to source
 2014-11-15 13:15:45 -06:00
Kyle Johnson d5181ff6d4 Merge branch 'api-updates' 2014-11-15 19:06: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