2d2c0df8f1
rpm specfile - bump version
2018-04-19 15:39:08 -05:00
ed140426ab
rpm packaging changes and documentation
2018-04-19 15:36:43 -05:00
3c225c9f1c
Migrate Webcache out of webroot ( #2083 )
...
* migrate webcache folder out of webroot, migrate htaccess files
* rpm specfile - add missing reference to cache folder
* fix submodule mixup
2018-04-19 15:01:46 -04:00
8eb4195cb7
rpm specfile - update git submodules
2018-04-18 15:00:55 -05:00
8c0ad8d1f3
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-04-17 22:57:44 -04:00
456b1b59df
rpm specfile - bump crud to 3.1.0
2018-04-17 20:27:28 -05:00
48d5fa00d4
remove libsys-cpuload-perl as a dependency
2018-04-17 21:10:55 -04:00
3a80c60d2e
rpm spefile changes - account for new files
2018-04-17 15:13:38 -05:00
08447de7ca
bump rpm specfile version
2018-04-17 14:53:55 -05:00
279e437545
Put back zmupdate and do more output
2018-04-14 23:07:33 -04:00
cd3046abb3
Merge branch 'storageareas' into zma_to_thread
2018-04-14 11:03:08 -04:00
e28ecf8e28
add libfile-slurp-perl as a dependency
2018-04-05 10:00:14 -04:00
4d6e5d0ab6
Add libnumber-bytes-human-perl as a dependency
2018-03-28 08:21:17 -07:00
43bdaff0a3
Merge ../ZoneMinder.master into storageareas
2018-03-22 11:32:22 -04:00
afc3e160a7
Fix the second part of #2064 ( #2066 )
...
* Fix postinst with mysql. See bug #2064
* Fix mistake
2018-03-21 11:05:48 -04:00
4bb26519f6
allow errors, and add a missing fi
2018-03-16 11:59:29 -04:00
27736fb5d9
Merge ../ZoneMinder.master into storageareas
2018-03-15 11:04:41 -04:00
a73a7b438c
whitespace to google code style specs. 2 spaces
2018-03-14 10:44:43 -04:00
00ab9b4c03
merge proposed changes in ubuntu1804 folder -> ubuntu1604 folder instead
2018-03-13 09:28:11 -05:00
ee146acf07
Remove obsolete symlink handling, update README.Debian
2018-03-06 20:35:41 -05:00
4c44c32a62
Allow db username/password setting in conf.d
2018-03-06 19:23:01 -05:00
b4c13d56d6
Merge ../ZoneMinder.master into storageareas
2018-03-06 12:29:59 -05:00
7a9350c44f
Quick fix for mistake
2018-03-05 20:24:40 -05:00
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
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
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
49a2065f34
Allow packaging with libx264-152, allow packaging with MariaDB instead of MySQL
2018-03-05 19:06:38 -05:00
d13335358f
Copy ubuntu1604 to ubuntu1804
2018-03-05 18:39:29 -05:00
ab11e9ec38
Update zoneminder.spec
2018-02-23 11:48:35 -06:00
3aa31fd524
Merge branch 'master' into storageareas
2018-02-23 10:23:35 -05:00
a888dac834
source files in /etc/zm/conf.d as well
2018-02-23 09:30:47 -05:00
c7aa45c4ce
libmysqlclient-dev debian package name changes
2018-02-19 20:21:21 -06:00
67b365948e
Merge branch 'storageareas' into zma_to_thread
...
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_monitor.cpp
web/includes/Monitor.php
web/skins/classic/views/js/add_monitors.js
web/skins/classic/views/js/console.js
2018-01-29 15:53:26 -05:00
7074681e60
Need drop permissions
2018-01-29 11:44:29 -05:00
525749c11a
Need drop permissions
2018-01-29 11:44:03 -05:00
9a15328894
Merge branch 'storageareas' into zma_to_thread
...
Conflicts:
src/zm_event.cpp
2018-01-26 13:02:16 -05:00
0bd1ee5992
Merge branch 'master' into m
2018-01-25 08:43:31 -05:00
c3ab7d5269
Merge branch 'storageareas' into zma_to_thread
...
Conflicts:
src/zm_packetqueue.cpp
src/zma.cpp
2018-01-10 14:24:46 -05:00
2427a5bf63
sync up .service file to match 1604.
2018-01-08 16:13:11 -05:00
3e31203a22
default service start timeout to 5 minutes. THe default of 1.5 minutes is too short on some larger systems
2018-01-08 16:11:54 -05:00
36ef0f5011
Merge branch 'storageareas' into zma_to_thread
2018-01-05 10:06:18 -05:00
2cc185fd45
Move Updating Storage stats to a trigger. Remove the code from zmwatch that did it before
2018-01-04 13:06:28 -05:00
bc096bcc3d
make zoneminder rpm depend on zip package
2017-12-14 14:14:31 -06:00
49908c11da
Merge branch 'storageareas' into zma_to_thread
2017-12-11 13:51:32 -05:00
dd69bc3d7b
Merge branch 'master' into storageareas
2017-12-11 11:39:42 -05:00
0d9f330356
call zmcamtool during postinst ( #2021 )
2017-12-10 14:14:39 -05:00
90820ab92a
Merge branch 'storageareas' into zma_to_thread
2017-12-07 10:37:04 -05:00
bbe75762e7
remove boost
2017-12-07 09:40:00 -05:00
004a41b122
remove boost dependency.
2017-12-04 22:59:50 -05:00
5deb69207b
Merge branch 'storageareas' into zma_to_thread
2017-12-04 22:11:46 -05:00
00e963eba4
remove the dependency on boost
2017-11-28 07:17:26 -05:00
99968dfa2a
Merge branch 'storageareas' into zma_to_thread
2017-11-27 11:28:36 -05:00
1392c1dfc2
put back missing test for if db is local
2017-11-22 12:36:04 -08:00
3c55daaf36
Merge branch 'tesla' of github.com:connortechnology/ZoneMinder into tesla
2017-11-22 12:10:54 -08:00
c70a9f665a
Merge branch 'storageareas' into zma_to_thread
2017-11-20 12:08:16 -05:00
dae2a6ae0a
fixup the .postinst file which got some duplicate lines
2017-11-20 11:56:05 -05:00
74650ebc70
simplify Analysis
2017-11-20 11:48:56 -05:00
7f3d112eb6
Merge branch 'tesla' into zma_to_thread
2017-11-16 12:07:25 -08:00
2570869aa0
bring back libvlc
2017-11-08 11:18:54 -05:00
b6548ba137
put curl back, we use it's decoding function for urls
2017-11-07 15:54:13 -05:00
09f3355e18
add /usr/share/zoneminder/www/cache as a temp dir
2017-11-04 14:52:36 -04:00
92917809b8
add creating /usr/share/zoneminder/www/cache
2017-11-01 12:49:38 -07:00
fc3934c8bb
kill off curl and libvlc
2017-10-25 13:20:18 -07:00
ca17d9dba4
change the systemd zoneminder.server to always restart zoneminder with a 10 second wait
2017-10-24 16:24:23 -07:00
199f90868a
add libsys-cpuload-perl as a dependency
2017-10-24 15:17:09 -07:00
354262c557
wip nvsocket
2017-10-03 13:28:56 -07:00
7b1142bee6
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-09-12 11:03:16 -04:00
edb7762cf3
Merge branch 'master' into storageareas
2017-09-11 16:57:08 -04:00
a8cf384be9
rpm spcfile change
...
use %{_buildshell} macro rather than hard code path to shell interpreter
2017-08-23 08:48:11 -05:00
7520f4ddb5
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-07-26 10:39:28 -04:00
cfbfc0dd44
Merge branch 'master' into storageareas
2017-07-21 11:04:32 -04:00
91ccba137f
Don't create symlinks in ZoneMinder webroot ( #1923 )
...
* don't create symlinks during rpm packaging
* don't use symlinks when pacakging debs
* change default values for zm_dir_events and zm_dir_images
* remove zm_contentdir cmake var from debian packaging
* change default for zm_config_subdir
* update INSTALL documentation
2017-07-21 08:18:13 -04:00
d931945619
Update zoneminder.spec
...
we have to tell rpm what permission zmcustom.conf has to prevent the build from failing on el6
2017-07-20 17:53:06 -05:00
4bca799d43
reorganize zm config files ( #1937 )
...
* reogranize config files
* process 01-system-paths.conf.in
* exclude .in files in install directive
2017-07-17 09:11:36 -04:00
4cf28267e3
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-07-14 12:30:10 -04:00
2002e863a9
Update zoneminder.service.in
2017-07-14 10:26:41 -05:00
1822510909
rpm packaging - consolidate zoneminder apache config file
2017-07-14 10:15:12 -05:00
b3984ea2da
Merge branch 'master' into storageareas
2017-07-14 10:38:20 -04:00
99bb12dcc9
Update zoneminder.spec
...
changes from rpmfusion feedback
2017-07-14 08:33:08 -05:00
c294e25dbc
rpm packaging - migrate cakephp htaccess parms into main apache config
2017-07-14 07:23:35 -05:00
0048908071
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-07-13 11:18:28 -04:00
0df6ac2895
Merge branch 'master' into storageareas
2017-07-13 11:04:51 -04:00
5e74fd2e53
Update zoneminder.spec
...
rpmspecfile change. zmsystemctl.pl is only installed on distros w/ systemd (i.e. all current distros except el6)
2017-07-12 14:23:43 -05:00
cfcf7363ea
Don't test the symlinks anymore
2017-07-11 11:18:47 -04:00
c3c6459052
Merge branch 'montagereview_rework' into storageareas
2017-07-05 15:34:02 -04:00
9be0e43618
Update README.Redhat7
2017-06-30 07:36:22 -05:00
69509689e0
debian stretch prefers libmariadbclient-dev and libgcrypt11-dev
2017-06-29 08:41:18 -04:00
323cd3540d
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-28 11:58:23 -04:00
a656f4a6cd
Update zoneminder.conf.in
...
rpm specfile - make el6 script alias match el7 & f25
2017-06-28 10:04:28 -05:00
90696331a9
Merge branch 'master' into storageareas
2017-06-26 21:58:11 -04:00
043b382bdd
include conf.d folder contents in debian packaging ( #1934 )
2017-06-26 14:44:33 -04:00
76f63686cb
Merge branch 'fix_event_viewing' into storageareas
2017-06-22 09:24:31 -04:00
5ee230a141
always restart zoneminder on upgrade, not just when doing a db update
2017-06-21 17:20:50 -04:00
c33b179a59
:Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-21 17:18:49 -04:00
36683d15d2
Update zoneminder.spec
...
bump zm version in rpm specfile
2017-06-20 11:41:53 -05:00
2e60864e99
always stop and start zm on upgrade, not just if doing a db update
2017-06-20 09:44:18 -04:00
f78e720db3
add /etc/zm and /etc/zm/conf.d to install dirs
2017-06-20 09:41:35 -04:00
42a022d15b
always stop and start zoneminder on upgrade
2017-06-20 09:41:02 -04:00
db68d3e0a2
use restart instead of start
2017-06-19 13:57:00 -04:00
91a070b835
Merge branch 'master' into storageareas
2017-06-15 13:13:08 -04:00
119f8fc86c
Fix version checks to fix build on yaketty
2017-06-15 13:02:54 -04:00
734f099b4a
remove content from changelog
2017-06-15 12:15:15 -04:00
085d239a6e
Merge branch 'master' into storageareas
2017-06-13 18:02:28 -04:00
bacf65ae9a
Migrate values from Options -> Paths to zm.conf ( #1908 )
...
* initial commit to migrate contents of Options->Paths to zm.conf
* remove paths items from configdata.pm
* remove paths tab from options
* update deb packaging scripts with new cmake vars
* remove extraneous file
* save custom paths variables to config file before dB is freshened
* don't check configs if the dB version is >= 1.31.0
2017-06-12 21:39:37 -04:00
617cdd5fd3
revert wip config backup
2017-06-09 15:28:01 -04:00
62429a55a8
why did git decide to delete these synlinks???
2017-06-09 12:58:15 -05:00
07d9d35e39
minimize Travis log output
2017-06-09 12:52:00 -05:00
3bfac9faff
Merge branch 'master' into storageareas
2017-06-09 13:00:24 -04:00
371b86300a
Merge branch 'master' into storageareas
2017-06-08 14:23:40 -04:00
02b2d8a968
put in ffmpeg version test
2017-06-08 12:22:28 -04:00
f67584ebf9
remove references to incomplete icon work
2017-06-08 08:39:49 -04:00
2bc6f1627e
Add support for conf.d subfolder ( #1902 )
...
* cmake changes to support conf.d
* php changes to support conf.d
* perl changes to support conf.d
* C changes to support conf.d
* add conf.d support to rpmspecfile
* fix typo
* specify ZM_CONFIG_SUBDIR in relevant target distros
* put back my config_file perl definition
* remove quotes from ZM macros
* fix snprintf
* add README to conf.d folder
* adjust rpm specfile
* remove custom permissions from README in rpmspecfile
* modify rpm README documentation to reflect conf.d support
* set ZM_CONFIG_SUBDIR in debian rules file
2017-06-05 16:39:19 -04:00
451714a403
Merge branch 'master' into storageareas
2017-06-04 21:42:56 -04:00
44eba78e40
put back empty files
2017-06-02 20:42:55 -04:00
b5c0a0eae2
the contents of these are not being maintained and should be generated by scripts
2017-06-02 12:40:32 -04:00
c93e13868e
change to quilt frmo native. Remove patches. We are upstream.
2017-06-01 12:41:10 -04:00
0e643f0f93
Merge branch 'master' into storageareas
2017-05-30 11:58:38 -04:00
8b0b938fc8
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder
2017-05-30 10:51:15 -04:00
77d068fc48
merge updates from SA relating to building debian packages
2017-05-26 22:25:59 -04:00
9d464dfa24
remove errant comma
2017-05-26 22:24:57 -04:00
94151b0318
put back changelog
2017-05-26 14:30:21 -04:00
766d5b7dcc
fix merge
2017-05-25 16:33:09 -04:00
7cfa0b12ec
Merge branch 'dragndrop_monitor_sorting' into storageareas
2017-05-25 15:26:04 -04:00
1bd3369909
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-25 14:13:37 -04:00
9cbafde1ac
add libboost to build-depends
2017-05-25 13:54:43 -04:00
a515041e14
Merge branch 'master' into storageareas
2017-05-23 15:17:46 -04:00
242c8fc0ab
fix options, to remove indexes
2017-05-23 15:01:22 -04:00
b92f05672a
No reason to watch upstream, when we are upstream
2017-05-23 14:56:53 -04:00
099e099352
We need boost for the packetqueue
2017-05-23 14:51:25 -04:00
392ade2e1a
change default logrotate policy to rotate daily and compress
2017-05-23 14:51:09 -04:00
7756d5067c
the changelog entries are irrelevant, so don't keep them. Package scripts will generate their contents
2017-05-23 14:46:54 -04:00
51946da564
add a -f so that removing the directories actually removes the contents
2017-05-23 14:44:21 -04:00
c4d7703867
Merge a new apache.conf that supports fcgid
2017-05-23 14:42:31 -04:00
48ad0b77fc
merge updates for newer releases of packages
2017-05-23 14:39:31 -04:00
c859f7291c
Feature h264 videostorage ( #1882 )
...
* Moved writing of configure options from Controller to Model. Fixes #191 .
* Initial commit for saving events as videos :)
* Add zm_video.cpp to autotools
* Add zm_video.h to autotools
* Search for MP4V2 header file 3 times: mp4v2/mp4v2.h, mp4v2.h, mp4.h
* Fix serve memory leak
* Few minor code improvements
* Added the ability to override preset, tune, profile and few other improvements
* Correctly write SPS & PPS from x264 encoder headers
* Remove unnessecary SPS & PPS writing code
* Imported missing files from master to feature-h264-videostorage
* Audio support including fixes for dts/pts, split on keyframe and update to mkv extension to prevent ffmpeg problems writing rtsp audio to mp4 containter (header problem)
* Updates to make gcc happy
* Add html5 video control to timeline and event to support mkv playback
* Add zm_videostore.cpp to CMakeLists.txt
* Remove Modern Branch for now
* Fix minor bug
* Option handled added in master, removing duplicate declaration
* Add CaptureandRecord from zm_camera.h
* Putting placeholder in for CaptureAndRecord function
* Removed duplicate code and brackets
* add digest auth file for cmake
Conflicts:
src/CMakeLists.txt
* Add web dir back into Makefile.am
Revert "Removed web from SUBDIRS in Makefile.am"
This reverts commit d9bbcdf3a9
2017-05-15 22:02:48 -04:00
b684ee5ad5
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
...
Conflicts:
distros/ubuntu1604/control
2017-05-10 13:34:39 -04:00
553ef919a5
fixup apcu additions for jessie
2017-05-10 13:19:30 -04:00
fd44ff4e60
Merge branch 'master' into storageareas
2017-05-10 13:16:08 -04:00
088bafd8e9
Update zoneminder.spec
...
rpm specfile change. Don't look for polkit rules on legacy sys v systems
2017-05-10 10:47:05 -05:00
3ec90f1d0e
Update zoneminder.spec
...
zmf was removed from the project. update rpm specfile accordingly
2017-05-10 10:05:52 -05:00
12fc011a29
1.30.4 release
2017-05-09 09:54:48 -05:00
fc52766606
Merge branch 'master' into storageareas
2017-05-08 22:17:37 -04:00
62f9465452
add php-apc and apcu
2017-05-08 21:36:42 -04:00
ff368f2b6f
add php-apc and apcu
2017-05-08 21:35:49 -04:00
31b52197a2
Update zoneminder.spec
...
change rpm package requirements relating to php-pecl-apcu
2017-05-08 10:35:32 -05:00
fd35ac37c5
Update zoneminder.spec
...
fix %autosetup parameters
2017-05-08 10:18:21 -05:00
a857e68aad
rpmspecfile change
...
add flags to %autosetup to make it patch friendly
2017-05-05 12:20:12 -05:00
d903f7e6e9
Merge pull request #1871 from connortechnology/master
...
Clean up ubuntu builds
2017-05-05 09:46:24 -04:00
7b81f0464b
Due to switch to apc for caching in api, don't need the tmp dirs
2017-05-05 09:45:36 -04:00
a8d216d9c7
Due to switch to apc for caching in api, don't need the tmp dirs
2017-05-05 09:44:42 -04:00
44433ab9c6
Update README.Fedora
2017-05-05 08:43:49 -05:00
bccddcad88
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder
2017-05-05 09:42:24 -04:00
cccc3df700
Merge branch 'master' into storageareas
2017-05-03 16:43:44 -04:00
fd8aa62927
bump 1.30.3 release
2017-05-02 13:25:56 -05:00
8fad889c82
Don't delete the docs anymore
2017-04-27 12:15:39 -04:00
48d9167c5d
Don't apply patches.
2017-04-27 12:05:47 -04:00
2b0561b481
delete the old merge files
2017-04-27 12:05:13 -04:00
6a3531c2ef
use the mootools shipped with zm
2017-04-27 12:01:55 -04:00
6e94e57f57
don't default the cgi-bin path to /zm
2017-04-27 11:56:46 -04:00
ce00047175
try out quilt format again
2017-04-27 11:46:36 -04:00
eac1ebfb5a
bump up standards version
2017-04-27 11:46:07 -04:00
20345df3eb
Merge branch 'icon' into storageareas
2017-04-26 15:58:26 -04:00
dce39bb2a9
Merge branch 'master' into storageareas
2017-04-26 15:58:17 -04:00
17052d1d91
get rid of rules.rej and rules.orig from some old merge problem
2017-04-26 15:53:54 -04:00
dae4689b9c
remove .rej and .orig
2017-04-26 15:51:54 -04:00
da8a8f390e
remove .rej and .orig
2017-04-26 15:51:49 -04:00
4a0d2ec123
This should add a menu entry
2017-04-26 15:51:21 -04:00
681be621b1
add /usr/share/zoneminder/icons to install list
2017-04-26 15:51:04 -04:00
882a2095b8
I believe this will cause the .deb to include a menu entry... not sure though
2017-04-26 15:46:19 -04:00
b71d021ae1
Merge branch 'fix_1849' into storageareas
2017-04-18 12:43:04 -04:00
cea31f205a
Update zoneminder.tmpfiles.in
...
remove cake cache folders from tmpfiles.d since we changed the cake cache engine to apc
2017-04-16 20:44:41 -05:00
273229858f
Merge branch 'master' into storageareas
2017-04-16 11:26:18 -04:00
3b2d708a16
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-04-16 11:24:51 -04:00
3b1ef579d5
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder
2017-04-15 09:24:45 -05:00
4240f03f4e
rpm readmefile changes
2017-04-15 09:23:28 -05:00
432a38720a
Merge pull request #1788 from knnniggett/travis_test1
...
packpack nightly builds
2017-04-15 10:21:42 -04:00
7e9b9944ae
rpmspecfile changes to reflect recent commits
2017-04-15 08:51:59 -05:00
0bbe5d19a6
add libavresample to build depends
2017-04-13 09:59:35 -04:00
b03d0d09da
fix typo
2017-04-13 09:08:15 -04:00
d039227f79
Merge branch 'master' into storageareas
2017-04-12 13:51:10 -04:00
e28be26978
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-04-12 13:41:16 -04:00
6e7bd9311d
add the api tmp cache folders to the tmpfiles
2017-04-12 13:41:02 -04:00
a58259c60e
include other libjpeg alternatives. Include a libpcre dependency
2017-04-10 21:55:52 -04:00
cd1b09d977
Update zoneminder.spec
...
use rpm macros
2017-03-31 20:35:24 -05:00
716a25fc1f
rpmspecfile - ensure cache folders are created during install
2017-03-31 20:17:05 -05:00
58d119d9ed
Merge branch 'fix_1762' into storageareas
2017-03-31 13:38:59 -04:00
7068efd581
rpmspecfile - modify tarball handling
2017-03-30 18:31:58 -05:00
9a2c31d2c0
bump rpmspecfile to 1.30.2 release
2017-03-30 18:20:41 -05:00
e46f64125e
Update zoneminder.tmpfiles.in
...
With cakephp debug mode off, we must ensure cake's tmp folders are created
2017-03-29 13:28:15 -05:00
8c2e8defab
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2017-03-28 20:52:36 -04:00
74eed2ac29
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-03-28 20:06:12 -04:00
769af661e9
Merge branch 'fix_x10' into storageareas
2017-03-28 20:05:52 -04:00
6f26a9585a
add libswscale3 for jessie
2017-03-27 15:43:18 -04:00
113f4b2bfe
add libx264-142 for jessie
2017-03-24 18:00:18 -04:00
7c86bcdfce
add the link from /usr/share/zoneminder/www/api/app/tmp to /var/tmp
2017-03-24 11:52:55 -04:00
f082183fd6
add the cache directories used by cake php under /var/tmp
2017-03-24 11:52:29 -04:00
feb9d55613
fix syntax
2017-03-20 13:52:10 -04:00
d5312ce21f
fix libswscale for 1604
2017-03-13 15:37:55 -04:00
1cbcd3612f
add libswscale4
2017-03-13 14:28:13 -04:00
adbb5f431d
fix version of x264
2017-03-11 11:00:46 -05:00
e04cc1be05
add mp4 and x264 to ubuntu1204 and remove duplicated mp4.x264 lines from ubuntu1604.
2017-03-11 10:41:39 -05:00
fdcb93eacc
Merge branch 'master' into storageareas
2017-03-06 16:22:28 -05:00
5ea9f695de
Merge branch 'master' into travis_test1
2017-03-05 13:02:59 -06:00
ca71ee8e71
remove rules.new
2017-03-05 12:40:27 -06:00
4fe70f0e7d
recreate patch
2017-03-05 12:39:03 -06:00
c6fc6cb0ca
change patch method
2017-03-05 11:46:45 -06:00
f66408b998
update the path to zm.conf
2017-03-05 10:50:09 -06:00
cfeb12fc73
fix permissions on zm.conf in deb pkg scripts
2017-03-05 10:37:44 -06:00
78612e3925
use format 1.0
2017-02-15 11:25:11 -05:00
d135216ac7
Merge branch 'master' into storageareas
2017-02-15 09:30:35 -05:00
c58b44bd9e
try out the git format
2017-02-14 11:45:13 -05:00
bf99d132c7
Add the missing F back in.
2017-02-13 22:15:10 +11:00
91dd2105d2
rpmspecfile - use %{_sysconfdir} macro
2017-02-08 20:44:00 -06:00
bd4aea0385
rpm specfile - php requires was listed twice
2017-02-08 20:21:23 -06:00
9c8c87f591
rpm specfile - require php-mysqli, bump to 1.30.2
2017-02-08 20:12:54 -06:00
7ab6818fa0
Merge branch 'sanitize_image_path' of https://github.com/knnniggett/ZoneMinder into storageareas_sanitize
2017-01-25 17:14:30 -05:00
3882b74766
rpm specfile - el6 buildrequires epel-rpm-macros
2017-01-15 16:39:38 -06:00
418995df84
rpm specfile changes
...
need to put this back in to maintain compatibility with packpack
2017-01-15 09:59:17 -06:00
babe4f07fb
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-01-14 10:53:49 -05:00
3074263e06
Merge branch 'control_fixes' into storageareas
2017-01-10 12:54:46 -05:00
06fd760a2a
rpm specfile- use %{_localstatedir} macro
2017-01-09 09:07:05 -06:00
dc6b2ed114
clean up unnessary requires
2017-01-08 18:17:28 -06:00
6b7e3a1b61
rpm specfile changes
2017-01-08 17:37:03 -06:00
d1ed472db0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-01-05 10:09:11 -05:00
0d7e1bcbc5
add php as a dependency only when we aren't using nginx
2017-01-04 10:49:22 -06:00
8ea4bdca1d
explicity set index.php as the only directoryindex
2017-01-04 10:45:36 -06:00
7e7ef46420
rpm packaging - remove rundir from tmpfiles.d
2017-01-03 16:42:12 -06:00
b4f537c5d3
rpm build tweaks based on rpmfusion feedback
2017-01-03 13:12:12 -06:00
84183c819c
Merge branch 'master' into storageareas
2017-01-03 09:53:09 -05:00
3042b39672
Update zoneminder.spec
...
rpmspecfile don't glob zoneminder's binaries
2017-01-02 11:41:14 -06:00
c594ad8be7
rpmspec - remove quotes from pidfile path
2017-01-02 10:37:23 -06:00
5ae34a7561
Merge branch 'master' into storageareas
2017-01-02 09:39:10 -05:00
0d549f1db3
spelling fixes
2016-12-29 10:31:05 +01:00
76db2e811d
more rpm specfile changes
2016-12-28 09:27:30 -06:00
ea0cfad37c
update rpm specfile
2016-12-27 09:06:50 -06:00
56277bce09
minor rpm specfile changes
2016-12-26 10:07:38 -06:00
0d1dbf1745
fix rpm specfile versioning in changelog
2016-12-26 09:31:11 -06:00
0dd6f4916e
rpm specfile - move tmpfile config under /usr/lib
2016-12-26 08:31:21 -06:00
eb0b85ec13
changes based on feedback from rpmlint
2016-12-23 14:02:39 -06:00
3d15ac315b
Update CMakeLists.txt
...
minor whitespace change
2016-12-23 13:11:06 -06:00
1b81d790b2
rpm specfile consolidation
2016-12-23 13:06:44 -06:00
ed618ff7b0
Merge branch 'master' into storageareas
2016-12-20 11:29:31 -05:00
68cd4c2ce5
Update zoneminder.el7.spec
...
minor specfile change
2016-12-15 08:28:37 -06:00
708f52beda
Merge branch 'disk_space_in_events' into storageareas
2016-12-13 13:36:18 -05:00
6fe88adc02
Update zoneminder.f25.spec
2016-12-12 20:50:53 -06:00
e72a76fe33
Update control
2016-12-12 12:09:47 -06:00
1cb8d6baba
enable apache cgi
2016-11-28 11:45:30 -05:00
859d361373
turn off libswresample
2016-11-27 17:06:12 -05:00
921205216d
turn off libswresample
2016-11-27 17:00:16 -05:00
9a694541ba
repm specfile maintenance: retire fc23, add fc25
2016-11-26 08:20:03 -06:00
bf85791e4c
improvements to fedora nginx rpm support
2016-11-22 13:02:02 -06:00
c2b1638a3e
rpm changes - set TZ var in systemd service file
2016-11-22 12:43:56 -06:00
a96ab604ec
rpm changes - set TZ var in systemd service file
2016-11-22 12:42:48 -06:00
71898df756
Merge pull request #1697 from connortechnology/apache_indexes
...
Apache indexes
2016-11-22 12:33:55 -06:00
b3f2b13718
Merge branch 'apache_indexes' into storageareas
2016-11-22 13:29:30 -05:00
9cc1b23460
put back mizzing F
2016-11-22 13:25:52 -05:00
b059ca83da
Rremove Index from options to prevent directory listings
2016-11-22 13:25:52 -05:00
aa0a4d1f5a
put back mizzing F
2016-11-22 13:13:09 -05:00
e8da04df56
Merge branch 'apache_indexes' into storageareas
2016-11-22 13:09:44 -05:00
cf49a234b3
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-11-22 13:05:03 -05:00
b67450b8ae
Update zoneminder.php-fpm.conf.in
2016-11-17 19:48:35 -06:00
c360e27b02
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-11-17 13:13:47 -05:00
bcc5a57b02
prelimniary support for nginx on fedora
2016-11-15 18:34:25 -06:00
2df6cd17fa
add libswresample to build depends
2016-11-11 22:30:35 -05:00
6361f14387
Rremove Index from options to prevent directory listings
2016-11-08 09:30:24 -05:00
a6c77f08d2
use generic libboost-dev
2016-10-02 15:22:52 -04:00
056e560b70
Merge ../ZoneMinder.master into storageareas
2016-10-02 12:25:51 -04:00
07d6e1303b
Merge branch 'compress_logs' into storageareas
2016-10-02 12:22:46 -04:00
9e3f6226ed
add compress and delaycompress to the zoneminder logrotate settings
2016-10-02 10:05:07 -04:00
f09c6c92e8
blah
2016-09-30 12:22:35 -04:00
e11ded83ba
get rid of watch:
2016-09-30 12:15:23 -04:00
bf013cd88e
remove libswsresample
2016-09-30 11:58:55 -04:00
53d3e063e8
smal re-order
2016-09-30 09:35:52 -04:00
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
3dfe1185ff
add ffmpeg as option to libav-tols
2016-09-13 10:11:50 -04:00
4895942308
update fedora rpm readme
2016-08-16 09:49:45 -05:00
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
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
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
6b70ff964b
fix path in cake api cleanup rules
2016-08-10 09:06:15 -04:00
6c8001f362
Merge pull request #1549 from SteveGilvarry/initd_sql_wait
...
Implement suggested wait for MySQL start
2016-08-06 09:14:58 -05:00
004b651d61
RPM specfile config change
...
use make macros, rather than hard coded values
2016-07-31 15:06:39 -05:00
3c6692d0d5
RPM specfile config change
...
fix logrotate script
2016-07-31 07:29:37 -05:00
477c02382b
Update CMakeLists.txt
...
Minor change for fedora rpmbuild
2016-07-06 19:06:28 -05:00
1f060f1938
Update zoneminder.init
...
Remove my initials
2016-07-05 11:35:08 -05:00
1f53377d8a
Implement suggested wait for MySQL start
2016-07-05 07:28:52 +10:00
980d3f6e7f
rpm housecleaning, change the way jscalendar is installed
2016-07-03 11:34:35 -05:00
f3583e5707
rpm specfile - add support for f24, remove support for f22
2016-06-24 15:39:57 -05:00
58e1a9ac4a
rpm README changes
2016-06-01 07:30:41 -05:00
8eee25795a
Remove deprecated register_globals from Apache/PHP configs
2016-05-30 14:02:46 +02:00
b3fd156c11
add boost to build depends
2016-05-25 20:01:42 -04:00
abd43bdc9f
Merge ../ZoneMinder.master into storageareas
2016-09-29 14:25:11 -04:00
f9fd715657
Merge branch 'master' into storageareas
2016-09-29 14:25:02 -04:00
f1012f60ec
add libswresample to build depends
2016-09-29 12:31:02 -04:00
441020e8b8
fix_type
2016-09-29 10:49:40 -04:00
ce2c52c07d
allow libavdevice55 and 57
2016-09-27 16:15:24 -04:00
da5bad7ec2
Merge ../ZoneMinder.connortechnology into storageareas
2016-09-27 15:09:14 -04:00
24e33fec7f
allow libvlccore8
2016-09-27 15:08:00 -04:00
730d7a648d
add -f to rm
2016-09-27 14:15:38 -04:00
ee93424bf9
update jpeh deps to match official debian repo
2016-09-27 12:33:50 -04:00
Andrew Bauer
Andy Bauer
Isaac Connor
Isaac Connor
Matthew Trescott
Isaac Connor
Isaac Connor
APHW2 MFGENG
Isaac Connor
Andrew Bauer
Steve Gilvarry
klemens
Isaac Connor
Andrew Bauer
Isaac Connor
Disassembler
Isaac Connor