Isaac Connor
|
bedc1d3e13
|
fix spacing
|
2017-06-05 16:29:04 -04:00 |
|
Isaac Connor
|
b948bc5403
|
fix a few extra )
|
2017-05-30 10:21:34 -04:00 |
|
Isaac Connor
|
b979712892
|
fix inconsistent whitespace
|
2017-05-30 10:01:02 -04:00 |
|
Isaac Connor
|
3c9d8f4ec6
|
Don't do the qqq thing to remove whitespace from the config descriptions. HTML doesn't care about it. That kind of parsing should be done at display time.
|
2017-05-30 09:44:43 -04:00 |
|
Isaac Connor
|
c616a3b3b7
|
fix some bad to '' changes
|
2017-05-30 09:39:01 -04:00 |
|
Isaac Connor
|
ff08843d68
|
replace with ''
|
2017-05-30 09:10:41 -04:00 |
|
Isaac Connor
|
77d068fc48
|
merge updates from SA relating to building debian packages
|
2017-05-26 22:25:59 -04:00 |
Isaac Connor
|
86361b59c7
|
convert double quotes to single quotes
|
2017-05-26 14:17:28 -04:00 |
|
Isaac Connor
|
0c25cecb93
|
Fix some spacing
|
2017-05-26 13:36:20 -04:00 |
|
Isaac Connor
|
368567335b
|
remove some quotes
|
2017-05-26 13:33:34 -04:00 |
|
Isaac Connor
|
a2bf5df2d4
|
remove some quotes
|
2017-05-26 13:27:55 -04:00 |
|
Isaac Connor
|
ed12dab648
|
fixup docs, cleanup
|
2017-05-26 13:13:34 -04:00 |
|
Isaac Connor
|
cc83582a90
|
put back AutoMessage and AutoVideo logic
|
2017-05-26 13:04:08 -04:00 |
|
Isaac Connor
|
8fde33ee1b
|
remove StorageAreas stuff
|
2017-05-26 12:30:20 -04:00 |
|
Isaac Connor
|
a18079c1cc
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-05-25 14:30:15 -04:00 |
|
Isaac Connor
|
043d722651
|
braces,whitespace
|
2017-05-25 14:26:49 -04:00 |
|
Isaac Connor
|
1bd3369909
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-05-25 14:13:37 -04:00 |
|
Isaac Connor
|
9cbafde1ac
|
add libboost to build-depends
|
2017-05-25 13:54:43 -04:00 |
|
Isaac Connor
|
242c8fc0ab
|
fix options, to remove indexes
|
2017-05-23 15:01:22 -04:00 |
|
Isaac Connor
|
94ce60aa1b
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-05-23 14:57:54 -04:00 |
|
Isaac Connor
|
b92f05672a
|
No reason to watch upstream, when we are upstream
|
2017-05-23 14:56:53 -04:00 |
|
Isaac Connor
|
099e099352
|
We need boost for the packetqueue
|
2017-05-23 14:51:25 -04:00 |
|
Isaac Connor
|
392ade2e1a
|
change default logrotate policy to rotate daily and compress
|
2017-05-23 14:51:09 -04:00 |
|
Isaac Connor
|
7756d5067c
|
the changelog entries are irrelevant, so don't keep them. Package scripts will generate their contents
|
2017-05-23 14:46:54 -04:00 |
|
Isaac Connor
|
51946da564
|
add a -f so that removing the directories actually removes the contents
|
2017-05-23 14:44:21 -04:00 |
|
Isaac Connor
|
c4d7703867
|
Merge a new apache.conf that supports fcgid
|
2017-05-23 14:42:31 -04:00 |
|
Isaac Connor
|
48ad0b77fc
|
merge updates for newer releases of packages
|
2017-05-23 14:39:31 -04:00 |
|
Isaac Connor
|
5f1b084cc5
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-05-23 14:27:07 -04:00 |
|
Isaac Connor
|
655839e56a
|
Allow NULLS in various fields
|
2017-05-23 14:20:19 -04:00 |
|
Isaac Connor
|
433515dba9
|
Allow NULLS in LinkedMonitors
|
2017-05-23 14:14:24 -04:00 |
|
Isaac Connor
|
b828f0501c
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-05-23 14:07:19 -04:00 |
|
Isaac Connor
|
739d1e5304
|
Add lines to Convert db to allow NULLS
|
2017-05-23 14:07:10 -04:00 |
|
Isaac Connor
|
4347ee1258
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-05-23 10:41:40 -04:00 |
|
Isaac Connor
|
13265a8f4f
|
undo StorageAreas contents
|
2017-05-23 10:41:21 -04:00 |
Steve Gilvarry
|
efa29b6a64
|
Merge pull request #1891 from SteveGilvarry/master
Revert h264 README.md changes again.......................
|
2017-05-23 20:27:00 +10:00 |
|
SteveGilvarry
|
55df858ded
|
Revert h264 README.md changes again.......................
|
2017-05-23 20:25:36 +10:00 |
|
Isaac Connor
|
75dc774a08
|
Continue to support non-USE_DEEP_STORAGE option
|
2017-05-22 21:21:49 -04:00 |
|
Isaac Connor
|
dbf83831ff
|
merge from SA. Adds the ability to pass in additional options when connecting
|
2017-05-20 10:32:41 -04:00 |
|
Isaac Connor
|
d76d65f475
|
merge from SA, includes StorageAreas support
|
2017-05-20 10:32:04 -04:00 |
|
Isaac Connor
|
54c9c37b21
|
Merge ../ZoneMinder.connortechnology
|
2017-05-20 09:55:06 -04:00 |
|
Isaac Connor
|
03495e8c23
|
fix
|
2017-05-20 09:54:03 -04:00 |
|
Isaac Connor
|
bb50784ed2
|
braces
|
2017-05-20 09:53:35 -04:00 |
|
Isaac Connor
|
0da03ca5e8
|
braces/whitespace
|
2017-05-20 09:41:13 -04:00 |
|
Isaac Connor
|
23633ce30b
|
braces
|
2017-05-20 09:06:12 -04:00 |
|
Isaac Connor
|
a5ee8307d0
|
Merge ../ZoneMinder.connortechnology
|
2017-05-20 09:03:57 -04:00 |
|
Isaac Connor
|
457d7e5c94
|
code documentation, whitespace
|
2017-05-20 09:03:51 -04:00 |
|
Isaac Connor
|
6ec5a18a35
|
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder
|
2017-05-20 09:03:09 -04:00 |
|
Isaac Connor
|
dba947346a
|
braces
|
2017-05-20 09:03:04 -04:00 |
|
Isaac Connor
|
381d44439a
|
merge SA. braces/whitespace debugging
|
2017-05-20 09:01:32 -04:00 |
|
Isaac Connor
|
c24c427409
|
braces
|
2017-05-20 08:57:53 -04:00 |