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

4145 Commits

Author SHA1 Message Date
Isaac Connor 33f361210a Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-11-25 14:29:28 -05:00
Isaac Connor 4c864aec35 fix saving groups 2014-11-25 14:29:15 -05:00
Isaac Connor 13ad5fc9b5 Merge pull request #596 from manupap1/debian_dep 
Fix package dependency on debian jessie
 2014-11-25 09:53:45 -05:00
Emmanuel Papin f901e73dfd libgcrypt20-dev added in Build-Depends 2014-11-25 11:10:12 +01:00
Emmanuel Papin c287f76511 Remove unneeded dependency 2014-11-25 10:45:04 +01:00
Emmanuel Papin 61118142b9 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into debian_dep 2014-11-25 10:29:28 +01:00
Andrew Bauer 4ac699c167 Merge pull request #594 from ndobbs/feature-ndobbs_selinux_rhel6_support 
updated local_zoneminder type extension file
 2014-11-24 17:46:55 -06:00
Nate Dobbs b81f87af69 updated local_zoneminder type extension file to support ZM running on CentOS/RHEL 6.x in SElinux ENFORCING mode 2014-11-24 17:36:47 -05:00
Andrew Bauer 4c353abecd Update zoneminder.cmake.el6.spec 2014-11-24 15:41:09 -06:00
Andrew Bauer 7c75867300 Update zoneminder.cmake.f20.spec 2014-11-24 15:40:45 -06:00
Emmanuel Papin fe5898c014 Deal with all libjpeg* libraries on debian 2014-11-24 22:22:57 +01:00
Isaac Connor c55c9a716c add libgnutls28-dev as an option to libgnutls-dev 
add the other libjpeg*-dev options, any of which should do
 2014-11-24 14:09:57 -05:00
Andrew Bauer 9d7f3c2026 Update zm.in 
The legacy sysv init script will not work with systemd.  This is by design.
 2014-11-23 11:09:52 -06:00
SteveGilvarry b04d904ac3 Final fixes for Options 2014-11-22 18:51:05 +11:00
SteveGilvarry 80368684a4 Version Update and menu fix 2014-11-22 14:05:19 +11: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
SteveGilvarry 48b1aafe85 Formatting as subsections 2014-11-22 00:15:35 +11:00
SteveGilvarry 37fbc47fd9 Options Documentation First draft 2014-11-22 00:06:30 +11:00
Emmanuel Papin 4e9c3494b8 Convert french lang file to UTF-8 2014-11-20 20:51:49 +01:00
Isaac Connor f954d4b034 add a changelog entry 2014-11-20 11:07:58 -05:00
Isaac Connor 9eda71570a merge the rest of my Digest-AUth fixes: This should solve #399 2014-11-20 10:44:31 -05:00
Isaac Connor 0b5a0df7dc implement http_Digest Auth, and improve it for rtsp 
Conflicts:
	src/zm_remote_camera_http.cpp
	src/zm_rtsp.cpp
 2014-11-20 10:33:58 -05:00
Emmanuel Papin 81f4c2aa10 Revert memory leak patch in Monitor class (break analysis) 2014-11-20 00:33:22 +01: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
hanzese 993a186d06 Update et_ee.php 
ZoneMinder Estonian Translation by Hannes
 2014-11-19 10:25:35 +02:00
SteveGilvarry 3bf481139b Updating Options documentation 2014-11-18 21:46:25 +11:00
SteveGilvarry 8e7a4bb7f3 Adding screenshots for Options and Monitors 2014-11-18 16:55:36 +11:00
hanzese db86ac7b40 Update et_ee.php 
ZoneMinder Estonian Translation by Hannes
 2014-11-17 18:06:37 +02:00
Isaac Connor 4f9a2e1689 update Depends to match ubuntu. 2014-11-17 09:17:03 -05:00
hanzese 79ca3dd736 Update et_ee.php 
ZoneMinder Estonian Translation
 2014-11-17 02:53:50 +02:00
Andrew Bauer 729d4dd9c4 Update README.md 2014-11-15 13:47:47 -06: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
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
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