Isaac Connor
|
efba7be9c7
|
switch back to int i... google style guide says to use signed counters in for loops. Ok. Get's rid of compiler warning because i_nales is signed.
|
2017-07-05 13:08:16 -04:00 |
|
Isaac Connor
|
8c19b129d7
|
more wip
|
2017-07-04 12:33:01 -04:00 |
|
Isaac Connor
|
f87a89a5ce
|
more fixes
|
2017-07-04 11:51:23 -04:00 |
|
Isaac Connor
|
f183a74b0a
|
increase the wait time for waiting for zmdc to startup
|
2017-07-04 10:11:57 -04:00 |
|
Isaac Connor
|
d7950bd732
|
Merge branch 'master' into knnniggett-configfiles
|
2017-07-03 21:53:47 -04:00 |
Andrew Bauer
|
9be0e43618
|
Update README.Redhat7
|
2017-06-30 07:36:22 -05:00 |
|
Isaac Connor
|
121aba0308
|
add parenthesis around truth value to quieten compiler
|
2017-06-29 15:41:21 -04:00 |
Isaac Connor
|
decb83eb46
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-06-29 15:39:20 -04:00 |
|
Isaac Connor
|
76cb2f83e1
|
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
|
2017-06-29 15:37:18 -04:00 |
|
Isaac Connor
|
562519fdad
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-06-29 15:23:59 -04:00 |
|
Isaac Connor
|
a886d30aa7
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-06-29 15:08:06 -04:00 |
|
Isaac Connor
|
a263de144b
|
fixup defaults for Filter
|
2017-06-29 15:00:17 -04:00 |
|
Isaac Connor
|
69509689e0
|
debian stretch prefers libmariadbclient-dev and libgcrypt11-dev
|
2017-06-29 08:41:18 -04:00 |
Isaac Connor
|
6fc1581b9e
|
use a monitor object instead of just a db array.
|
2017-06-28 20:33:53 -04:00 |
|
Isaac Connor
|
7a85e22bfc
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-06-28 16:22:16 -04:00 |
|
Isaac Connor
|
7ecce473f6
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-06-28 16:13:45 -04:00 |
|
Isaac Connor
|
c926f733ea
|
There should be a blank line here
|
2017-06-28 16:13:33 -04:00 |
|
Isaac Connor
|
1b71114fb9
|
put * outside of quoted filename spec
|
2017-06-28 15:26:34 -04:00 |
|
Isaac Connor
|
93ecf69381
|
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
|
2017-06-28 15:23:26 -04:00 |
|
Isaac Connor
|
621d2e0e41
|
remove debug code
|
2017-06-28 15:18:12 -04:00 |
|
Isaac Connor
|
8b1459a510
|
fixes for cambozola on ie, and fixes to setting fixed widths
|
2017-06-28 15:17:55 -04:00 |
|
Isaac Connor
|
ed4da1e8bc
|
change to single quotes
|
2017-06-28 14:27:09 -04:00 |
|
Isaac Connor
|
323cd3540d
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-06-28 11:58:23 -04:00 |
|
Isaac Connor
|
f4fdbabf96
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-06-28 11:32:33 -04:00 |
|
Isaac Connor
|
a1d1a6a0d4
|
fix Options and and Protocol which can be NULL
|
2017-06-28 11:32:18 -04:00 |
|
Andrew Bauer
|
a656f4a6cd
|
Update zoneminder.conf.in
rpm specfile - make el6 script alias match el7 & f25
|
2017-06-28 10:04:28 -05:00 |
|
Isaac Connor
|
1ef25ae1f3
|
switch to single quotes where possible
|
2017-06-28 11:03:35 -04:00 |
|
Isaac Connor
|
7c877798ea
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-06-28 10:53:41 -04:00 |
|
Isaac Connor
|
9ba9495ae0
|
whitespace, braces, move pod doc to bottom. No functional changes
|
2017-06-28 10:53:35 -04:00 |
|
Isaac Connor
|
12ee5c697b
|
fixup copying package files to zmrepo
|
2017-06-28 10:38:52 -04:00 |
|
Isaac Connor
|
90696331a9
|
Merge branch 'master' into storageareas
|
2017-06-26 21:58:11 -04:00 |
|
Isaac Connor
|
983a11f3d9
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2017-06-26 21:10:11 -04:00 |
|
Isaac Connor
|
f782aeccd9
|
fix view is view_video, not action=niew_video
|
2017-06-26 21:09:54 -04:00 |
|
Isaac Connor
|
62d6394923
|
finish roughing in ffmpeg_input
|
2017-06-26 16:55:49 -04:00 |
|
Andrew Bauer
|
043b382bdd
|
include conf.d folder contents in debian packaging (#1934)
|
2017-06-26 14:44:33 -04:00 |
|
Isaac Connor
|
f71e5261f5
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-06-26 14:43:20 -04:00 |
|
Isaac Connor
|
3a113899ed
|
whitespace and braces fixing
|
2017-06-26 14:29:45 -04:00 |
|
Isaac Connor
|
c1b8105c0e
|
only include csrf if it's going to be used. This fixes view_video using up all ram sending a video file
|
2017-06-26 14:23:54 -04:00 |
|
Isaac Connor
|
6db9a78dab
|
add compressing options to the sample logrotate config
|
2017-06-26 12:17:49 -04:00 |
|
Isaac Connor
|
d97d156efb
|
Don't do csrf for view_video
|
2017-06-26 11:48:26 -04:00 |
|
Isaac Connor
|
923c8358bc
|
Don't do csrf for view_video
|
2017-06-26 11:45:34 -04:00 |
Isaac Connor
|
24dd3a8c66
|
fix loading starttime of event
|
2017-06-26 11:20:10 -04:00 |
|
Isaac Connor
|
0d8e4656dc
|
fix braces
|
2017-06-26 09:46:07 -04:00 |
|
Isaac Connor
|
92c25dc58c
|
Merge branch 'master' into storageareas
|
2017-06-23 10:43:46 -04:00 |
|
Isaac Connor
|
5d63bc47cc
|
I believe level should be effectiveLevel here
|
2017-06-23 10:22:37 -04:00 |
|
Isaac Connor
|
52f1e2d235
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-06-23 10:11:52 -04:00 |
|
Isaac Connor
|
12c3bde8b0
|
remove debug
|
2017-06-23 10:04:50 -04:00 |
|
Isaac Connor
|
25b66e9629
|
whitespace mostly.
|
2017-06-23 09:58:54 -04:00 |
|
Isaac Connor
|
3a00656c3f
|
WHen can't open file log, turn on terminal logging so that the message goes somewhere useful.
|
2017-06-23 09:58:19 -04:00 |
|
Isaac Connor
|
2460e1acd9
|
fix whitspace
|
2017-06-23 09:58:01 -04:00 |