ab85239d82
fix braces, invert control directions when camera is flipped
2017-05-30 19:49:30 -04:00
0bb2bed32c
remove blank lines, do some better escaping
2017-05-30 19:47:35 -04:00
cca2c624f9
fix spelling mistake
2017-05-30 19:42:38 -04:00
83d6f415b3
cleanup whitespace
2017-05-30 14:07:37 -04:00
b96f5cf49d
more merges/fixes from SA
2017-05-30 13:50:24 -04:00
8b3b9eb30e
more merges/fixes from SA
2017-05-30 13:47:30 -04:00
1a43334113
Use NULLs instead of '' when saving things
2017-05-30 13:38:57 -04:00
c7b52bd998
fix logging dirs
2017-05-30 13:14:43 -04:00
e9a0474cf7
add back required lines with a comment
2017-05-30 12:04:12 -04:00
c5288a172d
fix merge problem
2017-05-30 11:57:20 -04:00
5bbe13f98f
update cycle from SA
2017-05-30 11:53:05 -04:00
a75488e0f3
flat and dark skins add some padding to the header, which makes it extend beyond 99%. These lines are not needed
2017-05-30 11:52:04 -04:00
5c5aafb1e8
white space and a check for mid being set to quiet error messages
2017-05-30 11:37:48 -04:00
59d00b20b1
fix fetchImage
2017-05-30 11:35:52 -04:00
f88abfcb4d
the liveStream element now has the monitorId appended to it, to be consistent with montage so we can reuse code
2017-05-30 11:26:57 -04:00
3062fe43f3
revert csrf on login page. csrf needs to be off in order for zmNinja to work
2017-05-30 11:25:25 -04:00
fe2155dd1a
merges from SA
2017-05-30 11:15:00 -04:00
e5616d5719
Merge ../ZoneMinder.connortechnology
2017-05-30 10:53:20 -04:00
8b0b938fc8
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder
2017-05-30 10:51:15 -04:00
772df5b41b
add a cast to quiet compiler warning
2017-05-30 10:31:02 -04:00
b948bc5403
fix a few extra )
2017-05-30 10:21:34 -04:00
b979712892
fix inconsistent whitespace
2017-05-30 10:01:02 -04:00
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
c616a3b3b7
fix some bad to '' changes
2017-05-30 09:39:01 -04:00
ff08843d68
replace with ''
2017-05-30 09:10:41 -04:00
b23c45c9bc
bump version to 1.31.0
2017-05-29 10:00:46 -04:00
77d068fc48
merge updates from SA relating to building debian packages
2017-05-26 22:25:59 -04:00
94151b0318
put back changelog
2017-05-26 14:30:21 -04:00
9f25495844
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-26 14:19:22 -04:00
86361b59c7
convert double quotes to single quotes
2017-05-26 14:17:28 -04:00
0c25cecb93
Fix some spacing
2017-05-26 13:36:20 -04:00
368567335b
remove some quotes
2017-05-26 13:33:34 -04:00
a2bf5df2d4
remove some quotes
2017-05-26 13:27:55 -04:00
4dee84f799
More updates from SA ( #1895 )
...
* merge from SA, includes StorageAreas support
* merge from SA. Adds the ability to pass in additional options when connecting
* fix options, to remove indexes
* remove StorageAreas stuff
* put back AutoMessage and AutoVideo logic
* fixup docs, cleanup
2017-05-26 13:21:32 -04:00
ed12dab648
fixup docs, cleanup
2017-05-26 13:13:34 -04:00
cc83582a90
put back AutoMessage and AutoVideo logic
2017-05-26 13:04:08 -04:00
8fde33ee1b
remove StorageAreas stuff
2017-05-26 12:30:20 -04:00
a18079c1cc
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-25 14:30:15 -04:00
043d722651
braces,whitespace
2017-05-25 14:26:49 -04:00
1bd3369909
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-25 14:13:37 -04:00
90517ed0aa
Merge branch 'master' into add_was_alarmed
2017-05-25 14:01:27 -04:00
9cbafde1ac
add libboost to build-depends
2017-05-25 13:54:43 -04:00
242c8fc0ab
fix options, to remove indexes
2017-05-23 15:01:22 -04:00
94ce60aa1b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-23 14:57:54 -04:00
b92f05672a
No reason to watch upstream, when we are upstream
2017-05-23 14:56:53 -04:00
099e099352
We need boost for the packetqueue
2017-05-23 14:51:25 -04:00
392ade2e1a
change default logrotate policy to rotate daily and compress
2017-05-23 14:51:09 -04:00
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
51946da564
add a -f so that removing the directories actually removes the contents
2017-05-23 14:44:21 -04:00
c4d7703867
Merge a new apache.conf that supports fcgid
2017-05-23 14:42:31 -04:00
Isaac Connor
Isaac Connor