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

899 Commits

Author SHA1 Message Date
Isaac Connor 859d361373 turn off libswresample 2016-11-27 17:06:12 -05:00
Isaac Connor 921205216d turn off libswresample 2016-11-27 17:00:16 -05:00
Andy Bauer 9a694541ba repm specfile maintenance: retire fc23, add fc25 2016-11-26 08:20:03 -06:00
Andy Bauer bf85791e4c improvements to fedora nginx rpm support 2016-11-22 13:02:02 -06:00
Andy Bauer c2b1638a3e rpm changes - set TZ var in systemd service file 2016-11-22 12:43:56 -06:00
Andy Bauer a96ab604ec rpm changes - set TZ var in systemd service file 2016-11-22 12:42:48 -06:00
Andrew Bauer 71898df756 Merge pull request #1697 from connortechnology/apache_indexes 
Apache indexes
 2016-11-22 12:33:55 -06:00
Isaac Connor b3f2b13718 Merge branch 'apache_indexes' into storageareas 2016-11-22 13:29:30 -05:00
Isaac Connor 9cc1b23460 put back mizzing F 2016-11-22 13:25:52 -05:00
Isaac Connor b059ca83da Rremove Index from options to prevent directory listings 2016-11-22 13:25:52 -05:00
Isaac Connor aa0a4d1f5a put back mizzing F 2016-11-22 13:13:09 -05:00
Isaac Connor e8da04df56 Merge branch 'apache_indexes' into storageareas 2016-11-22 13:09:44 -05:00
Isaac Connor cf49a234b3 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-11-22 13:05:03 -05:00
Andrew Bauer b67450b8ae Update zoneminder.php-fpm.conf.in 2016-11-17 19:48:35 -06:00
Isaac Connor c360e27b02 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-11-17 13:13:47 -05:00
Andrew Bauer bcc5a57b02 prelimniary support for nginx on fedora 2016-11-15 18:34:25 -06:00
Isaac Connor 2df6cd17fa add libswresample to build depends 2016-11-11 22:30:35 -05:00
Isaac Connor 6361f14387 Rremove Index from options to prevent directory listings 2016-11-08 09:30:24 -05:00
Isaac Connor a6c77f08d2 use generic libboost-dev 2016-10-02 15:22:52 -04:00
Isaac Connor 056e560b70 Merge ../ZoneMinder.master into storageareas 2016-10-02 12:25:51 -04:00
Isaac Connor 07d6e1303b Merge branch 'compress_logs' into storageareas 2016-10-02 12:22:46 -04:00
Isaac Connor 9e3f6226ed add compress and delaycompress to the zoneminder logrotate settings 2016-10-02 10:05:07 -04:00
Isaac Connor f09c6c92e8 blah 2016-09-30 12:22:35 -04:00
Isaac Connor e11ded83ba get rid of watch: 2016-09-30 12:15:23 -04:00
Isaac Connor bf013cd88e remove libswsresample 2016-09-30 11:58:55 -04:00
Isaac Connor 53d3e063e8 smal re-order 2016-09-30 09:35:52 -04:00
Isaac Connor 603d903297 add an environment setting for TZ which eliminates a stat on /etc/locatime on every log line 2016-09-29 14:24:49 -04:00
Isaac Connor 3dfe1185ff add ffmpeg as option to libav-tols 2016-09-13 10:11:50 -04:00
Andy Bauer 4895942308 update fedora rpm readme 2016-08-16 09:49:45 -05:00
Isaac Connor 1058796374 add an echo to tell us that updating is done and we are trying to start. 2016-08-12 10:04:35 -04:00
Isaac Connor bdcc53d309 add an echo to tell us that updating is done and we are trying to start. 2016-08-12 10:04:10 -04:00
Isaac Connor c1d2407ed3 add an echo to tell us that updating is done and we are trying to start. 2016-08-12 10:02:15 -04:00
Isaac Connor 6b70ff964b fix path in cake api cleanup rules 2016-08-10 09:06:15 -04:00
Andrew Bauer 6c8001f362 Merge pull request #1549 from SteveGilvarry/initd_sql_wait 
Implement suggested wait for MySQL start
 2016-08-06 09:14:58 -05:00
