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
e2df0b74d4
remove including state.js.php as it has nothing to do with this pr
2017-05-29 09:51:31 -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
123aaad080
add applySort function, and the sorting init code
2017-05-25 15:03:30 -04:00
229c8c6e23
Mmove Right buttons to the left, because there is no more room on the right anymore, move the script that sets up the sorting to js/console.js
2017-05-25 15:03:10 -04:00
09c0b47568
remove no longer used styles, and increase the width of the Mark Column to accomodate the up/down arrows
2017-05-25 15:02:30 -04:00
aacfea735e
always include bootstrap, and include jquery
2017-05-25 15:00:44 -04:00
afce83d289
Merge branch 'master' into dragndrop_monitor_sorting
2017-05-25 14:31:41 -04:00
a18079c1cc
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-25 14:30:15 -04:00
31b5a99b43
remove old code to do sequence up/down arrows, replace with jquery sortable
2017-05-25 14:30:07 -04:00
043d722651
braces,whitespace
2017-05-25 14:26:49 -04:00
eb684086de
Merge branch 'master' into dragndrop_monitor_sorting
2017-05-25 14:13:47 -04:00
1bd3369909
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-25 14:13:37 -04:00
b9736ad2f2
merge from sa the ajax file to apply the sorting.
2017-05-25 14:08:04 -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
48ad0b77fc
merge updates for newer releases of packages
2017-05-23 14:39:31 -04:00
5f1b084cc5
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-23 14:27:07 -04:00
655839e56a
Allow NULLS in various fields
2017-05-23 14:20:19 -04:00
433515dba9
Allow NULLS in LinkedMonitors
2017-05-23 14:14:24 -04:00
b828f0501c
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-23 14:07:19 -04:00
739d1e5304
Add lines to Convert db to allow NULLS
2017-05-23 14:07:10 -04:00
4347ee1258
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-23 10:41:40 -04:00
13265a8f4f
undo StorageAreas contents
2017-05-23 10:41:21 -04:00
efa29b6a64
Merge pull request #1891 from SteveGilvarry/master
...
Revert h264 README.md changes again.......................
2017-05-23 20:27:00 +10:00
Isaac Connor
Isaac Connor
Steve Gilvarry