Isaac Connor
|
74fd3d4c3b
|
Fix installation of zm.conf.new instead of zm.conf
|
2017-05-15 16:25:48 -04:00 |
|
Isaac Connor
|
68aea50ca9
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-05-15 16:19:57 -04:00 |
Isaac Connor
|
facbf07391
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-05-15 16:19:36 -04:00 |
|
Isaac Connor
|
9bd6c99586
|
Merge branch 'master' into storageareas
|
2017-05-15 12:52:35 -04:00 |
|
Isaac Connor
|
f6950ab6fe
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-05-15 12:51:22 -04:00 |
Andrew Bauer
|
1e45146db8
|
Merge pull request #1881 from mastertheknife/aarch64_neon
Add AArch64 ARM Neon code (complements #1823)
|
2017-05-14 07:49:19 -05:00 |
Steve Gilvarry
|
a10b658e23
|
Merge pull request #1874 from connortechnology/code_of_conduct
add code of conduct 1.4
|
2017-05-14 07:31:25 +10:00 |
Kfir Itzhak
|
5df7499da4
|
Move ARM Neon data prefetches to be after the loads
|
2017-05-13 19:08:18 +03:00 |
|
Kfir Itzhak
|
c66deb564f
|
Added ARM Neon AArch64 versions of delta
|
2017-05-13 09:19:13 +03:00 |
|
Andrew Bauer
|
8315be69de
|
Update zm_image.cpp
remove extra }
|
2017-05-12 18:46:19 -05:00 |
|
Kfir Itzhak
|
ec2b6235a0
|
Added ARM Neon AArch64 version of fastblend
|
2017-05-12 22:59:08 +03:00 |
|
Kfir Itzhak
|
773ad363be
|
Enable neon (Advanced SIMD) in hwcaps_detect() on AArch64
|
2017-05-12 22:43:30 +03:00 |
|
Isaac Connor
|
e737d90120
|
If AuthHash not set, return '' instead of php producing a warning
|
2017-05-12 09:05:14 -04:00 |
|
Isaac Connor
|
62f645c36e
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-05-11 09:01:40 -04:00 |
|
Isaac Connor
|
a8818b3dd5
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-05-11 08:55:50 -04:00 |
|
Isaac Connor
|
1ddf4e32cf
|
Merge branch 'master' into storageareas
|
2017-05-11 08:55:42 -04:00 |
|
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 |