Andrew Bauer 004b651d61 RPM specfile config change 
use make macros, rather than hard coded values
 2016-07-31 15:06:39 -05:00
Andrew Bauer 3c6692d0d5 RPM specfile config change 
fix logrotate script
 2016-07-31 07:29:37 -05:00
Andrew Bauer 477c02382b Update CMakeLists.txt 
Minor change for fedora rpmbuild
 2016-07-06 19:06:28 -05:00
Andrew Bauer 1f060f1938 Update zoneminder.init 
Remove my initials
 2016-07-05 11:35:08 -05:00
Steve Gilvarry 1f53377d8a Implement suggested wait for MySQL start 2016-07-05 07:28:52 +10:00
Andy Bauer 980d3f6e7f rpm housecleaning, change the way jscalendar is installed 2016-07-03 11:34:35 -05:00
Andrew Bauer f3583e5707 rpm specfile - add support for f24, remove support for f22 2016-06-24 15:39:57 -05:00
Andy Bauer 58e1a9ac4a rpm README changes 2016-06-01 07:30:41 -05:00
Disassembler 8eee25795a Remove deprecated register_globals from Apache/PHP configs 2016-05-30 14:02:46 +02:00
Isaac Connor b3fd156c11 add boost to build depends 2016-05-25 20:01:42 -04:00
Isaac Connor abd43bdc9f Merge ../ZoneMinder.master into storageareas 2016-09-29 14:25:11 -04:00
Isaac Connor f9fd715657 Merge branch 'master' into storageareas 2016-09-29 14:25:02 -04:00
Isaac Connor f1012f60ec add libswresample to build depends 2016-09-29 12:31:02 -04:00
Isaac Connor 441020e8b8 fix_type 2016-09-29 10:49:40 -04:00
Isaac Connor ce2c52c07d allow libavdevice55 and 57 2016-09-27 16:15:24 -04:00
Isaac Connor da5bad7ec2 Merge ../ZoneMinder.connortechnology into storageareas 2016-09-27 15:09:14 -04:00
Isaac Connor 24e33fec7f allow libvlccore8 2016-09-27 15:08:00 -04:00
Isaac Connor 730d7a648d add -f to rm 2016-09-27 14:15:38 -04:00
Isaac Connor ee93424bf9 update jpeh deps to match official debian repo 2016-09-27 12:33:50 -04:00
Isaac Connor a03d2a393f add ffmpeg as an option to libav-tools 2016-09-20 13:22:49 -04:00
Isaac Connor 2b4bad86cb Merge branch 'master' into storageareas 2016-09-13 10:21:10 -04:00
Isaac Connor 2bc5742aec Merge branch 'feature-h264-videostorage' into storageareas 2016-09-13 09:53:39 -04:00
Isaac Connor fb35f5c48a Merge ../ZoneMinder.master into feature-h264-videostorage 2016-08-31 10:58:19 -04:00
Isaac Connor eafe3d7748 Merge branch 'master' into storageareas 2016-08-17 10:31:55 -04:00
Isaac Connor b36694ad8b Merge branch 'master' into storageareas 2016-08-12 10:04:52 -04:00
Steve Gilvarry 5d8159462c Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-08-11 00:51:46 +10:00
Isaac Connor 2451768295 Merge branch 'master' into storageareas 2016-08-08 18:08:46 -04:00
Steve Gilvarry ea1ae815f1 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-08-05 23:03:06 +10:00
Isaac Connor 208337635a Merge branch 'master' into storageareas 2016-08-01 19:30:01 -04:00
Steve Gilvarry 3543c37f5e Add libx264-dev and libmp4v2-dev to build requires to save hassle of 
ensuring they are installed before build.
 2016-07-31 08:24:52 +10:00
