Isaac Connor
|
151126e70c
|
fix placing of KILL_DELAY constant and turn it to 1/10th of a second instead of 1/100/th
|
2017-04-28 11:43:36 -04:00 |
|
Isaac Connor
|
9b66368040
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-04-28 11:10:50 -04:00 |
|
Isaac Connor
|
20c699366e
|
scale is a percentage, so use the rescale function
|
2017-04-28 11:10:43 -04:00 |
|
Isaac Connor
|
df7161a4ea
|
merge some stuff I did in vueip
|
2017-04-28 10:54:20 -04:00 |
|
Isaac Connor
|
b166579f4b
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-04-28 10:36:04 -04:00 |
|
Isaac Connor
|
6827e0412c
|
white and google style
|
2017-04-28 10:34:48 -04:00 |
|
Isaac Connor
|
d498e30e37
|
switch to quilt
|
2017-04-28 10:34:07 -04:00 |
|
Isaac Connor
|
e9e913c043
|
fixup whitespace. Switch to useconds and sleep and sleep for less time when starting up and comment out the 5 second shutdown wait.
|
2017-04-28 10:32:05 -04:00 |
|
Isaac Connor
|
2344f533ba
|
debuild has a problem with the debian dir being a link, so mv it instead
|
2017-04-27 12:18:27 -04:00 |
|
Isaac Connor
|
8fad889c82
|
Don't delete the docs anymore
|
2017-04-27 12:15:39 -04:00 |
|
Isaac Connor
|
48d9167c5d
|
Don't apply patches.
|
2017-04-27 12:05:47 -04:00 |
|
Isaac Connor
|
2b0561b481
|
delete the old merge files
|
2017-04-27 12:05:13 -04:00 |
|
Isaac Connor
|
6a3531c2ef
|
use the mootools shipped with zm
|
2017-04-27 12:01:55 -04:00 |
|
Isaac Connor
|
6e94e57f57
|
don't default the cgi-bin path to /zm
|
2017-04-27 11:56:46 -04:00 |
|
Isaac Connor
|
9dd251c1d5
|
direcoty shouldn't have the distro in it apparently
|
2017-04-27 11:52:24 -04:00 |
|
Isaac Connor
|
ce00047175
|
try out quilt format again
|
2017-04-27 11:46:36 -04:00 |
|
Isaac Connor
|
eac1ebfb5a
|
bump up standards version
|
2017-04-27 11:46:07 -04:00 |
|
Isaac Connor
|
4121e4b061
|
put back the code that generates the .orig.tar.gz and deletes .git etc
|
2017-04-27 11:45:10 -04:00 |
|
Isaac Connor
|
7076b92af4
|
fix if on exit status of build
|
2017-04-27 09:01:47 -04:00 |
|
Isaac Connor
|
fa0e1b728c
|
xMerge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-04-26 20:42:39 -04:00 |
|
Isaac Connor
|
5f9268addd
|
fix stsatus code deteciton
|
2017-04-26 20:42:28 -04:00 |
|
Isaac Connor
|
3d35a01240
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-04-26 16:49:16 -04:00 |
|
Isaac Connor
|
7d3dc84c12
|
echo out what distro we are building for
|
2017-04-26 16:49:13 -04:00 |
|
Isaac Connor
|
4360431e98
|
fix line that generates .desktop
|
2017-04-26 16:46:11 -04:00 |
|
Isaac Connor
|
188ac8e097
|
die if build failed.
|
2017-04-26 16:45:23 -04:00 |
|
Isaac Connor
|
8bc8a17554
|
use a substitution to generate zoneminder.desktop
|
2017-04-26 16:40:17 -04:00 |
|
Isaac Connor
|
9d3e2a7b0f
|
test
|
2017-04-26 16:31:30 -04:00 |
|
Isaac Connor
|
948aceee30
|
move the line that installs zoneminder.desktop into the misc/CMakeLists.txt
|
2017-04-26 16:11:45 -04:00 |
|
Isaac Connor
|
01c4242d2d
|
Merge branch 'update_do_debian_release' into storageareas
|
2017-04-26 16:03:46 -04:00 |
|
Isaac Connor
|
20345df3eb
|
Merge branch 'icon' into storageareas
|
2017-04-26 15:58:26 -04:00 |
|
Isaac Connor
|
dce39bb2a9
|
Merge branch 'master' into storageareas
|
2017-04-26 15:58:17 -04:00 |
|
Isaac Connor
|
f866e92bd2
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-04-26 15:55:35 -04:00 |
|
Isaac Connor
|
17052d1d91
|
get rid of rules.rej and rules.orig from some old merge problem
|
2017-04-26 15:53:54 -04:00 |
|
Isaac Connor
|
dae4689b9c
|
remove .rej and .orig
|
2017-04-26 15:51:54 -04:00 |
|
Isaac Connor
|
da8a8f390e
|
remove .rej and .orig
|
2017-04-26 15:51:49 -04:00 |
|
Isaac Connor
|
4a0d2ec123
|
This should add a menu entry
|
2017-04-26 15:51:21 -04:00 |
|
Isaac Connor
|
681be621b1
|
add /usr/share/zoneminder/icons to install list
|
2017-04-26 15:51:04 -04:00 |
|
Isaac Connor
|
d54ccaf122
|
install the icons directory to wherever zoneminder is
|
2017-04-26 15:46:55 -04:00 |
|
Isaac Connor
|
882a2095b8
|
I believe this will cause the .deb to include a menu entry... not sure though
|
2017-04-26 15:46:19 -04:00 |
|
Isaac Connor
|
3f708c1a1b
|
add a line to install the .desktop file under /usr/share/applications/
|
2017-04-26 15:21:58 -04:00 |
|
Isaac Connor
|
e39a757c46
|
add an icon made from favicon.ico and a .desktop file to be install in /usr/share/applications/
|
2017-04-26 15:21:28 -04:00 |
|
Isaac Connor
|
f42004b4a1
|
don't overwrite zm.conf
|
2017-04-26 15:18:32 -04:00 |
Isaac Connor
|
d5ae0b8c3c
|
Merge pull request #1862 from knnniggett/ZM_SKIN_NAME
fix skin path in export_functions
|
2017-04-26 13:53:30 -04:00 |
Andrew Bauer
|
1a565a47f2
|
fix skin path in export_functions
|
2017-04-26 12:17:01 -05:00 |
Andrew Bauer
|
3870ca1ec0
|
Update redhat.rst
typo
|
2017-04-26 09:48:15 -05:00 |
|
Isaac Connor
|
088fa0192b
|
Merge branch 'master' into storageareas
|
2017-04-25 10:00:14 -04:00 |
|
Isaac Connor
|
ff71777ee6
|
Merge pull request #1861 from josh4trunks/ctype
Use ctype_digit
|
2017-04-25 09:58:01 -04:00 |
Joshua Ruehlig
|
05a141bf78
|
Update database.php
|
2017-04-24 23:40:52 -07:00 |
|
Joshua Ruehlig
|
ca1e8a13fe
|
Update database.php.default
|
2017-04-24 23:40:21 -07:00 |
|
Isaac Connor
|
b2fc959a50
|
Merge branch 'master' into update_do_debian_release
|
2017-04-24 17:01:56 -04:00 |