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

5700 Commits

Author SHA1 Message Date
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
Isaac Connor 3dc4467dc0 restore missing docs 2015-12-31 15:35:50 +11:00
Isaac Connor 3a18a62bc6 Add ServerId column when inserting log line into database 2015-12-30 08:29:45 -05:00
Isaac Connor 6537b61c36 put Storage Path in prompt when filesystem monitor doesn't exist in db 2015-12-30 08:08:01 -05:00
Adam Reiser 659b3f37f5 Stylistic fix 2015-12-29 21:08:24 -08:00
Adam Reiser 28bf4dfe7b Add option for strict host key checking 2015-12-29 16:34:11 -08:00
Isaac Connor f38f216f59 Merge branch 'master' into storageareas 2015-12-29 14:59:44 -05:00
Isaac Connor 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
Isaac Connor 98b6ef36d4 Merge branch 'multi-server' into newpointone 
Conflicts:
	src/zm_monitor.cpp
 2015-12-28 13:13:15 -05:00
Isaac Connor 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
Isaac Connor 63352ac7c9 changelog update 2015-12-28 13:10:27 -05:00
Isaac Connor d5df756a6d Merge pull request #1207 from SteveGilvarry/Storageareasfix 
Remove comma preventing db create script running
 2015-12-28 12:06:11 -05:00
Isaac Connor f357ea6ccd Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server 2015-12-28 11:53:04 -05:00
Isaac Connor ccded54937 put back missing col++ 2015-12-28 11:52:40 -05:00
SteveGilvarry eb2829a680 Remove comma preventing db create script running 2015-12-29 00:04:17 +11:00
SteveGilvarry 3f1c782ff7 Fix random extra semicolon 2015-12-28 16:29:04 +11:00
Andrew Bauer e6e8a75b64 Update zoneminder.f23.spec 2015-12-27 11:48:53 -06:00
Isaac Connor 07af49511c Load Storage Object so that we can print it's path 2015-12-24 15:33:46 -05:00
Isaac Connor d943488475 add sub Storage 2015-12-24 15:32:30 -05:00
Isaac Connor 92ddd57942 include storage path when saying an event is too young to delete 2015-12-24 15:28:36 -05:00
Isaac Connor ec0d6359a0 Merge branch 'newpointone' of isaac.internal.point-one.com:ZoneMinder.p1 into newpointone 2015-12-24 15:26:24 -05:00
Isaac Connor 177ed076a7 Make zmaudit only look at storage areas that are local 2015-12-24 15:25:56 -05:00
Isaac Connor 8dc7b3cee1 Merge branch 'master' into multi-server 2015-12-24 15:13:35 -05:00
Isaac Connor 492550b5ef Merge branch 'storageareas' into newpointone 
Conflicts:
	scripts/zmaudit.pl.in
 2015-12-24 12:36:40 -05:00
Isaac Connor c174d74987 Set MOnitorId and StorageID because the Event does not exist in the db 2015-12-24 12:36:16 -05:00
Isaac Connor 45987e92a9 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2015-12-24 12:34:55 -05:00
Isaac Connor dfa9a5a390 Add AUTOLOAD 2015-12-23 14:31:56 -05:00
Isaac Connor 9b6157a685 Merge branch 'newpointone' of isaac.internal.point-one.com:ZoneMinder.p1 into newpointone 2015-12-23 14:18:36 -05:00
Isaac Connor 1328492c64 fixes 2015-12-23 14:16:09 -05:00
Isaac Connor fc56b14c4a fixup sphinx theem 2015-12-23 14:06:29 -05:00
Isaac Connor 66a828b4d4 Merge pull request #1202 from SteveGilvarry/MissingRTDTheme 
Missing rtd theme
 2015-12-23 14:05:36 -05:00
Isaac Connor 33a3661958 cleanup, revent to openprint style objects 2015-12-23 14:03:40 -05:00
Isaac Connor 769b1f713c Merge branch 'multi-server' into storageareas 
Conflicts:
	distros/ubuntu1204/apache.conf
 2015-12-23 13:13:25 -05:00
Isaac Connor f32344c647 Add output options to the concat cmd line 2015-12-23 09:33:33 -05:00
SteveGilvarry abda4411e9 Revert to Default Theme, RTD will use their own and local builds default sphinx theme 2015-12-23 19:34:31 +11:00
SteveGilvarry 6e567e2878 Merge remote-tracking branch 'upstream/master' 2015-12-23 19:29:14 +11:00
Isaac Connor ac0425d14b sort events before testing and deleting. Makes the output easier to grok 2015-12-22 15:08:38 -05:00