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
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
0ccce76ef8
Convert ru_ru.php to UTF-8
...
In koi8-r encoding, some menu items are not displayed in the web interface. With UTF-8 encoding all displayed correctly.
2015-12-31 16:58:56 +03: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
d8e2444cd3
Merge pull request #1210 from SteveGilvarry/storageareas
...
Restore missing docs to storageareas branch
2015-12-31 07:59:27 -05: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
3dc4467dc0
restore missing docs
2015-12-31 15:35:50 +11:00
3a18a62bc6
Add ServerId column when inserting log line into database
2015-12-30 08:29:45 -05:00
6537b61c36
put Storage Path in prompt when filesystem monitor doesn't exist in db
2015-12-30 08:08:01 -05:00
659b3f37f5
Stylistic fix
2015-12-29 21:08:24 -08:00
28bf4dfe7b
Add option for strict host key checking
2015-12-29 16:34:11 -08:00
f38f216f59
Merge branch 'master' into storageareas
2015-12-29 14:59:44 -05:00
13689d7a7d
Merge branch 'storageareas' into newpointone
...
Conflicts:
web/lang/en_gb.php
web/skins/classic/views/filter.php
2015-12-28 13:13:49 -05:00
98b6ef36d4
Merge branch 'multi-server' into newpointone
...
Conflicts:
src/zm_monitor.cpp
2015-12-28 13:13:15 -05:00
8a29d946bc
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
...
Conflicts:
web/lang/en_gb.php
web/skins/classic/views/filter.php
2015-12-28 13:11:53 -05:00
63352ac7c9
changelog update
2015-12-28 13:10:27 -05:00
d5df756a6d
Merge pull request #1207 from SteveGilvarry/Storageareasfix
...
Remove comma preventing db create script running
2015-12-28 12:06:11 -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
eb2829a680
Remove comma preventing db create script running
2015-12-29 00:04:17 +11: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
07af49511c
Load Storage Object so that we can print it's path
2015-12-24 15:33:46 -05:00
d943488475
add sub Storage
2015-12-24 15:32:30 -05:00
92ddd57942
include storage path when saying an event is too young to delete
2015-12-24 15:28:36 -05:00
ec0d6359a0
Merge branch 'newpointone' of isaac.internal.point-one.com:ZoneMinder.p1 into newpointone
2015-12-24 15:26:24 -05:00
Steve Gilvarry
Andrew Bauer
Isaac Connor
Andrew Bauer
RBxx
Isaac Connor
Isaac Connor
Adam Reiser
Isaac Connor