Isaac Connor a30610fbda Merge branch 'master' into storageareas 2016-07-12 10:31:10 -04:00
Isaac Connor b8c406f969 Merge branch 'master' into storageareas 2016-06-03 09:32:55 -04:00
Isaac Connor e62ea454ba Merge branch 'master' into storageareas 2016-05-17 10:48:52 -04:00
Isaac Connor 09e4aca0be add libdata-uuid-perl to debian/ubuntu dependencies 2016-05-17 09:26:36 -04:00
Isaac Connor 660ce5bf8c Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-05-13 10:12:51 -04:00
Isaac Connor 532dc98e9e fix zms 2016-05-11 11:38:53 -04:00
Isaac Connor b44cee4a81 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-05-11 09:16:20 -04:00
Isaac Connor cfd986de44 Merge branch 'master' into storageareas 2016-05-10 08:43:46 -04:00
Isaac Connor 4d20d35f8d add back missing depends for perl modules which are needed both for building and installing 2016-05-10 08:43:38 -04:00
Isaac Connor f609b838cd Merge branch 'master' into storageareas 2016-05-09 21:34:25 -04:00
Isaac Connor 5566d1881d add perl dbd mysql to build depends. Seems to need it. 2016-05-09 21:34:12 -04:00
Isaac Connor 566f18c9ae bump 2016-05-09 21:09:43 -04:00
Isaac Connor b88861e145 add back ffmpeg libs 2016-05-09 19:42:14 -04:00
Isaac Connor beebe74e7b Merge branch 'merge_db_connects' into storageareas 2016-05-09 12:26:17 -04:00
Isaac Connor 5b8f713037 fix libavutils -> libavutil 2016-05-07 11:28:53 -04:00
Isaac Connor 5158bbc670 add non-ffmpeg versions of libraries to depends list. ubunutu1604 doesn't seem to list them with the ffmpeg specification 2016-05-07 09:43:30 -04:00
Isaac Connor f9a24d7171 bump today's release 2016-05-05 14:51:57 -04:00
Isaac Connor 79572270d3 bump version 2016-05-02 10:46:23 -04:00
Isaac Connor 00f38cdd1b version bump 2016-05-02 10:39:41 -04:00
Steve Gilvarry 97a4cf0852 Add the changes...doh 2016-05-01 15:06:45 +10:00
Steve Gilvarry d7f7a0f074 Rename ubuntu1504, which is unsupported, to ubuntu 1604. Fix control file 
to current libav packages and php virtual packages. Update debian build
script to use new folder for any non-trusty build.
 2016-05-01 13:46:09 +10:00
Isaac Connor d06a0cf2a4 2016042801 build 2016-04-28 12:58:09 -04:00
Steve Gilvarry 6549f7bf29 Merge pull request #1403 from ZoneMinder/fix_grant 
Fix grant
 2016-04-28 21:49:21 +10:00
