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 |
|
Isaac Connor
|
25baac4e24
|
Merge branch 'release-1.30.3'
|
2017-05-08 21:32:59 -04:00 |
|
Isaac Connor
|
a7b377bf35
|
delete merge conflict files
|
2017-05-08 21:30:31 -04:00 |
|
Isaac Connor
|
c510092356
|
delete merge conflict files
|
2017-05-08 21:30:28 -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 |
|
Isaac Connor
|
f9d106c618
|
Add a line for out-of-tree builds to do api/lib/Cake/bootstrap.php
|
2017-05-03 14:06:41 -04:00 |
|
Andrew Bauer
|
752959f3fc
|
Update CMakeLists.txt
typo - remove extra "/"
|
2017-05-03 12:35:54 -05:00 |
|
Isaac Connor
|
465c38692f
|
remove extra /
|
2017-05-03 12:59:15 -04:00 |
|
Isaac Connor
|
6b4c808c29
|
fix typo
|
2017-05-03 09:19:36 -04:00 |
|
Isaac Connor
|
219402c3d9
|
require php5-acpu
|
2017-05-03 09:04:55 -04:00 |
|
Isaac Connor
|
7def7e7868
|
add php-acpu as a dependency
|
2017-05-03 08:58:27 -04: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
|
f42004b4a1
|
don't overwrite zm.conf
|
2017-04-26 15:18:32 -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
|
b2fc959a50
|
Merge branch 'master' into update_do_debian_release
|
2017-04-24 17:01:56 -04:00 |
|
Isaac Connor
|
3dff8a5da5
|
update doc references to do_debian_package.sh
|
2017-04-24 17:01:24 -04:00 |
|
Isaac Connor
|
998aa2199b
|
fix message for consistency
|
2017-04-24 16:55:08 -04:00 |
|
Isaac Connor
|
4d851dc00f
|
Add Distribution guessing
|
2017-04-24 16:54:01 -04:00 |
|
Isaac Connor
|
c5d2652d1b
|
add code to specifically handle a release, and package versions
|
2017-04-24 16:50:33 -04:00 |
|
Isaac Connor
|
0c236e9033
|
Merge pull request #1860 from josh4trunks/josh4trunks-patch-1
Update documentation
|
2017-04-24 12:35:35 -04:00 |