ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,663 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

6663 Commits

Author SHA1 Message Date
Isaac Connor 69ddc7d34c Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-01-04 14:38:37 -05:00
Isaac Connor fb7b171d6e fix merge 2016-01-04 14:37:23 -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 b9f17a18d6 Merge branch 'multi-server' into storageareas 2016-01-04 14:09:41 -05:00
Isaac Connor f5db14d823 return empty for the non multi-server case 2016-01-04 13:46:05 -05:00
Isaac Connor 5144d3befb Merge branch 'rotate_dimensions_when_image_is_rotated' into storageareas 2016-01-04 13:19:09 -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
Simpler1 1432c6ae1f Added profiles for Wanscam-HW0025 and IPCC-7210W 2016-01-04 12:30:46 -05:00
Isaac Connor f72260733c Only do CORSHeaders if there is more than 1 server 2016-01-04 09:38:24 -05:00
Isaac Connor d256530896 return early if no servers are defined instead of logging a warning 2016-01-04 09:36:45 -05:00
Isaac Connor 33b8405e0d Merge branch 'multi-server' into storageareas 2016-01-03 11:57:07 -05:00
Isaac Connor c639822d62 When Server is not set, us ZM_BASE_PATH 2016-01-03 11:55:53 -05:00
Andrew Bauer e6340ac4c9 Merge pull request #1217 from ZoneMinder/multi-server 
Multi server
 2016-01-02 14:10:42 -06:00
Isaac Connor 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
Isaac Connor 4d1f837e6c Merge branch 'master' into multi-server 2016-01-02 14:43:36 -05:00
Isaac Connor e840eec2a4 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 
Conflicts:
	docs/installationguide/index.rst
 2016-01-02 14:43:04 -05:00
Isaac Connor bf2195828f Merge branch 'multi-server' into storageareas 
Conflicts:
	docs/installationguide/index.rst
 2016-01-02 14:42:47 -05:00
Isaac Connor 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
Andy Bauer a93f78b7e6 Bump rpm specfiles to 1.29.0 2016-01-02 10:35:52 -06:00
Andrew Bauer 299308dd49 Merge pull request #1172 from SteveGilvarry/change-log-updates 
Change log updates
 2016-01-02 08:44:06 -06:00
Steve Gilvarry 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
Andrew Bauer fc5de5a4f3 Merge pull request #1215 from ZoneMinder/multi-server 
Multi server
 2016-01-01 21:50:31 -06:00
Isaac Connor 54bff42fa0 Remove warnings when no server set 2016-01-01 21:27:30 -05:00
Isaac Connor fdf7a860db Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server 2016-01-01 21:22:43 -05:00
Isaac Connor 1da87332b7 blah 2016-01-01 21:22:12 -05:00
Isaac Connor 5c0e4aa172 Merge branch 'multi-server' into storageareas 2016-01-01 17:11:01 -05:00
Isaac Connor 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
Isaac Connor 468f997e4c Soft error, with logging when the filter element doesn't exist 2016-01-01 16:36:29 -05:00
Isaac Connor ec7504f925 Translate ServerId to Server in Log record before sending back 2016-01-01 16:33:28 -05:00
Isaac Connor 93dbc3f0c1 Merge multi-server updates and bump version 2016-01-01 16:31:02 -05:00
Andrew Bauer 99b65f0191 Update CMakeLists.txt 2016-01-01 13:39:48 -06:00
Andrew Bauer f0495e816a Merge pull request #1213 from knnniggett/1.29.0 
Bump version to 1.29.0
 2016-01-01 10:29:56 -06:00
Andy Bauer 94ce84af40 Bump version to 1.29.0 2016-01-01 10:15:36 -06:00
Andrew Bauer c827f55580 Merge pull request #1040 from ZoneMinder/multi-server 
Multi server
 2016-01-01 09:36:04 -06:00
Andy Bauer 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
Andrew Bauer d5ec34889e Merge pull request #1211 from SteveGilvarry/multiserver-docs 
Adding multiserver documentation
 2016-01-01 09:01:31 -06:00
Steve Gilvarry a2ebb0921f Merge pull request #4 from knnniggett/multiserver-docs 
Modify network topology, consistency changes
 2016-01-01 17:20:46 +11:00
Andrew Bauer fa8574c3d1 Modify network topology, consistency changes 2015-12-31 10:24:34 -06:00
Isaac Connor 8e25b80252 bump version due to db change adding ServerId to Logs 2015-12-31 10:14:20 -05:00
Isaac Connor 12ee147bc7 Add a find_all function to return an array of Server objects 2015-12-31 10:13:48 -05:00
Isaac Connor bfe4175fdf Add Server to filters and log results 2015-12-31 10:13:25 -05:00
Isaac Connor 31ba0221ed Add Server to filters and log results 2015-12-31 10:13:03 -05:00
Isaac Connor 983b47f6dc Add Server columns 2015-12-31 09:09:57 -05:00
RBxx 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
Andrew Bauer 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
Isaac Connor d8e2444cd3 Merge pull request #1210 from SteveGilvarry/storageareas 
Restore missing docs to storageareas branch
 2015-12-31 07:59:27 -05:00
SteveGilvarry 072c11fa82 Fix image border 2015-12-31 16:53:38 +11:00
SteveGilvarry 15fbf587db Fix heading indentation 2015-12-31 16:45:22 +11:00
SteveGilvarry 251d73ffe0 Edit Toc 2015-12-31 16:40:49 +11:00
SteveGilvarry 3c2c393de6 Initial draft of Multi-server install docs 2015-12-31 16:24:56 +11:00