Isaac Connor 386afc3546 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-04-26 20:02:04 -04:00
Isaac Connor 6a31966781 shift to match debian 2016-04-22 13:35:20 -04:00
Isaac Connor 8b96872efe shoudl be php-mysql for php7 2016-04-20 15:04:50 -04:00
Isaac Connor e218e91e24 add php7 versions for 1604 2016-04-20 14:58:18 -04:00
Isaac Connor c626baae14 Merge branch 'fix_grant' into storageareas 2016-04-20 14:39:06 -04:00
Isaac Connor 02a56b811b Don't be recursive when chowning /var/cache/zoneminder 2016-04-20 14:38:51 -04:00
Isaac Connor 060df90ff3 bump versions 2016-04-20 09:38:07 -04:00
Isaac Connor 7e1a80658b Merge branch 'master' into storageareas 2016-04-17 09:30:33 -04:00
Isaac Connor d424a297c4 need php5-gd 2016-04-17 09:29:55 -04:00
Isaac Connor 3f27f4893c Merge branch 'fix_grant' into storageareas 2016-04-15 12:55:13 -04:00
Isaac Connor 78c6e14e0c Merge branch 'master' into storageareas 2016-04-09 14:52:28 -04:00
Andy Bauer dafdf1a289 rpm specfile changes 2016-04-08 19:22:27 -05:00
Isaac Connor e473839704 substitute ZM_DB_NAME,ZM_DB_USER and ZM_DB_PASS from zm.conf for defaults 2016-04-06 15:50:51 -04:00
Isaac Connor 3dd010b40a User and and instead of defaults 2016-04-06 15:44:56 -04:00
Isaac Connor 6cdbcfc9e6 add back identified by 2016-04-06 13:55:18 -04:00
Isaac Connor 6199a54838 more work, check for local db, check for existence of mysql, sync up between debian ubuntu1204 ubuntu1504 2016-04-06 13:45:46 -04:00
Isaac Connor 699b6458d5 bring up to date with debian postinst. Will not install the db, create the user and will run zmupdate. 2016-04-06 13:08:30 -04:00
Isaac Connor cf76360ecb bring up to date with the one in debian 2016-04-06 13:03:24 -04:00
Isaac Connor fb05e1baad grant requires rights regardless of password 2016-04-06 13:01:20 -04:00
Isaac Connor 59a8b37df2 Merge branch 'master' into storageareas 2016-04-06 11:47:20 -04:00
Isaac Connor 765f79a87f Merge branch 'icon_video' into storageareas 2016-04-06 11:16:38 -04:00
Isaac Connor 3e5a4b6481 remove autotools builds, replace them with cmake versions 2016-04-06 08:43:20 -04:00
Isaac Connor 9a795432cf merge all the commits from the messed up iconnor_video branch 2016-04-05 17:14:46 -04:00
Isaac Connor 60642c1fff Merge branch 'iconnor_video' into storageareas 2016-04-05 12:32:33 -04:00
Isaac Connor f73d8be765 Merge branch 'master' into feature-h264-videostorage 2016-04-05 09:43:34 -04:00
Isaac Connor 238a25a302 Merge branch 'master' into iconnor_video 2016-04-05 09:38:59 -04:00
Isaac Connor 0f1a530891 ciontrol files need spaces on multi-line lines 2016-04-05 09:03:37 -04:00
SteveGilvarry 4d7ded5ef0 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	configure.ac
	src/Makefile.am
	web/js/Makefile.am
 2016-04-05 22:06:14 +10:00
Andy Bauer 7ff8d36598 Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation 2016-04-04 20:44:53 -05:00
Isaac Connor 82b32578ec Merge branch 'master' into iconnor_video 2016-04-01 12:54:09 -04:00
Isaac Connor abcf48b65c Merge branch 'master' into feature-h264-videostorage 2016-04-01 08:53:45 -04:00
Isaac Connor 56d95bb949 Merge branch 'iconnor_video' into storageareas 2016-03-31 14:02:56 -04:00
Isaac Connor 74301b3ff3 Add the dependencies for libmp4v2 2016-03-31 11:53:36 -04:00
Isaac Connor c9a1a9020d Merge h264 2016-03-31 11:03:36 -04:00
Isaac Connor e5a36c02bd Merge remote-tracking branch 'origin/master' into video_remote 2016-03-30 16:55:24 -04:00
Isaac Connor 55e237fd3f tabs to spaces, add back perl modules to Builds-Depends 2016-03-30 11:10:54 -04:00
Isaac Connor ea49dc20d1 Merge branch 'master' into storageareas 2016-03-30 10:58:07 -04:00
Isaac Connor b81395843c fix spacing in control file 2016-03-30 10:56:10 -04:00
Isaac Connor f0a307e082 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 
Conflicts:
	distros/ubuntu1504_cmake/control
 2016-03-29 11:53:17 -04:00
