Commit Graph

6578 Commits

Author SHA1 Message Date
Isaac Connor 02be907692 Merge branch 'release-1.30.5' into release-1.30 2019-02-22 10:44:22 -05:00
Isaac Connor 09cdc5a6df update version to 1.30.5 2019-02-22 10:38:47 -05:00
Isaac Connor eccab15681 merge fix for use of abs 2019-02-22 10:35:26 -05:00
Isaac Connor 33ff7de899 Now that we are dynamically allocating safer_username and safer_password, need to free them. Also, don't strlen them multiple times for efficiency 2019-02-22 10:18:18 -05:00
Steve Gilvarry c0fa2cc335 Safer_username and safer_login should be based on the username and login (#2482)
(lengths * 2)+1. Control input lengths at user input
2019-02-22 10:16:11 -05:00
digital-gnome b6a1885167 fix generated video download (#2002)
Fixes out of memory php error when downloading large generated video files
2017-11-18 19:02:56 -05:00
Isaac Connor c3930bb2ab workaround to mak sure that minTimeSecs and maxTimeSecs have values 2017-09-21 16:42:22 -04:00
Isaac Connor 9eb489288a fix typo maxiumum to maximum 2017-09-21 11:07:13 -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
Isaac Connor 58d47de699 Merge pull request #1869 from jedelbo/1868-spell-remSocketFile-correctly
Fix spelling of remSocketFile
2017-04-29 07:46:12 -04:00
Joergen Edelbo fb5668c9ef Fix spelling of remSocketFile 2017-04-29 09:02:35 +02:00
Isaac Connor f866e92bd2 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-04-26 15:55:35 -04:00
Isaac Connor 17052d1d91 get rid of rules.rej and rules.orig from some old merge problem 2017-04-26 15:53:54 -04:00
Isaac Connor dae4689b9c remove .rej and .orig 2017-04-26 15:51:54 -04:00
Isaac Connor da8a8f390e remove .rej and .orig 2017-04-26 15:51:49 -04:00
Isaac Connor d5ae0b8c3c Merge pull request #1862 from knnniggett/ZM_SKIN_NAME
fix skin path in export_functions
2017-04-26 13:53:30 -04:00
Andrew Bauer 1a565a47f2 fix skin path in export_functions 2017-04-26 12:17:01 -05:00
Andrew Bauer 3870ca1ec0 Update redhat.rst
typo
2017-04-26 09:48:15 -05:00
Isaac Connor ff71777ee6 Merge pull request #1861 from josh4trunks/ctype
Use ctype_digit
2017-04-25 09:58:01 -04:00
Joshua Ruehlig 05a141bf78 Update database.php 2017-04-24 23:40:52 -07:00
Joshua Ruehlig ca1e8a13fe Update database.php.default 2017-04-24 23:40:21 -07:00
Isaac Connor 0c236e9033 Merge pull request #1860 from josh4trunks/josh4trunks-patch-1
Update documentation
2017-04-24 12:35:35 -04:00
Andrew Bauer ba3e9a9151 Update rsync_xfer.sh
typo
2017-04-21 18:57:42 -05:00
Andrew Bauer c60c3bf67c Update rsync_xfer.sh
rsync to different folders depending on distro type
2017-04-21 18:57:10 -05:00
Joshua Ruehlig 7e3c0e42b7 Update zm.conf.in
Add possible formats for ZM_DB_HOST
2017-04-21 10:56:48 -07:00
Joshua Ruehlig 6779bd74b0 Update multiserver.rst
No longer needed since https://github.com/ZoneMinder/ZoneMinder/pull/1470
2017-04-21 10:44:37 -07:00
Joshua Ruehlig 0728b935c0 Update ubuntu.rst
I'm not a linux/ubuntu guy, but I am 90% sure this is correct =P
2017-04-21 10:43:16 -07:00
Andrew Bauer 6e28955b9a Update rsync_xfer.sh
packpack deploy - change rsync parameters
2017-04-20 18:40:31 -05:00
Andrew Bauer fac47694ed Update rsync_xfer.sh
travis deploy - modify rsync parameters
2017-04-20 12:10:48 -05:00
Andrew Bauer e90e6b13e9 Update rsync_xfer.sh
spelling
2017-04-19 07:22:03 -05:00