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

9131 Commits

Author SHA1 Message Date
Kfir Itzhak 0d864b2c6c Fix delta self-test introduced in #1823 failing (#1878) 
* Fix self-test introduced in #1823 failing and improve logging about the failure

* Remove unnecessary newline added by previous commit
 2017-05-11 07:13:04 -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 e5030ff998 fix version 2017-05-10 13:39:03 -04:00
Isaac Connor b684ee5ad5 Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas 
Conflicts:
	distros/ubuntu1604/control
 2017-05-10 13:34:39 -04:00
Andrew Bauer 55563c4eb9 Update startpackpack.sh 
revert version override
 2017-05-10 12:27:56 -05:00
Isaac Connor 553ef919a5 fixup apcu additions for jessie 2017-05-10 13:19:30 -04:00
Isaac Connor ebed3ad0dc Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-05-10 13:16:25 -04:00
Isaac Connor fd44ff4e60 Merge branch 'master' into storageareas 2017-05-10 13:16:08 -04:00
Andrew Bauer da7ea06a14 patch packpack builds 2017-05-10 12:08:33 -05:00
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
Isaac Connor 62f2344b55 add code of conduct 1.4 2017-05-10 09:42:30 -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
Isaac Connor e3a05d7cfc prompt when invalid command line option is given. 2017-05-09 16:57:02 -04:00
Andy Bauer 12fc011a29 1.30.4 release 2017-05-09 09:54:48 -05:00
Isaac Connor ede35f49bb Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-05-08 22:18:20 -04:00
Isaac Connor e5be2c7b51 default to ZoneMinder fork and each the type of build 2017-05-08 22:18:16 -04:00
Isaac Connor fc52766606 Merge branch 'master' into storageareas 2017-05-08 22:17:37 -04: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
Isaac Connor 25baac4e24 Merge branch 'release-1.30.3' 2017-05-08 21:32:59 -04:00