Isaac Connor e4d0f2ffda fixup depends 2016-03-29 11:50:51 -04:00
Isaac Connor 7f34a0df37 Remove deprecated --enable-crashtrace 2016-03-29 11:48:30 -04:00
Isaac Connor 3a8352eb6b Merge branch 'master' into storageareas 2016-03-21 10:25:03 -04:00
Jon Burgess 06e04127d6 Fix spelling in other README files as well 2016-03-18 23:27:43 +00:00
Jon Burgess 94057a94ff Fix spelling of 'environment' 2016-03-18 22:42:34 +00:00
Isaac Connor 688dd67697 Merge branch 'add_onvif_deps' into storageareas 2016-03-09 11:18:35 -05:00
Isaac Connor ee0c134a9b need spaces at beginning of lien 2016-03-09 11:18:27 -05:00
Isaac Connor 740dc12f7c remove extra comma 2016-03-09 11:17:50 -05:00
SteveGilvarry 24ebc33ea4 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-03-09 20:54:11 +11:00
Isaac Connor 9647a680f6 Merge branch 'add_onvif_deps' into storageareas 2016-03-08 16:06:30 -05:00
Isaac Connor 094b041c43 There must be spaces before the comma 2016-03-08 16:06:16 -05:00
Isaac Connor f8582ad9b6 add libsys-cpu-perl and libsys-meminfo-perl 2016-03-08 15:56:26 -05:00
Isaac Connor c27387610c add libsys-cpu-perl and libsys-meminfo-perl 2016-03-08 15:56:17 -05:00
Isaac Connor b0835660b1 add libsys-cpu-perl and libsys-meminfo-perl 2016-03-08 15:56:08 -05:00
Isaac Connor 12a277912e add libsys-cpu-perl and libsys-meminfo-perl 2016-03-08 15:56:01 -05:00
Isaac Connor cf1d475dbb add libsys-cpu-perl and libsys-meminfo-perl 2016-03-08 15:55:56 -05:00
Isaac Connor b9996b4fc0 add libsys-cpu-perl and libsys-meminfo-perl 2016-03-08 15:55:37 -05:00
Isaac Connor cfbf2cced1 add libsys-cpu-perl and libsys-meminfo-perl 2016-03-08 15:55:29 -05:00
Isaac Connor 455c268a0c add libsys-cpu-perl and libsys-meminfo-perl 2016-03-08 15:55:11 -05:00
Isaac Connor 172b687ab3 Merge branch 'add_onvif_deps' into storageareas 2016-03-07 22:18:39 -05:00
Isaac Connor 97249110a4 must still support libgnutls28 for raspbian 2016-03-07 22:18:22 -05:00
Isaac Connor 98b3b92bbf Merge branch 'add_onvif_deps' into storageareas 2016-03-07 21:54:25 -05:00
Isaac Connor ef9f218c77 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-03-07 21:52:42 -05:00
Isaac Connor 0e8fc7953d Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-03-07 21:46:10 -05:00
Isaac Connor 30ffae5bc1 Merge branch 'master' into storageareas 2016-03-07 21:42:06 -05:00
Isaac Connor 9abcdc76c6 Merge branch 'master' into add_onvif_deps 2016-03-07 21:27:47 -05:00
Andrew Bauer de85e18829 rpm specfile changes for 1.30.0 2016-03-03 08:33:49 -06:00
Isaac Connor 3340f9e375 split into multiple lines and add onvif deps 2016-03-03 09:01:26 -05:00
Isaac Connor 5e617753e5 split into multiple lines and add onvif deps 2016-03-03 09:01:15 -05:00
Isaac Connor 4f4e65f86c split into multiple lines and add onvif deps 2016-03-03 09:00:08 -05:00
Isaac Connor 3c9173fa5c split into multiple lines and add onvif deps 2016-03-03 08:59:11 -05:00
Isaac Connor 41db18a8c6 split into multiple lines and add onvif deps 2016-03-03 08:59:03 -05:00
Isaac Connor 61ffae79d1 split into multiple lines and add onvif deps 2016-03-03 08:58:53 -05:00
Isaac Connor d4ed493333 add onvif dependencies and cleanup build-depends 2016-03-02 10:56:07 -05:00
SteveGilvarry 3ce620eb89 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-02-27 19:46:56 +11:00
SteveGilvarry 0277a66700 Remove eyezm from distros and Cmake. 
Conflicts:
	distros/debian8/control
 2016-02-26 22:41:27 +11:00
