d3115219d2
Merge branch 'master' into feature-h264-videostorage
2017-05-15 21:52:58 -04:00
33092e4022
Allow API authentication using the `auth` query parameter containing an auth. hash. ( #1845 )
...
* Allow API authentication using the `auth` query parameter containing an auth. hash.
Fixes #1827
The same auth. hash for zms is used here. This allows consumers to use the API without sending the password in the query string and not require forging logins via the login form.
* Move logger.php's global Debug function to Logger::Debug to avoid polluting globals
This avoids a conflict with CakePHP when logger.php gets included indrectly from API code.
* Protect action=login when ZM_ENABLE_CSRF_MAGIC is enabled
2017-05-15 21:51:48 -04:00
65b4a7ccdb
merge simple debug output changes from storageareas
2017-05-15 16:40:46 -04:00
f6950ab6fe
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-15 12:51:22 -04:00
1e45146db8
Merge pull request #1881 from mastertheknife/aarch64_neon
...
Add AArch64 ARM Neon code (complements #1823 )
2017-05-14 07:49:19 -05:00
a10b658e23
Merge pull request #1874 from connortechnology/code_of_conduct
...
add code of conduct 1.4
2017-05-14 07:31:25 +10:00
5df7499da4
Move ARM Neon data prefetches to be after the loads
2017-05-13 19:08:18 +03:00
c66deb564f
Added ARM Neon AArch64 versions of delta
2017-05-13 09:19:13 +03:00
8315be69de
Update zm_image.cpp
...
remove extra }
2017-05-12 18:46:19 -05:00
ec2b6235a0
Added ARM Neon AArch64 version of fastblend
2017-05-12 22:59:08 +03:00
773ad363be
Enable neon (Advanced SIMD) in hwcaps_detect() on AArch64
2017-05-12 22:43:30 +03:00
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
55563c4eb9
Update startpackpack.sh
...
revert version override
2017-05-10 12:27:56 -05:00
da7ea06a14
patch packpack builds
2017-05-10 12:08:33 -05:00
de1c463195
Merge pull request #1877 from knnniggett/polkit
...
only install polkit rules on systems with systemd
2017-05-10 12:52:38 -04:00
0d6a20fa9b
only install polkit rules on systems with systemd
2017-05-10 10:54:56 -05: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
4aac04af1c
Merge pull request #1876 from mastertheknife/fixzmimageconflicts
...
Fix merge conflicts in zm_image.cpp
2017-05-10 09:57:07 -05:00
0584454aa8
Fix conflicts in Image::Initialise() caused by merging #1810 and #1823
2017-05-10 17:37:25 +03:00
3abce50540
Merge pull request #1863 from connortechnology/no_overwrite_zm_conf
...
don't overwrite zm.conf
2017-05-10 10:01:13 -04:00
62f2344b55
add code of conduct 1.4
2017-05-10 09:42:30 -04:00
074332730c
Merge pull request #1787 from MarkosVakondios/1786-Dockerfile-Xenial
...
1786 dockerfile xenial
2017-05-10 08:15:53 -05:00
8fc199c65e
Merge branch 'master' into 1786-Dockerfile-Xenial
2017-05-10 08:15:42 -05:00
f5c09d5a0b
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder
2017-05-10 08:08:55 -05:00
6f3a273634
Merge branch 'abishai-master'
2017-05-10 08:07:50 -05:00
2c0d322924
remove zmf.cpp to fix merge conflict
2017-05-10 08:07:08 -05:00
c4f471d967
Merge branch 'master' of https://github.com/abishai/ZoneMinder into abishai-master
2017-05-10 08:06:48 -05:00
ed6a2f3636
Merge pull request #1755 from connortechnology/update_do_debian_release
...
Update do debian release
2017-05-10 09:06:17 -04:00
f832dd30ea
Merge pull request #1817 from mnoorenberghe/eslint
...
Add eslint configuration files extending Google's rules
2017-05-10 09:04:51 -04:00
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
38297434d9
Merge branch 'IDDQDesnik-Ru_Translation'
2017-05-10 07:59:52 -05:00
a5f71a917e
Merge branch 'master' into update_do_debian_release
2017-05-10 08:59:09 -04:00
3e550e1461
remove "Actual" key from ru lang file since that word is too common.
2017-05-10 07:59:04 -05:00
ef6a3b63af
Merge branch 'Ru_Translation' of https://github.com/IDDQDesnik/ZoneMinder into IDDQDesnik-Ru_Translation
2017-05-10 07:58:31 -05:00
ec85d9a6a7
if zm.conf exists, rename to zm.conf.new
2017-05-10 08:57:47 -04:00
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
62d6509708
Merge pull request #1818 from SteveGilvarry/743-Swap_to_PNG
...
Swap to PNG
2017-05-10 07:55:07 -05:00
021c136640
Merge branch 'mastertheknife-armv7_neon'
2017-05-10 07:47:04 -05:00
ccc2cc832f
Merge branch 'armv7_neon' of https://github.com/mastertheknife/ZoneMinder into mastertheknife-armv7_neon
2017-05-10 07:45:58 -05:00
e6c60737e9
Merge pull request #1756 from SteveGilvarry/zmf_goodbye
...
Remove zmf
2017-05-10 07:07:22 -05:00
747583e9f4
Merge pull request #1810 from mastertheknife/ssse3_improvements
...
Minor zm_image SSSE3 improvements
2017-05-10 07:06:33 -05:00
7e430e29b2
Delete version.enc
...
extraneous file
2017-05-09 18:46:59 -05:00
3215f2e702
merge latest updates
2017-05-09 16:57:28 -04:00
12fc011a29
1.30.4 release
2017-05-09 09:54:48 -05:00
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
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
25baac4e24
Merge branch 'release-1.30.3'
2017-05-08 21:32:59 -04:00
a7b377bf35
delete merge conflict files
2017-05-08 21:30:31 -04:00
Isaac Connor
Matt N
Isaac Connor
Andrew Bauer
Steve Gilvarry
Kfir Itzhak
Andrew Bauer
Andy Bauer