25eba33adb
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2016-01-18 21:39:36 -05:00
e9c9caf201
Add a local build type
2016-01-18 21:39:33 -05:00
74c0d40b19
Merge pull request #1240 from knnniggett/zmtrigger
...
zmtrigger - process off+time delay condition
2016-01-18 10:37:26 -05:00
66c66106f5
Process off+time delay condition
2016-01-15 20:31:31 -06:00
4520902dd2
use trim on values when saving.
2016-01-14 09:37:41 -05:00
3ebeaec8ab
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2016-01-10 20:59:01 -05:00
47d4331d62
Add Hostname Column to create script, to match update
2016-01-10 20:58:45 -05:00
2d86e7713d
increase height of logout popup to fit content
2016-01-08 12:14:01 -05:00
7e4a12e7f7
Merge pull request #1233 from ZoneMinder/multi-server
...
Multi server
2016-01-08 10:11:49 -06:00
574d94e9b6
Merge branch 'master' into multi-server
2016-01-08 10:16:26 -05:00
d48ec1cfbe
Add AddNewServer and Hostname entries
2016-01-08 10:15:41 -05:00
99dfaa97fa
User Name instead of ServerName and Hostname instead of ServerHostname
2016-01-08 10:15:21 -05:00
d13829c6f3
Add Hostname to list of servers, since we have the space for it.
2016-01-08 10:15:06 -05:00
5ce26ac4df
Change logrotate defaults to daily/rotate 7, which works better with logcheck
2016-01-08 09:59:03 -05:00
53bd342f85
remove Google open Sans external import
2016-01-08 09:46:14 -05:00
d96757ba13
update changelog
2016-01-06 12:46:01 -06:00
3066f66f25
add sphinx-rtd-theme
2016-01-05 13:21:54 -05:00
99c5af6036
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2016-01-05 09:04:21 -05:00
41a8249ed9
update my package building script
2016-01-05 09:04:04 -05:00
3a19c3c6e3
Merge pull request #1223 from ZoneMinder/multi-server
...
Multi server
2016-01-05 07:04:49 -06:00
f0486e5b5e
fix dumb mistake, undefing ZM_SERVBER_ID after setting it.
2016-01-04 22:07:07 -05:00
0d5d43251f
Added lines to db/zm_create.sql.in for two cameras
2016-01-04 15:51:11 -05:00
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
6ae1597671
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2016-01-04 14:51:47 -05:00
273ab6c5c6
Only show Server column when more than 1 Servers are defined
2016-01-04 14:51:24 -05:00
fae3012124
Merge pull request #1222 from ZoneMinder/multi-server
...
Multi server
2016-01-04 13:10:28 -06:00
f5db14d823
return empty for the non multi-server case
2016-01-04 13:46:05 -05:00
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
1432c6ae1f
Added profiles for Wanscam-HW0025 and IPCC-7210W
2016-01-04 12:30:46 -05:00
f72260733c
Only do CORSHeaders if there is more than 1 server
2016-01-04 09:38:24 -05:00
d256530896
return early if no servers are defined instead of logging a warning
2016-01-04 09:36:45 -05:00
c639822d62
When Server is not set, us ZM_BASE_PATH
2016-01-03 11:55:53 -05:00
e6340ac4c9
Merge pull request #1217 from ZoneMinder/multi-server
...
Multi server
2016-01-02 14:10:42 -06:00
4d1f837e6c
Merge branch 'master' into multi-server
2016-01-02 14:43:36 -05:00
bd71c4999d
test for Server in servers_by_Id as well as just having a value for ServerId. Fixup export as well.
2016-01-02 14:36:37 -05:00
a93f78b7e6
Bump rpm specfiles to 1.29.0
2016-01-02 10:35:52 -06:00
299308dd49
Merge pull request #1172 from SteveGilvarry/change-log-updates
...
Change log updates
2016-01-02 08:44:06 -06:00
0799f10ad2
Update to current 1.29.0-rc1 changes
...
This will still need to be run for the final release as already seeing
1 unreleased change against master that I edited out of this to match
1.29.0-rc1 release
2016-01-02 22:22:16 +11:00
fc5de5a4f3
Merge pull request #1215 from ZoneMinder/multi-server
...
Multi server
2016-01-01 21:50:31 -06:00
54bff42fa0
Remove warnings when no server set
2016-01-01 21:27:30 -05:00
fdf7a860db
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2016-01-01 21:22:43 -05:00
cf7e168872
Fix populating the server filter and then fix filtering by server. Also introduce robustness and consolel ogging when a filter doesn't exist
2016-01-01 17:10:37 -05:00
468f997e4c
Soft error, with logging when the filter element doesn't exist
2016-01-01 16:36:29 -05:00
ec7504f925
Translate ServerId to Server in Log record before sending back
2016-01-01 16:33:28 -05:00
99b65f0191
Update CMakeLists.txt
2016-01-01 13:39:48 -06:00
f0495e816a
Merge pull request #1213 from knnniggett/1.29.0
...
Bump version to 1.29.0
2016-01-01 10:29:56 -06:00
94ce84af40
Bump version to 1.29.0
2016-01-01 10:15:36 -06:00
c827f55580
Merge pull request #1040 from ZoneMinder/multi-server
...
Multi server
2016-01-01 09:36:04 -06:00
ea99b2a62a
Move design notes out of the image. Assign Red and Green colors to Storage & dB Servers in the diagram.
2016-01-01 09:20:11 -06:00
d5ec34889e
Merge pull request #1211 from SteveGilvarry/multiserver-docs
...
Adding multiserver documentation
2016-01-01 09:01:31 -06:00
Isaac Connor
Isaac Connor
Andy Bauer
Simpler1
Isaac Connor
Isaac Connor
Steve Gilvarry