Isaac Connor
|
fc704f5864
|
try putting it into a script
|
2017-05-18 11:52:58 -04:00 |
|
Isaac Connor
|
f84d363e1a
|
Don't rename zm.conf.new back to zm.conf
|
2017-05-18 10:28:11 -04:00 |
|
Isaac Connor
|
273a527356
|
fixup matching endif
|
2017-05-18 10:03:12 -04:00 |
Isaac Connor
|
74fd3d4c3b
|
Fix installation of zm.conf.new instead of zm.conf
|
2017-05-15 16:25:48 -04:00 |
|
Isaac Connor
|
5decaede33
|
revert back
|
2017-05-10 15:50:46 -04:00 |
|
Isaac Connor
|
0f12a80533
|
rename zm.conf.new back to zm.conf for packaging
|
2017-05-10 15:45:43 -04:00 |
|
Isaac Connor
|
65e76f592f
|
add some messages about what we are doing wrt zm.conf
|
2017-05-10 13:47:48 -04:00 |
|
Isaac Connor
|
fd44ff4e60
|
Merge branch 'master' into storageareas
|
2017-05-10 13:16:08 -04:00 |
|
Isaac Connor
|
3abce50540
|
Merge pull request #1863 from connortechnology/no_overwrite_zm_conf
don't overwrite zm.conf
|
2017-05-10 10:01:13 -04:00 |
Andrew Bauer
|
c4f471d967
|
Merge branch 'master' of https://github.com/abishai/ZoneMinder into abishai-master
|
2017-05-10 08:06:48 -05:00 |
|
Isaac Connor
|
ec85d9a6a7
|
if zm.conf exists, rename to zm.conf.new
|
2017-05-10 08:57:47 -04:00 |
|
Isaac Connor
|
948aceee30
|
move the line that installs zoneminder.desktop into the misc/CMakeLists.txt
|
2017-04-26 16:11:45 -04:00 |
|
Isaac Connor
|
20345df3eb
|
Merge branch 'icon' into storageareas
|
2017-04-26 15:58:26 -04:00 |
|
Isaac Connor
|
d54ccaf122
|
install the icons directory to wherever zoneminder is
|
2017-04-26 15:46:55 -04:00 |
|
Isaac Connor
|
3f708c1a1b
|
add a line to install the .desktop file under /usr/share/applications/
|
2017-04-26 15:21:58 -04:00 |
|
Isaac Connor
|
f42004b4a1
|
don't overwrite zm.conf
|
2017-04-26 15:18:32 -04:00 |
|
Isaac Connor
|
f6067ab969
|
undo c++11 requirements
|
2017-04-13 09:47:47 -04:00 |
|
Isaac Connor
|
a2a823e3ec
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-04-11 08:54:54 -04:00 |
|
Isaac Connor
|
620797ac18
|
replace swresample with libavresample
|
2017-04-10 21:54:23 -04:00 |
|
Isaac Connor
|
48d658790a
|
Merge branch 'storageareas' into optimisations
|
2017-04-09 17:36:24 -04:00 |
|
Isaac Connor
|
f2dcd18297
|
Merge branch 'armv7_neon' of https://github.com/mastertheknife/ZoneMinder into storageareas
|
2017-03-30 13:46:30 -04:00 |
Kfir Itzhak
|
7162c62d26
|
Implemented a fix to get the Neon code to compile successfully with GCC < 6.0
|
2017-03-25 21:49:15 +03:00 |
|
Isaac Connor
|
97a515df6e
|
add arm neon detection
|
2017-03-24 13:41:10 -04:00 |
Andy Bauer
|
160aa1cac4
|
check for polkit only if systemd is present
|
2017-02-04 15:34:57 -06:00 |
abishai
|
0f23809b35
|
rc.d is not require polkit
provide alternate path for mysql headers
|
2017-01-31 10:59:22 +03:00 |
|
Isaac Connor
|
9748b9346e
|
bump required version to 3.1 so that we can use a simple statement to turn on c++11 features
|
2017-01-08 16:52:16 -05:00 |
|
Isaac Connor
|
5ae34a7561
|
Merge branch 'master' into storageareas
|
2017-01-02 09:39:10 -05:00 |
|
Andrew Bauer
|
1b81d790b2
|
rpm specfile consolidation
|
2016-12-23 13:06:44 -06:00 |
|
Andy Bauer
|
47b33917c4
|
bump minimum version of cmake
|
2016-12-23 08:56:10 -06:00 |
|
Isaac Connor
|
7f2bf04c2f
|
Merge branch 'cookie_http_only' into storageareas
|
2016-12-08 14:26:13 -05:00 |
|
Andy Bauer
|
9a694541ba
|
repm specfile maintenance: retire fc23, add fc25
|
2016-11-26 08:20:03 -06:00 |
Steve Gilvarry
|
0234e82396
|
Enable local and travis ccache
|
2016-07-24 09:26:10 +10:00 |
|
Andrew Bauer
|
f3583e5707
|
rpm specfile - add support for f24, remove support for f22
|
2016-06-24 15:39:57 -05:00 |
Isaac Connor
|
4045211b36
|
Have cmake take the version from the version file
|
2016-06-03 09:51:50 -04:00 |
|
Andy Bauer
|
6950e3385a
|
bump project to 1.30.0
|
2016-05-31 19:41:17 -05:00 |
|
Isaac Connor
|
02ef99584c
|
Revert "alter code to use libv4l2"
This reverts commit 00ef0f4d78.
|
2016-09-29 09:30:12 -04:00 |
|
Isaac Connor
|
00ef0f4d78
|
alter code to use libv4l2
|
2016-09-28 08:43:41 -04:00 |
|
Isaac Connor
|
0d418882e7
|
sorta works
|
2016-09-23 15:39:52 -04:00 |
|
Steve Gilvarry
|
21c46bb519
|
Merge branch 'feature-h264-videostorage' into monitor_packetqueue
|
2016-08-11 00:52:35 +10:00 |
|
Steve Gilvarry
|
ea1ae815f1
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2016-08-05 23:03:06 +10:00 |
|
Steve Gilvarry
|
0425c68d59
|
Merge remote-tracking branch 'upstream/feature-h264-videostorage' into monitor_packetqueue
|
2016-08-02 20:17:35 +10:00 |
|
Steve Gilvarry
|
142784746c
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2016-07-07 19:33:04 +10:00 |
|
Isaac Connor
|
26bba58c56
|
Merge branch 'master' into feature-h264-videostorage
|
2016-06-17 11:09:47 -04:00 |
|
Steve Gilvarry
|
02013cef94
|
Merge remote-tracking branch 'upstream/feature-h264-videostorage' into packetqueue
|
2016-05-03 21:15:46 +10:00 |
|
Steve Gilvarry
|
f3ca10aac6
|
Starting to convert to boost.interprocess
|
2016-04-28 01:30:05 +10:00 |
|
Isaac Connor
|
709fc35167
|
Merge branch 'master' into icon_video
|
2016-04-06 11:49:40 -04:00 |
|
Andrew Bauer
|
ad13d889fe
|
bump version from 1.29.0 to 1.29.1
|
2016-04-06 09:30:47 -05:00 |
|
Andrew Bauer
|
9c5b47404d
|
Update CMakeLists.txt
|
2016-04-06 06:45:21 -05: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
|
abcf48b65c
|
Merge branch 'master' into feature-h264-videostorage
|
2016-04-01 08:53:45 -04:00 |