d13829c6f3
Add Hostname to list of servers, since we have the space for it.
2016-01-08 10:15:06 -05:00
f0486e5b5e
fix dumb mistake, undefing ZM_SERVBER_ID after setting it.
2016-01-04 22:07:07 -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
f5db14d823
return empty for the non multi-server case
2016-01-04 13:46:05 -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
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
a2ebb0921f
Merge pull request #4 from knnniggett/multiserver-docs
...
Modify network topology, consistency changes
2016-01-01 17:20:46 +11:00
fa8574c3d1
Modify network topology, consistency changes
2015-12-31 10:24:34 -06:00
8e25b80252
bump version due to db change adding ServerId to Logs
2015-12-31 10:14:20 -05:00
12ee147bc7
Add a find_all function to return an array of Server objects
2015-12-31 10:13:48 -05:00
bfe4175fdf
Add Server to filters and log results
2015-12-31 10:13:25 -05:00
31ba0221ed
Add Server to filters and log results
2015-12-31 10:13:03 -05:00
983b47f6dc
Add Server columns
2015-12-31 09:09:57 -05:00
0c872c292f
Merge pull request #1201 from ZoneMinder/fix_zmaudit_monitors_starting_with_a_digit
...
Skip directories that have non-digits in them
2015-12-31 07:15:33 -06:00
072c11fa82
Fix image border
2015-12-31 16:53:38 +11:00
15fbf587db
Fix heading indentation
2015-12-31 16:45:22 +11:00
251d73ffe0
Edit Toc
2015-12-31 16:40:49 +11:00
3c2c393de6
Initial draft of Multi-server install docs
2015-12-31 16:24:56 +11:00
3a18a62bc6
Add ServerId column when inserting log line into database
2015-12-30 08:29:45 -05:00
f357ea6ccd
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-12-28 11:53:04 -05:00
ccded54937
put back missing col++
2015-12-28 11:52:40 -05:00
3f1c782ff7
Fix random extra semicolon
2015-12-28 16:29:04 +11:00
e6e8a75b64
Update zoneminder.f23.spec
2015-12-27 11:48:53 -06:00
8dc7b3cee1
Merge branch 'master' into multi-server
2015-12-24 15:13:35 -05:00
66a828b4d4
Merge pull request #1202 from SteveGilvarry/MissingRTDTheme
...
Missing rtd theme
2015-12-23 14:05:36 -05:00
abda4411e9
Revert to Default Theme, RTD will use their own and local builds default sphinx theme
2015-12-23 19:34:31 +11:00
6e567e2878
Merge remote-tracking branch 'upstream/master'
2015-12-23 19:29:14 +11:00
39bcb20dac
Skip directories that have non-digits in them
2015-12-22 12:59:37 -05:00
6df1425897
Slight update to allow the instantiation with no row or Id
2015-12-22 09:52:33 -05:00
1aa79c306b
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-12-22 09:47:45 -05:00
Isaac Connor
Isaac Connor
Isaac Connor
Andy Bauer
Steve Gilvarry
Andrew Bauer
Isaac Connor
SteveGilvarry