Isaac Connor 90dd078c22 bump release 2016-02-22 09:14:57 -05:00
Isaac Connor e9be186e6f changelog 2016-02-19 10:50:43 -05:00
Isaac Connor b3f5c10591 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-02-16 08:59:56 -05:00
Isaac Connor 292e3a141f Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-02-12 13:53:34 -05:00
Isaac Connor 5da8df45a7 Merge branch 'hide_rtspdescribe' into storageareas 2016-02-12 13:53:09 -05:00
Isaac Connor b7256a6891 Merge branch 'master' into storageareas 
Conflicts:
	CMakeLists.txt
	configure.ac
	db/zm_create.sql.in
	version
 2016-02-10 09:17:40 -05:00
Isaac Connor a2ae29dfbe Add php5-gd to depends 2016-02-08 09:47:52 -05:00
Dmitry Smirnov 5bcc414038 codespell: misc. spelling corrections 
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2016-02-08 20:41:36 +11:00
Isaac Connor 0674fa2d7a Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-02-04 12:21:33 -05:00
Isaac Connor 89cff287cd Merge branch 'master' into storageareas 2016-02-04 12:14:16 -05:00
SteveGilvarry e76d5ad1cb Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-02-04 07:33:40 +11:00
Andy Bauer 5a8989b168 Minor RPM packaging changes 2016-02-02 11:47:55 -06:00
Isaac Connor 48283191ec Merge branch 'master' into storageareas 2016-02-01 15:47:08 -05:00
Isaac Connor f46b10d399 bump release 2016-02-01 15:46:45 -05:00
SteveGilvarry 7301e803ed Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
 2016-01-30 15:45:08 +11:00
Andrew Bauer a990b23164 Update zoneminder.f22.spec 2016-01-29 21:25:34 -06:00
Andrew Bauer fa50327420 Update zoneminder.f23.spec 2016-01-29 21:24:50 -06:00
Isaac Connor ebbecd5cc4 add php5-gd to depends. We use it for image scaling 2016-01-14 13:41:09 -05:00
Isaac Connor 818cd614eb Merge branch 'multi-server' into storageareas 2016-01-08 10:17:37 -05:00
Isaac Connor 5ce26ac4df Change logrotate defaults to daily/rotate 7, which works better with logcheck 2016-01-08 09:59:03 -05:00
Isaac Connor 3066f66f25 add sphinx-rtd-theme 2016-01-05 13:21:54 -05:00
Isaac Connor 5c3c8b68a3 Add sphinx rtd theme as a dependency 2016-01-05 09:40:31 -05:00
Isaac Connor 1918b9b576 bump 2016-01-04 14:44:36 -05:00
Isaac Connor b1205bcaa9 Merge branch 'multi-server' into storageareas 
Conflicts:
	CMakeLists.txt
	configure.ac
	scripts/zmaudit.pl.in
	version
 2016-01-02 14:45:24 -05:00
Andy Bauer a93f78b7e6 Bump rpm specfiles to 1.29.0 2016-01-02 10:35:52 -06:00
Isaac Connor 1da87332b7 blah 2016-01-01 21:22:12 -05:00
Isaac Connor 93dbc3f0c1 Merge multi-server updates and bump version 2016-01-01 16:31:02 -05:00
Andrew Bauer d5ec34889e Merge pull request #1211 from SteveGilvarry/multiserver-docs 
Adding multiserver documentation
 2016-01-01 09:01:31 -06:00
