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
|
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 |
|
Isaac Connor
|
3dff8a5da5
|
update doc references to do_debian_package.sh
|
2017-04-24 17:01:24 -04:00 |
|
Isaac Connor
|
998aa2199b
|
fix message for consistency
|
2017-04-24 16:55:08 -04:00 |
|
Isaac Connor
|
4d851dc00f
|
Add Distribution guessing
|
2017-04-24 16:54:01 -04:00 |
|
Isaac Connor
|
c5d2652d1b
|
add code to specifically handle a release, and package versions
|
2017-04-24 16:50:33 -04:00 |
|
Isaac Connor
|
4b264251ac
|
Merge branch 'zones_on_montage' into storageareas
|
2017-04-24 14:47:38 -04:00 |
|
Isaac Connor
|
5a2ef571ef
|
fix scaling, zones now work. Add a Show/Hide Zones at the top
|
2017-04-24 14:47:30 -04:00 |
|
Isaac Connor
|
23f384407e
|
blah
|
2017-04-24 14:00:47 -04:00 |
|
Isaac Connor
|
0c236e9033
|
Merge pull request #1860 from josh4trunks/josh4trunks-patch-1
Update documentation
|
2017-04-24 12:35:35 -04:00 |
|
Isaac Connor
|
10dc6b98ca
|
fix if LIBAVRESAMPLE structure
|
2017-04-24 11:28:24 -04:00 |
|
Isaac Connor
|
12ffa60023
|
fix applying sorting to MOnitors.
|
2017-04-24 11:13:08 -04:00 |
|
Isaac Connor
|
83ba74ad66
|
work in progress, rough in adding the svg zones to montage
|
2017-04-24 11:11:54 -04:00 |
|
Isaac Connor
|
ef6c675c6a
|
work in progress, rough in adding the svg zones to montage
|
2017-04-24 11:11:44 -04:00 |
|
Andrew Bauer
|
ba3e9a9151
|
Update rsync_xfer.sh
typo
|
2017-04-21 18:57:42 -05:00 |
|
Andrew Bauer
|
c60c3bf67c
|
Update rsync_xfer.sh
rsync to different folders depending on distro type
|
2017-04-21 18:57:10 -05:00 |
|
Isaac Connor
|
bafbdc28ed
|
update to whats in master
|
2017-04-21 14:46:40 -04:00 |
|
Isaac Connor
|
a29ec6af62
|
revert to master
|
2017-04-21 14:44:36 -04:00 |
|
Joshua Ruehlig
|
7e3c0e42b7
|
Update zm.conf.in
Add possible formats for ZM_DB_HOST
|
2017-04-21 10:56:48 -07:00 |
|
Joshua Ruehlig
|
6779bd74b0
|
Update multiserver.rst
No longer needed since https://github.com/ZoneMinder/ZoneMinder/pull/1470
|
2017-04-21 10:44:37 -07:00 |
|
Joshua Ruehlig
|
0728b935c0
|
Update ubuntu.rst
I'm not a linux/ubuntu guy, but I am 90% sure this is correct =P
|
2017-04-21 10:43:16 -07:00 |
|
Isaac Connor
|
10732f039d
|
update to 1.31.0
|
2017-04-21 12:45:44 -04:00 |
|
Andrew Bauer
|
6e28955b9a
|
Update rsync_xfer.sh
packpack deploy - change rsync parameters
|
2017-04-20 18:40:31 -05:00 |
|
Andrew Bauer
|
fac47694ed
|
Update rsync_xfer.sh
travis deploy - modify rsync parameters
|
2017-04-20 12:10:48 -05:00 |
|
Isaac Connor
|
c8855c03fc
|
don't use a submodule for video.js
|
2017-04-20 10:50:42 -04:00 |
|
Isaac Connor
|
035b464b97
|
Revert "don't use external hosted video.js or moment.js"
This reverts commit fb2f8022a7.
|
2017-04-20 10:45:51 -04:00 |
|
Isaac Connor
|
dd4b93f130
|
add submodule video.js, using release tag v5.18.4
|
2017-04-20 10:35:32 -04:00 |
|
Isaac Connor
|
fb2f8022a7
|
don't use external hosted video.js or moment.js
|
2017-04-20 10:12:47 -04:00 |
|
Isaac Connor
|
3db38eb474
|
limit points to the limits of the monitor
|
2017-04-19 16:12:12 -04:00 |
|
Isaac Connor
|
c4ec01c0d2
|
fix compile when no libavresample
|
2017-04-19 14:28:37 -04:00 |
|
Isaac Connor
|
3ac9eac31e
|
Merge branch 'master' into storageareas
|
2017-04-19 14:16:20 -04:00 |