Commit Graph

6648 Commits

Author SHA1 Message Date
Isaac Connor de1c463195 Merge pull request #1877 from knnniggett/polkit
only install polkit rules on systems with systemd
2017-05-10 12:52:38 -04:00
Andrew Bauer 0d6a20fa9b only install polkit rules on systems with systemd 2017-05-10 10:54:56 -05:00
Andrew Bauer 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
Andrew Bauer 3ec90f1d0e Update zoneminder.spec
zmf was removed from the project. update rpm specfile accordingly
2017-05-10 10:05:52 -05:00
Andrew Bauer 4aac04af1c Merge pull request #1876 from mastertheknife/fixzmimageconflicts
Fix merge conflicts in zm_image.cpp
2017-05-10 09:57:07 -05:00
Kfir Itzhak 0584454aa8 Fix conflicts in Image::Initialise() caused by merging #1810 and #1823 2017-05-10 17:37:25 +03: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 074332730c Merge pull request #1787 from MarkosVakondios/1786-Dockerfile-Xenial
1786 dockerfile xenial
2017-05-10 08:15:53 -05:00
Andrew Bauer 8fc199c65e Merge branch 'master' into 1786-Dockerfile-Xenial 2017-05-10 08:15:42 -05:00
Andrew Bauer f5c09d5a0b Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder 2017-05-10 08:08:55 -05:00
Andrew Bauer 6f3a273634 Merge branch 'abishai-master' 2017-05-10 08:07:50 -05:00
Andrew Bauer 2c0d322924 remove zmf.cpp to fix merge conflict 2017-05-10 08:07:08 -05: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 ed6a2f3636 Merge pull request #1755 from connortechnology/update_do_debian_release
Update do debian release
2017-05-10 09:06:17 -04:00
Isaac Connor f832dd30ea Merge pull request #1817 from mnoorenberghe/eslint
Add eslint configuration files extending Google's rules
2017-05-10 09:04:51 -04:00
Isaac Connor de24ba7120 Merge pull request #1779 from vajonam/1778-add-subtituteTags-for-exec
add the ability to add substitued tags to the commandline
2017-05-10 09:00:36 -04:00
Andrew Bauer 38297434d9 Merge branch 'IDDQDesnik-Ru_Translation' 2017-05-10 07:59:52 -05:00
Isaac Connor a5f71a917e Merge branch 'master' into update_do_debian_release 2017-05-10 08:59:09 -04:00
Andrew Bauer 3e550e1461 remove "Actual" key from ru lang file since that word is too common. 2017-05-10 07:59:04 -05:00
Andrew Bauer ef6a3b63af Merge branch 'Ru_Translation' of https://github.com/IDDQDesnik/ZoneMinder into IDDQDesnik-Ru_Translation 2017-05-10 07:58:31 -05:00
Isaac Connor ec85d9a6a7 if zm.conf exists, rename to zm.conf.new 2017-05-10 08:57:47 -04:00
Andrew Bauer 06009f3b16 Merge pull request #1661 from connortechnology/add_scale_to_frame_view
Add scale to frame view
2017-05-10 07:56:36 -05:00
Andrew Bauer 62d6509708 Merge pull request #1818 from SteveGilvarry/743-Swap_to_PNG
Swap to PNG
2017-05-10 07:55:07 -05:00
Andrew Bauer 021c136640 Merge branch 'mastertheknife-armv7_neon' 2017-05-10 07:47:04 -05:00
Andrew Bauer ccc2cc832f Merge branch 'armv7_neon' of https://github.com/mastertheknife/ZoneMinder into mastertheknife-armv7_neon 2017-05-10 07:45:58 -05:00
Andrew Bauer e6c60737e9 Merge pull request #1756 from SteveGilvarry/zmf_goodbye
Remove zmf
2017-05-10 07:07:22 -05:00
Andrew Bauer 747583e9f4 Merge pull request #1810 from mastertheknife/ssse3_improvements
Minor zm_image SSSE3 improvements
2017-05-10 07:06:33 -05:00
Andrew Bauer 7e430e29b2 Delete version.enc
extraneous file
2017-05-09 18:46:59 -05:00
Isaac Connor 3215f2e702 merge latest updates 2017-05-09 16:57:28 -04:00
Andy Bauer 12fc011a29 1.30.4 release 2017-05-09 09:54:48 -05:00
Isaac Connor 5607af0027 Merge pull request #1873 from connortechnology/master
update ubuntu builds with dependencies on php-apcu and php-apc and php-apcu-bc
2017-05-08 21:37:52 -04:00
Isaac Connor 62f9465452 add php-apc and apcu 2017-05-08 21:36:42 -04:00
Isaac Connor ff368f2b6f add php-apc and apcu 2017-05-08 21:35:49 -04:00
Andrew Bauer 31b52197a2 Update zoneminder.spec
change rpm package requirements relating to php-pecl-apcu
2017-05-08 10:35:32 -05:00
Andrew Bauer fd35ac37c5 Update zoneminder.spec
fix %autosetup parameters
2017-05-08 10:18:21 -05:00
Andrew Bauer a857e68aad rpmspecfile change
add flags to %autosetup to make it patch friendly
2017-05-05 12:20:12 -05:00
Andrew Bauer 0fff85c106 Merge pull request #1872 from connortechnology/fix_zms_auth
fix uridecode(password) to uridecode(value)
2017-05-05 09:09:57 -05:00
Isaac Connor 8251e7ac03 fix uridecode(password) to uridecode(value) 2017-05-05 09:47:15 -04:00
Isaac Connor d903f7e6e9 Merge pull request #1871 from connortechnology/master
Clean up ubuntu builds
2017-05-05 09:46:24 -04:00
Isaac Connor 7b81f0464b Due to switch to apc for caching in api, don't need the tmp dirs 2017-05-05 09:45:36 -04:00
Isaac Connor a8d216d9c7 Due to switch to apc for caching in api, don't need the tmp dirs 2017-05-05 09:44:42 -04:00
Andrew Bauer 44433ab9c6 Update README.Fedora 2017-05-05 08:43:49 -05:00
Isaac Connor bccddcad88 Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder 2017-05-05 09:42:24 -04:00
Isaac Connor a5a52249a0 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-05-05 09:42:08 -04:00
Andrew Bauer 2e8022419b Delete zmstreamer.cpp again
we previously deleted this file with commit 4837585601 but it came back like a zombie that would not die. Deleting zmstreamer.cpp again.
2017-05-05 08:17:22 -05:00
Isaac Connor 351fe1eb93 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-05-03 16:40:57 -04:00
Andrew Bauer 895f5cc7c4 Update CMakeLists.txt
install the other bootstrap.php file under lib/cake
2017-05-03 13:25:11 -05:00
Andrew Bauer 752959f3fc Update CMakeLists.txt
typo - remove extra "/"
2017-05-03 12:35:54 -05:00
Andrew Bauer ebe7c21984 Update rsync_xfer.sh 2017-05-02 13:44:34 -05:00
Andy Bauer fd8aa62927 bump 1.30.3 release 2017-05-02 13:25:56 -05:00