Isaac Connor f38f216f59 Merge branch 'master' into storageareas 2015-12-29 14:59:44 -05:00
Isaac Connor 13689d7a7d Merge branch 'storageareas' into newpointone 
Conflicts:
	web/lang/en_gb.php
	web/skins/classic/views/filter.php
 2015-12-28 13:13:49 -05:00
Isaac Connor 63352ac7c9 changelog update 2015-12-28 13:10:27 -05:00
Andrew Bauer e6e8a75b64 Update zoneminder.f23.spec 2015-12-27 11:48:53 -06:00
Isaac Connor 33a3661958 cleanup, revent to openprint style objects 2015-12-23 14:03:40 -05:00
Isaac Connor 769b1f713c Merge branch 'multi-server' into storageareas 
Conflicts:
	distros/ubuntu1204/apache.conf
 2015-12-23 13:13:25 -05:00
SteveGilvarry 1ff2043774 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2015-12-23 19:24:08 +11:00
Isaac Connor 962d74f6a7 blah 2015-12-22 11:38:36 -05:00
Isaac Connor eccfced6d4 Merge branch 'multi-server' into newpointone 
Conflicts:
	distros/ubuntu1204/apache.conf
 2015-12-22 09:54:13 -05:00
Isaac Connor 64f1475058 blah 2015-12-22 09:47:35 -05:00
Isaac Connor b33c0764fe update to new cgi-bin path 2015-12-21 12:59:52 -05:00
Isaac Connor dfd7986c01 Merge branch 'master' into multi-server 
Conflicts:
	distros/debian_cmake/links
	distros/ubuntu1504_cmake/zoneminder.postinst
 2015-12-21 12:57:45 -05:00
Isaac Connor f6fd4671fe make zmfilter aware of StorageAreas 2015-12-21 12:40:39 -05:00
Isaac Connor fc981e063e snap release adding zmvideo 2015-12-21 10:01:55 -05:00
Isaac Connor f4debc203d Only run zmupdate.pl if the mysql db is located here 2015-12-20 12:23:40 -05:00
Isaac Connor 9743bad13f Add a valid config if a person is using mod_fcgid instead of mod_php 2015-12-20 12:21:18 -05:00
Isaac Connor 4ef35c8c70 No need for a cgi-bin link 2015-12-20 11:23:01 -05:00
Isaac Connor 9c2707deba update paths to /usr/share/zoneminder/www and /usr/lib/zoneminder/cgi-bin 2015-12-20 11:22:12 -05:00
Isaac Connor 623c8a14b0 add multi-package build for 14.04 2015-12-18 14:16:45 -05:00
Isaac Connor 14cde582cf Merge branch 'multi-server' into multiserverplusstorage 
Conflicts:
	src/zm_monitor.h
 2015-12-14 16:55:26 -05:00
Isaac Connor b2b1afa8ad Merge master 2015-12-14 15:49:32 -05:00
Isaac Connor b21b26a41b remove requirment for mysql. Mysql could be on another machine 2015-12-09 12:34:16 -05:00
Isaac Connor af59dbee2e == should be = 2015-12-04 10:40:55 -05:00
Isaac Connor 70fb6a6786 output message when not doing dbupdate. put quotes in to fix bash error when ZM_DB_HOST is not defined 2015-12-02 11:17:23 -05:00
SteveGilvarry 220ee5e516 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2015-11-29 13:17:22 +11:00
Isaac Connor 7514f43ef4 only update db if db is local 2015-11-27 13:54:31 -05:00
Isaac Connor f7cc2fb44f Merge branch 'master' into multi-server 
Conflicts:
	src/zm_monitor.cpp
 2015-11-23 10:42:14 -05:00
