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

11041 Commits

Author SHA1 Message Date
Andy Bauer f9b7f931c9 upgrade lib folder to cakephp 2.10.8 2018-03-17 20:24:15 -05:00
Isaac Connor 4bb26519f6 allow errors, and add a missing fi 2018-03-16 11:59:29 -04:00
Isaac Connor ea38f7cca4 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-03-15 11:43:15 -04:00
Isaac Connor 27736fb5d9 Merge ../ZoneMinder.master into storageareas 2018-03-15 11:04:41 -04:00
Isaac Connor d82d2e7765 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-03-14 10:44:57 -04:00
Isaac Connor a73a7b438c whitespace to google code style specs. 2 spaces 2018-03-14 10:44:43 -04:00
Andrew Bauer 280dd8b04c
Merge pull request #2063 from ZoneMinder/fix_2061 
Use Event.Width and Event.Height instead of Monitor.Width and Monitor…
 2018-03-14 09:37:34 -05:00
Isaac Connor 79b10b0166 Use Event.Width and Event.Height instead of Monitor.Width and Monitor.Height when generating video of an event. 2018-03-14 10:09:31 -04:00
mcdamo aa0a831223 Update Host.php (#2062) 
Remove whitespace causing problems with session authentication
 2018-03-13 22:28:38 -04:00
Isaac Connor 6f3d16fe10 label_format can be null 2018-03-13 12:06:03 -07:00
Isaac Connor cefd00d1ea load User and Pass as well 2018-03-13 14:50:41 -04:00
Andy Bauer a786e520c0 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder 2018-03-13 09:30:25 -05:00
Andy Bauer 9c8ad35e33 Merge branch 'MTres19-ubuntu_bionic_v2' 2018-03-13 09:29:11 -05:00
Andy Bauer 00ab9b4c03 merge proposed changes in ubuntu1804 folder -> ubuntu1604 folder instead 2018-03-13 09:28:11 -05:00
Andy Bauer 389ca9e291 Merge branch 'ubuntu_bionic_v2' of https://github.com/MTres19/zoneminder into MTres19-ubuntu_bionic_v2 2018-03-13 09:27:28 -05:00
Pliable Pixels 704ccaee73 2059 alarm cause (#2060) 
* added alarm_cause as a test

* initial attempt to integrate with notes

* testing sizeof

* add zone labels

* fixed typo

* fixed typo

* comments and formatting

* Downgraded invalid attribute to error

* Removed Error downgrade. Instead do a undefined check on field params

* Added help text
 2018-03-12 19:38:12 -04:00
Andrew Bauer 16a2c173cb
fix Column 'Method' cannot be null 2018-03-10 20:29:25 -06:00
Andrew Bauer 0df59c26b8
fix typo 
Fix unable to enable camera
 2018-03-10 19:48:53 -06:00
Isaac Connor fa01dbf6af use parent's new and AUTOLOAD methods 2018-03-09 09:19:26 -05:00
Isaac Connor 7fb1c8921b reorder functions to put them in a better order 2018-03-09 07:50:47 -05:00
Isaac Connor d1837a96b4 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-03-09 07:25:28 -05:00
Isaac Connor 56b2787907 reorder variables to match init order in constructor 2018-03-09 07:24:53 -05:00
Isaac Connor dcf7c4fdde rework loading Monitor using consistent db query 2018-03-09 07:23:40 -05:00
Isaac Connor d777f6104f add a method to access the underlying MYSQL_ROW 2018-03-09 07:23:14 -05:00
Isaac Connor a1213142df whitespace 2018-03-09 07:22:59 -05:00
Andrew Bauer 0d9f5b73c8
Update dedicateddrive.rst 2018-03-06 20:18:48 -06:00
Andrew Bauer b981c058d3
Update dedicateddrive.rst 2018-03-06 20:14:28 -06:00
Andrew Bauer a380f1f1a4
fix typo in url 2018-03-06 20:11:57 -06:00
Andrew Bauer 2a589b5111
Update index.rst 2018-03-06 20:05:51 -06:00
Andrew Bauer 7e345db0aa add dedicated drive to readthedocs 2018-03-06 20:04:12 -06:00
Matthew Trescott ee146acf07 Remove obsolete symlink handling, update README.Debian 2018-03-06 20:35:41 -05:00
Matthew Trescott 4c44c32a62 Allow db username/password setting in conf.d 2018-03-06 19:23:01 -05:00
Andy Bauer d1f9fb9a37 Merge branch 'habibapp1365-patch-3' 2018-03-06 11:38:17 -06:00
Andy Bauer b41363fd60 Merge branch 'patch-3' of https://github.com/habibapp1365/zoneminder into habibapp1365-patch-3 2018-03-06 11:37:49 -06:00
Isaac Connor b4c13d56d6 Merge ../ZoneMinder.master into storageareas 2018-03-06 12:29:59 -05:00
habibapp1365 80116aa44c
Update video.php 2018-03-06 20:12:47 +03:30
habibapp1365 497114e8e1
Update video.php 2018-03-06 20:11:02 +03:30
habibapp1365 aa2134bde4
Update zm_create.sql.in 2018-03-06 19:59:06 +03:30
habibapp1365 8a6b57c1a0
Update video.php 2018-03-06 19:54:24 +03:30
habibapp1365 7a589398a7
Update video.php 2018-03-06 19:53:26 +03:30
habibapp1365 661827a7b4
Update video.php 2018-03-06 19:52:01 +03:30
habibapp1365 afff20a06b
Update video.php 2018-03-06 19:48:01 +03:30
habibapp1365 50a63c7899
Create DCS3415.pm 
D-Link DCS-3415 IP Control Protocol
 2018-03-06 11:31:39 +03:30
Matthew Trescott 7a9350c44f Quick fix for mistake 2018-03-05 20:24:40 -05:00
Matthew Trescott 6194977697 Revamp postinst to also support MariaDB and use systemd to check service status, not /etc/init.d. 2018-03-05 19:38:42 -05:00
Matthew Trescott 17c5028312 Don't install init.d script 
Despite not being specified in the --with parameter to dh, dh_installinit still seems to be run. Since most distros use systemd now, it seems like a bad idea to install services to /etc/init.d.
 2018-03-05 19:17:11 -05:00
Matthew Trescott c750db91b5 Make sure a2enmod is available before calling it in postinst 
The user may be using zm with e.g. nginx since apache is not a dependency.
 2018-03-05 19:11:53 -05:00
Matthew Trescott 49a2065f34 Allow packaging with libx264-152, allow packaging with MariaDB instead of MySQL 2018-03-05 19:06:38 -05:00
Matthew Trescott 3475bfb672 Fix compilation on Ubuntu 18.04 
I'm not entirely sure why this wasn't a problem with icconor's source package on launchpad. But, even unfamiliar as I am with CMake, it doesn't make sense to me to throw a fatal error by checking for a header that is already known to be unavailable.
 2018-03-05 18:46:52 -05:00
Matthew Trescott d13335358f Copy ubuntu1604 to ubuntu1804 2018-03-05 18:39:29 -05:00