455f6d5b7b
have to use ->Path() as {Path} might not be filled in
2016-01-04 15:57:35 -05:00
0d5d43251f
Added lines to db/zm_create.sql.in for two cameras
2016-01-04 15:51:11 -05:00
88f902ea20
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-01-04 15:29:10 -05:00
17adc2b4e5
Rough in a Monitor class
2016-01-04 15:27:42 -05:00
1504b368db
Warning to Debug for Storage class with no Id
2016-01-04 15:21:23 -05:00
196339b48b
Add new object classes to autoconf
2016-01-04 15:19:46 -05:00
1819f8ecad
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-01-04 15:17:43 -05:00
6e685ec8c8
add Monitor object class and use it in zmaudit.pl to print out path where monitor should have been
2016-01-04 15:13:01 -05:00
f04ba9c87e
linefeed when saying that a db monitor doesn't exist in fs
2016-01-04 15:05:49 -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
75f6da3526
Merge branch 'multi-server' into storageareas
2016-01-04 14:53:52 -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
1918b9b576
bump
2016-01-04 14:44:36 -05:00
69ddc7d34c
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-01-04 14:38:37 -05:00
fb7b171d6e
fix merge
2016-01-04 14:37:23 -05:00
fae3012124
Merge pull request #1222 from ZoneMinder/multi-server
...
Multi server
2016-01-04 13:10:28 -06:00
b9f17a18d6
Merge branch 'multi-server' into storageareas
2016-01-04 14:09:41 -05:00
f5db14d823
return empty for the non multi-server case
2016-01-04 13:46:05 -05:00
5144d3befb
Merge branch 'rotate_dimensions_when_image_is_rotated' into storageareas
2016-01-04 13:19:09 -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
33b8405e0d
Merge branch 'multi-server' into storageareas
2016-01-03 11:57:07 -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
b1205bcaa9
Merge branch 'multi-server' into storageareas
...
Conflicts:
CMakeLists.txt
configure.ac
scripts/zmaudit.pl.in
version
2016-01-02 14:45:24 -05:00
4d1f837e6c
Merge branch 'master' into multi-server
2016-01-02 14:43:36 -05:00
e840eec2a4
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
...
Conflicts:
docs/installationguide/index.rst
2016-01-02 14:43:04 -05:00
bf2195828f
Merge branch 'multi-server' into storageareas
...
Conflicts:
docs/installationguide/index.rst
2016-01-02 14:42:47 -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
1da87332b7
blah
2016-01-01 21:22:12 -05:00
5c0e4aa172
Merge branch 'multi-server' into storageareas
2016-01-01 17:11:01 -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
93dbc3f0c1
Merge multi-server updates and bump version
2016-01-01 16:31:02 -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
Simpler1
Isaac Connor
Andrew Bauer
Steve Gilvarry