Isaac Connor 7d97ecb9c9 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-11-23 10:40:08 -05:00
Andy Bauer cbfdc5d88d rpm packaging updates 2015-11-21 15:23:13 -06:00
Andy Bauer e65f91d404 update rpm documentation 2015-11-21 15:18:43 -06:00
Isaac Connor 4d6c4355db Merge branch 'master' into multi-server 2015-11-20 16:07:50 -05:00
Isaac Connor 37b041b561 add index to recommended default permissions on zmuser 2015-11-20 16:00:57 -05:00
Andy Bauer 9052274d0d Update rpm documentation to reference index permission 2015-11-17 12:20:51 -06:00
Isaac Connor e00049f17a change format to native 2015-11-16 09:30:09 -05:00
Isaac Connor d5cc602bfa Merge branch 'master' into multi-server 2015-11-09 12:36:34 -05:00
Isaac Connor 16274e46bc grant create,index to zmuser when updating 2015-11-09 12:36:26 -05:00
Isaac Connor ac76d224b8 grant create,index to zmuser when updating 2015-11-09 12:36:23 -05:00
Isaac Connor 82edfc2f16 grant create,index to zmuser when updating 2015-11-09 12:34:24 -05:00
Isaac Connor 6b994132f1 grant create,index to zmuser when updating 2015-11-09 12:34:11 -05:00
Heng Liu 4e263f5913 Merge branch 'master' into feature-h264-videostorage 
Conflicts:
	src/zm_ffmpeg.h
 2015-11-04 14:39:52 -08:00
Isaac Connor b28a562f1b Merge branch 'master' into multi-server 2015-10-30 12:32:42 -04:00
Isaac Connor 920bea8deb split up depends into multiple lines 2015-10-30 12:19:43 -04:00
Isaac Connor 589ee2f37b split up depends into multiple lines 2015-10-30 12:19:35 -04:00
Isaac Connor a45a52601d change format to native, which makes building packages so much easier 2015-10-30 12:19:12 -04:00
SteveGilvarry d45cf9607b Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2015-10-28 08:12:46 +11:00
Isaac Connor 029044bca3 merge master, bump version 2015-10-23 16:14:49 -04:00
Isaac Connor e37cf0e218 append /www to docroot for all debian/ubuntu dists 2015-10-23 16:08:32 -04:00
SteveGilvarry d8494aba2d Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
	src/zm_remote_camera_rtsp.h
	web/skins/classic/views/monitor.php
 2015-10-23 22:07:22 +11:00
Isaac Connor d0e5dd62b5 Merge pull request #1103 from seebaer1976/patch-6 
Update preinst
 2015-10-16 12:06:44 -04:00
Isaac Connor 582cbe7567 Merge branch 'master' into multi-server 2015-10-15 09:01:19 -04:00
seebaer1976 7ebf3de8a2 Update preinst 
korrektur
 2015-10-09 18:13:13 +02:00
Isaac Connor 8db4c22192 Merge pull request #1100 from seebaer1976/patch-2 
Update links
 2015-10-09 09:23:32 -04:00
Isaac Connor 729e9536d7 Merge pull request #1101 from seebaer1976/patch-4 
Update rules
 2015-10-09 09:23:13 -04:00
Isaac Connor 79078f8308 Merge pull request #1102 from seebaer1976/patch-5 
Update apache.conf
 2015-10-09 09:22:55 -04:00
seebaer1976 b17819d181 Update apache.conf 
Update links
 2015-10-09 13:50:15 +02:00
seebaer1976 b042152694 Update rules 
update links
 2015-10-09 13:48:26 +02:00
seebaer1976 4284f8b089 Update preinst 
Update links
 2015-10-09 13:45:19 +02:00
seebaer1976 23a6000380 Update links 
Update links
 2015-10-09 13:41:02 +02:00
Andy Bauer b74abe88c9 minor centos 7 specfile change 2015-10-03 17:07:22 -05:00
Andrew Bauer 3242cde0bf move zm.conf under /etc/zm for Fedora 2015-10-03 13:38:51 -05:00