arjunrc
|
47b2cdbb96
|
added CMD_QUIT to kill zms via command
|
2016-01-29 09:58:50 -05:00 |
Andrew Bauer
|
f85ed2d5b4
|
Merge pull request #1252 from ZoneMinder/multi-server
Add Debug/Info lines reporting multi-server status
|
2016-01-28 07:01:39 -06:00 |
Isaac Connor
|
f275498790
|
Add Debug for sql used to load other than local monitors
|
2016-01-26 21:00:32 -05:00 |
|
Isaac Connor
|
902065a6c1
|
Add Debug for sql used to load local monitors
|
2016-01-26 20:59:07 -05:00 |
|
Isaac Connor
|
3a0b28f168
|
Add Debug/Info lines reporting multi-server status
|
2016-01-26 20:53:34 -05:00 |
tikismoke
|
f7bc8c7f0d
|
Update gettingstarted.rst
Correct MODECT by NODECT if using zmTrigger
|
2016-01-26 20:14:49 +01:00 |
|
Andy Bauer
|
fa168027b3
|
Fix PelcoP checksum calculation
|
2016-01-24 07:45:04 -06:00 |
|
Andrew Bauer
|
50b113cd02
|
Merge pull request #1189 from marcolino7/master
PTZ - Added autostop to Down command on FI8918W
|
2016-01-24 07:40:30 -06:00 |
|
arjunrc
|
680ab0236c
|
updated ubuntu instructions
|
2016-01-24 07:47:25 -05:00 |
|
Andrew Bauer
|
2f80f26f92
|
Merge pull request #1232 from ZoneMinder/remove_google_fonts
remove Google open Sans external import
|
2016-01-23 10:24:49 -06:00 |
Brandon Odegard
|
54a11175ff
|
Reduce default size of body font in Flat skin
|
2016-01-22 13:56:41 -06:00 |
|
Brandon Odegard
|
1ca9ace84d
|
Fixed missing semicolons
|
2016-01-22 13:31:02 -06:00 |
Brandon Odegard
|
9c72579c2e
|
Corrected typo in function info
|
2016-01-22 12:12:39 -06:00 |
|
Brandon Odegard
|
029c1efa31
|
Corrected update version comment to 1.28.110
Corrected version comment to indicate database update from 1.28.109 to 1.28.110
|
2016-01-22 10:48:47 -06:00 |
|
Brandon Odegard
|
8753ee98e5
|
Corrected update version comment to 1.28.109
Corrected version comment to indicate an update from 1.28.108 to 1.28.109
|
2016-01-22 10:46:46 -06:00 |
|
arjunrc
|
0ef6d55e8f
|
resolves #1231 - ubuntu package from source instructions added
|
2016-01-22 09:39:19 -05:00 |
Isaac Connor
|
b2c311c306
|
Merge pull request #1244 from pliablepixels/do_debian_package-mods
Do debian package mods
|
2016-01-22 09:02:14 -05:00 |
|
Pliable Pixels
|
0ade8abd6a
|
typo
|
2016-01-20 16:11:35 -05:00 |
|
Pliable Pixels
|
8dd35d6057
|
modifications for general users
|
2016-01-20 16:09:12 -05:00 |
|
Andy Bauer
|
22ef473202
|
Use the full name
|
2016-01-19 10:22:51 -06:00 |
|
Andy Bauer
|
a17bde0784
|
update hostname logic
|
2016-01-19 10:13:36 -06:00 |
|
Andy Bauer
|
e2b00bbe1f
|
use local user @ hostname.local for author
|
2016-01-19 08:05:40 -06:00 |
|
Isaac Connor
|
25eba33adb
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-01-18 21:39:36 -05:00 |
|
Isaac Connor
|
e9c9caf201
|
Add a local build type
|
2016-01-18 21:39:33 -05:00 |
|
Isaac Connor
|
74c0d40b19
|
Merge pull request #1240 from knnniggett/zmtrigger
zmtrigger - process off+time delay condition
|
2016-01-18 10:37:26 -05:00 |
|
Andy Bauer
|
66c66106f5
|
Process off+time delay condition
|
2016-01-15 20:31:31 -06:00 |
|
Isaac Connor
|
4520902dd2
|
use trim on values when saving.
|
2016-01-14 09:37:41 -05:00 |
|
Isaac Connor
|
3ebeaec8ab
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-01-10 20:59:01 -05:00 |
|
Isaac Connor
|
47d4331d62
|
Add Hostname Column to create script, to match update
|
2016-01-10 20:58:45 -05:00 |
|
Isaac Connor
|
2d86e7713d
|
increase height of logout popup to fit content
|
2016-01-08 12:14:01 -05:00 |
|
Andrew Bauer
|
7e4a12e7f7
|
Merge pull request #1233 from ZoneMinder/multi-server
Multi server
|
2016-01-08 10:11:49 -06:00 |
|
Isaac Connor
|
574d94e9b6
|
Merge branch 'master' into multi-server
|
2016-01-08 10:16:26 -05:00 |
|
Isaac Connor
|
d48ec1cfbe
|
Add AddNewServer and Hostname entries
|
2016-01-08 10:15:41 -05:00 |
|
Isaac Connor
|
99dfaa97fa
|
User Name instead of ServerName and Hostname instead of ServerHostname
|
2016-01-08 10:15:21 -05:00 |
|
Isaac Connor
|
d13829c6f3
|
Add Hostname to list of servers, since we have the space for it.
|
2016-01-08 10:15:06 -05:00 |
|
Isaac Connor
|
5ce26ac4df
|
Change logrotate defaults to daily/rotate 7, which works better with logcheck
|
2016-01-08 09:59:03 -05:00 |
|
Isaac Connor
|
53bd342f85
|
remove Google open Sans external import
|
2016-01-08 09:46:14 -05:00 |
|
Andy Bauer
|
d96757ba13
|
update changelog
|
2016-01-06 12:46:01 -06:00 |
|
Isaac Connor
|
3066f66f25
|
add sphinx-rtd-theme
|
2016-01-05 13:21:54 -05:00 |
|
Isaac Connor
|
99c5af6036
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-01-05 09:04:21 -05:00 |
|
Isaac Connor
|
41a8249ed9
|
update my package building script
|
2016-01-05 09:04:04 -05:00 |
|
Andrew Bauer
|
3a19c3c6e3
|
Merge pull request #1223 from ZoneMinder/multi-server
Multi server
|
2016-01-05 07:04:49 -06:00 |
|
Isaac Connor
|
f0486e5b5e
|
fix dumb mistake, undefing ZM_SERVBER_ID after setting it.
|
2016-01-04 22:07:07 -05:00 |
Simpler1
|
0d5d43251f
|
Added lines to db/zm_create.sql.in for two cameras
|
2016-01-04 15:51:11 -05:00 |
Isaac Connor
|
44f3b99d24
|
change logic to show server column if any servers are defined. Reason is that once you have setup 1, you want to know which cameras have not been assigned a server yet
|
2016-01-04 14:59:04 -05:00 |
Isaac Connor
|
6ae1597671
|
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
|
2016-01-04 14:51:47 -05:00 |
|
Isaac Connor
|
273ab6c5c6
|
Only show Server column when more than 1 Servers are defined
|
2016-01-04 14:51:24 -05:00 |
|
Andrew Bauer
|
fae3012124
|
Merge pull request #1222 from ZoneMinder/multi-server
Multi server
|
2016-01-04 13:10:28 -06:00 |
|
Isaac Connor
|
f5db14d823
|
return empty for the non multi-server case
|
2016-01-04 13:46:05 -05:00 |
|
Isaac Connor
|
45fc689203
|
implement Width and Height functions, and test for image rotation and output opposite dimension. Fixes #1220
|
2016-01-04 13:15:50 -05:00 |