Isaac Connor
|
845ef6c05a
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-05-30 10:22:17 -04:00 |
Isaac Connor
|
32daa4faed
|
Merge branch 'master' into storageareas
|
2017-05-30 10:21:01 -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
|
9d464dfa24
|
remove errant comma
|
2017-05-26 22:24:57 -04:00 |
|
Isaac Connor
|
9226fb8a37
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-05-26 22:24:14 -04:00 |
|
Isaac Connor
|
cbb3903e5e
|
fix merge
|
2017-05-26 22:24:02 -04:00 |
|
Isaac Connor
|
72738166fe
|
fix read replay for install and upload
|
2017-05-26 22:21:51 -04:00 |
|
Isaac Connor
|
2e673e49c8
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-05-26 22:20:50 -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
|
2a2d667afb
|
remove some quotes
|
2017-05-26 13:27:06 -04:00 |
|
Isaac Connor
|
34f4abb549
|
Merge branch 'master' into storageareas
|
2017-05-26 13:17:51 -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
|
766d5b7dcc
|
fix merge
|
2017-05-25 16:33:09 -04:00 |
|
Isaac Connor
|
5f6c7008fd
|
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
|
2017-05-25 15:32:13 -04:00 |
|
Isaac Connor
|
bb051fd509
|
fix merge conflicts
|
2017-05-25 15:29:31 -04:00 |
|
Isaac Connor
|
7cfa0b12ec
|
Merge branch 'dragndrop_monitor_sorting' into storageareas
|
2017-05-25 15:26:04 -04:00 |
|
Isaac Connor
|
123aaad080
|
add applySort function, and the sorting init code
|
2017-05-25 15:03:30 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
aacfea735e
|
always include bootstrap, and include jquery
|
2017-05-25 15:00:44 -04:00 |
|
Isaac Connor
|
afce83d289
|
Merge branch 'master' into dragndrop_monitor_sorting
|
2017-05-25 14:31:41 -04:00 |
|
Isaac Connor
|
a18079c1cc
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-05-25 14:30:15 -04:00 |
|
Isaac Connor
|
31b5a99b43
|
remove old code to do sequence up/down arrows, replace with jquery sortable
|
2017-05-25 14:30:07 -04:00 |
|
Isaac Connor
|
043d722651
|
braces,whitespace
|
2017-05-25 14:26:49 -04:00 |
|
Isaac Connor
|
eb684086de
|
Merge branch 'master' into dragndrop_monitor_sorting
|
2017-05-25 14:13:47 -04:00 |
|
Isaac Connor
|
1bd3369909
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-05-25 14:13:37 -04:00 |
|
Isaac Connor
|
f1917a6bc1
|
delete old Makefile.am
|
2017-05-25 14:10:29 -04:00 |
|
Isaac Connor
|
b9736ad2f2
|
merge from sa the ajax file to apply the sorting.
|
2017-05-25 14:08:04 -04:00 |
|
Isaac Connor
|
9cbafde1ac
|
add libboost to build-depends
|
2017-05-25 13:54:43 -04:00 |
|
Isaac Connor
|
a515041e14
|
Merge branch 'master' into storageareas
|
2017-05-23 15:17:46 -04:00 |
|
Isaac Connor
|
5c673d5659
|
google style
|
2017-05-23 15:07:50 -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 |