Isaac Connor
|
8a14d6f4d2
|
Don't not load the event if it was videod before
|
2016-05-30 14:57:46 -04:00 |
Isaac Connor
|
409545b386
|
Add concat to the usage line and format it better
|
2016-05-30 14:08:38 -04:00 |
Isaac Connor
|
326c4f1fee
|
Check for existence of libraries specified in LD_PRELOAD and warn about them not existing
|
2016-05-30 14:08:08 -04:00 |
Isaac Connor
|
4469f909fa
|
Add support for DefaultVideo to video generation
|
2016-05-30 14:07:40 -04:00 |
Isaac Connor
|
07878e3e13
|
Put back the code that makes getDiskPercent look in the storagearea
|
2016-05-30 10:43:51 -04:00 |
Isaac Connor
|
886d88b184
|
Merge branch 'improve_filter' into storageareas
|
2016-05-30 09:30:18 -04:00 |
Isaac Connor
|
2da709848a
|
remove extra comma screwing up the sql
|
2016-05-30 09:30:02 -04:00 |
Isaac Connor
|
63ac75b440
|
use ::Database::dbh instead of 3013self{dbh}
|
2016-05-30 09:27:36 -04:00 |
Isaac Connor
|
2663781adc
|
put back missing my =__git_main[0];
|
2016-05-30 09:13:39 -04:00 |
Isaac Connor
|
7bc95561ad
|
fix
|
2016-05-29 11:37:32 -04:00 |
Isaac Connor
|
408646ea4d
|
remove extra s
|
2016-05-27 10:52:59 -04:00 |
Isaac Connor
|
d52a6f9a95
|
Merge branch 'improve_filter' into storageareas
|
2016-05-27 09:57:05 -04:00 |
Isaac Connor
|
419e67caa1
|
Put back the code that populates ZM_SERVER_ID
|
2016-05-26 12:42:22 -04:00 |
Isaac Connor
|
05709f3084
|
Merge branch 'id_on_console' into storageareas
|
2016-05-26 11:17:41 -04:00 |
Isaac Connor
|
b9322a02e8
|
Merge branch 'get_rid_of_ConfigAdmin' into storageareas
|
2016-05-26 09:56:16 -04:00 |
Isaac Connor
|
e329bacb78
|
remove deprecated ConfigAdmin
|
2016-05-26 09:51:48 -04:00 |
Isaac Connor
|
7a08d4620f
|
Merge branch 'master' into storageareas
|
2016-05-25 10:17:46 -04:00 |
Isaac Connor
|
a0af99459a
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-05-25 10:12:22 -04:00 |
Isaac Connor
|
aedba1bc7f
|
whitespace, google code style. Adds special cases for ServerId Attribute. ANd uses * to load all event fields instead of specifying each one.
|
2016-05-24 16:49:04 -04:00 |
Isaac Connor
|
8fabeb78d3
|
Merge branch 'fix_zone_edit' into storageareas
|
2016-05-24 15:55:49 -04:00 |
Isaac Connor
|
3f880fad3a
|
Merge pull request #1500 from knnniggett/zmdc_unlink
remove one unlink, add better error reporting to the rest
|
2016-05-24 14:35:39 -04:00 |
Andrew Bauer
|
0052bb080c
|
unlink only if file exists
|
2016-05-24 12:13:17 -05:00 |
Andrew Bauer
|
11701357aa
|
remove one unlink, add better error reporting to the rest
|
2016-05-24 09:01:32 -05:00 |
Andrew Bauer
|
bc163b33fc
|
move multiserver message to once during startup only
|
2016-05-23 20:06:29 -05:00 |
josh4trunks
|
57a25373fa
|
Add logic to Config.pm
|
2016-05-22 08:53:30 -07:00 |
josh4trunks
|
a3fe6ea181
|
Apply changes to Logger.pm
|
2016-05-22 08:28:23 -07:00 |
josh4trunks
|
38e1cc909c
|
Reapply changes to Database.pm
|
2016-05-22 08:19:18 -07:00 |
Isaac Connor
|
1e52934dcf
|
Implement a time function that gets unix_timestamp from StartTime, and implement check_for_files_in_filessytem
|
2016-05-20 20:33:47 -04:00 |
Andrew Bauer
|
8bbb443c67
|
fix invalid key name in config hash
|
2016-05-20 10:35:03 -05:00 |
Isaac Connor
|
bb5dbf3e4a
|
Need to import Config Data into Config
|
2016-05-20 09:29:40 -04:00 |
Isaac Connor
|
182fa9a5cd
|
revert the bulk of the merge_db_connects changes.
|
2016-05-20 08:53:53 -04:00 |
Isaac Connor
|
924acf4284
|
fix zmdc.pl hang due to needing to connect to db after fork
|
2016-05-19 15:01:31 -04:00 |
Isaac Connor
|
8e06c0ec63
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-05-19 12:08:56 -04:00 |
Isaac Connor
|
183f9c70a4
|
Must use ZoneMinder instead of ZoneMinder::Logger
|
2016-05-19 12:08:45 -04:00 |
Isaac Connor
|
d57690903d
|
Must use ZoneMinder instead of ZoneMinder::Logger
|
2016-05-19 12:08:25 -04:00 |
Andrew Bauer
|
8bac5fbdfb
|
typo - remove extra comma
|
2016-05-18 16:58:04 -05:00 |
Andrew Bauer
|
46039a1887
|
Merge pull request #1472 from ZoneMinder/v4l1_compat
V4l1 compat
|
2016-05-16 13:02:27 -05:00 |
Isaac Connor
|
0b00659f26
|
Merge branch 'update_zmupdate' into storageareas
|
2016-05-16 12:24:14 -04:00 |
Isaac Connor
|
b53a0a564d
|
Don't need the extra use ZoneMinder::Config
|
2016-05-16 10:07:24 -04:00 |
Isaac Connor
|
dd24c35afa
|
revert bogus optimisation
|
2016-05-16 10:05:12 -04:00 |
Isaac Connor
|
3780f8a2e6
|
move functions from ConfigAdmin into Config. I see no reason for them to be in a separate module
|
2016-05-16 09:31:54 -04:00 |
Isaac Connor
|
5df85770cd
|
zmupdate.pl.in
|
2016-05-13 13:52:34 -04:00 |
Isaac Connor
|
3a0aa09c2f
|
Force reconnect to the db after fork.
|
2016-05-13 09:09:49 -04:00 |
Isaac Connor
|
e9d8b7925a
|
Merge branch 'db_reconnect' into storageareas
|
2016-05-10 11:13:09 -04:00 |
Isaac Connor
|
aaa4b3a824
|
check for db connection before assuming that dbh is valid
|
2016-05-10 11:11:45 -04:00 |
Isaac Connor
|
a5ba4759bf
|
fix new config entry
|
2016-05-10 10:54:40 -04:00 |
Isaac Connor
|
17f4f5789e
|
Merge branch 'master' into v4l1_compat
|
2016-05-10 10:10:48 -04:00 |
Isaac Connor
|
56e0e4e3c6
|
Use Event->getPath instead of something wrong
|
2016-05-10 09:07:09 -04:00 |
Isaac Connor
|
a012320a3e
|
Whitespace and code style changes. Change Event->getEventPath to Event->getPath to sync with PHP version
|
2016-05-10 09:06:49 -04:00 |
Isaac Connor
|
07e988266a
|
Merge branch 'merge_db_connects' into storageareas
|
2016-05-09 13:28:40 -04:00 |
Isaac Connor
|
1a1e009533
|
simplify use's, add some sth->finishes and move some lines to take properly use DBI
|
2016-05-09 13:28:09 -04:00 |
Isaac Connor
|
9d9f2453c3
|
deprecate ConfigAdmin, merge it into Config.pm
|
2016-05-09 13:27:22 -04:00 |
Isaac Connor
|
cd8c9703c0
|
remove extra q
|
2016-05-09 12:48:56 -04:00 |
Isaac Connor
|
2fec880ff6
|
fix help/description mixup
|
2016-05-09 12:48:35 -04:00 |
Isaac Connor
|
5806eb0958
|
Merge branch 'v4l1_compat' into storageareas
|
2016-05-09 12:46:34 -04:00 |
Isaac Connor
|
605edfd6d0
|
add ENV{LD_PRELOAD} setting
|
2016-05-09 12:46:26 -04:00 |
Isaac Connor
|
08bf97fe85
|
Add a config entry for ZM_LD_PRELOAD
|
2016-05-09 12:44:41 -04:00 |
Isaac Connor
|
beebe74e7b
|
Merge branch 'merge_db_connects' into storageareas
|
2016-05-09 12:26:17 -04:00 |
Isaac Connor
|
b33e35bda7
|
move the require to the top
|
2016-05-09 12:14:59 -04:00 |
Isaac Connor
|
3522c5796b
|
add BEGIN Back to ZoneMinder.pm
|
2016-05-09 12:01:26 -04:00 |
Isaac Connor
|
e064af4214
|
Merge branch 'merge_db_connects' into storageareas
|
2016-05-07 09:35:14 -04:00 |
Isaac Connor
|
b444c8a6b4
|
Move the BEGIN from ZoneMinder to ZoneMinder/Base.
|
2016-05-07 09:34:45 -04:00 |
Isaac Connor
|
6e32b5d266
|
Use fully specified COnfig hash to simplify Symbol tables
|
2016-05-07 09:34:04 -04:00 |
Isaac Connor
|
1d63062188
|
Merge branch 'merge_db_connects' into storageareas
|
2016-05-07 09:30:18 -04:00 |
Isaac Connor
|
f55f979cc9
|
use fully specified Config to simplify symbol tables
|
2016-05-07 09:30:03 -04:00 |
Isaac Connor
|
18442be77f
|
Merge branch 'merge_db_connects' into storageareas
|
2016-05-03 14:09:18 -04:00 |
Isaac Connor
|
e3d581dcab
|
use single quotes instead of double quotes
|
2016-05-03 10:23:09 -04:00 |
Isaac Connor
|
24bf91707f
|
Database module should really use DBI
|
2016-05-03 10:22:38 -04:00 |
Isaac Connor
|
e80db4c433
|
Use zmDbConnect instead of duplicated db connect code
|
2016-05-03 10:22:16 -04:00 |
Isaac Connor
|
49e3d3be7a
|
Turn the config loading code from a BEGIN to a function that could be called repeatedly.
|
2016-05-03 10:21:50 -04:00 |
Isaac Connor
|
9406a2337f
|
Add a BEGIN section to load things in the correct order.
|
2016-05-03 10:21:01 -04:00 |
Isaac Connor
|
2ba18e14fc
|
Merge branch 'merge_db_connects' into storageareas
|
2016-05-03 09:05:36 -04:00 |
Isaac Connor
|
30f34a6f49
|
instead of code duplication for opening the db, use zmDbConnect everywhere
|
2016-05-03 08:59:40 -04:00 |
Isaac Connor
|
55d58a140e
|
instead of code duplication for opening the db, use zmDbConnect everywhere
|
2016-05-03 08:57:51 -04:00 |
Isaac Connor
|
408fba8d24
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-04-30 10:09:52 -04:00 |
Steve Gilvarry
|
6bf43631e2
|
Merge pull request #1428 from ZoneMinder/better_zmvideo
Better zmvideo
|
2016-04-28 22:00:52 +10:00 |
Isaac Connor
|
0adbaafd98
|
Merge branch 'master' into storageareas
|
2016-04-26 13:10:37 -04:00 |
Andrew Bauer
|
1072327dd1
|
remove extra quote
|
2016-04-21 08:01:13 -05:00 |
Andrew Bauer
|
3a9ab7f685
|
Merge branch '1128_ssmtp_mail_option' of https://github.com/dreaddy/ZoneMinder into dreaddy-1128_ssmtp_mail_option
|
2016-04-21 07:27:19 -05:00 |
Isaac Connor
|
67f38d07df
|
Merge branch 'master' into better_zmvideo
|
2016-04-20 12:04:15 -04:00 |
Isaac Connor
|
0da0896757
|
Merge branch 'master' into storageareas
|
2016-04-20 10:01:06 -04:00 |
Isaac Connor
|
e52e880553
|
rework open event check to not use group by
|
2016-04-20 10:00:13 -04:00 |
Isaac Connor
|
bb15915ce5
|
Use EventPrefix, not Prefix
|
2016-04-19 15:23:36 -04:00 |
Isaac Connor
|
588dbc0c3c
|
Don't JOIN MOnitors to get event prefix. Use {->MonitorID} instead
|
2016-04-19 15:22:46 -04:00 |
Isaac Connor
|
d9646d6ceb
|
Populate a Monitors hash with the Monitors data so we don't have to use in JOINs later
|
2016-04-19 15:19:37 -04:00 |
abi
|
7058b0862a
|
suppressed warnings of killall for FreeBSD
|
2016-04-16 16:39:58 +03:00 |
Isaac Connor
|
a2d92300b3
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-04-11 21:51:41 -04:00 |
Isaac Connor
|
60642c1fff
|
Merge branch 'iconnor_video' into storageareas
|
2016-04-05 12:32:33 -04:00 |
Isaac Connor
|
238a25a302
|
Merge branch 'master' into iconnor_video
|
2016-04-05 09:38:59 -04:00 |
Isaac Connor
|
87088d95ac
|
change error to Warning... it is possible to not have any filters returned
|
2016-04-05 09:22:36 -04:00 |
Andy Bauer
|
4e9a925933
|
Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete
|
2016-04-04 20:52:49 -05:00 |
Andy Bauer
|
7ff8d36598
|
Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation
|
2016-04-04 20:44:53 -05:00 |
Isaac Connor
|
dd7f399959
|
Merge branch 'remove_local_zm_conf_override' into storageareas
|
2016-04-04 16:13:44 -04:00 |
Isaac Connor
|
a31660c1f6
|
Remove the code looks for zm.conf in the current dir.
|
2016-04-04 10:45:58 -04:00 |
Isaac Connor
|
82b32578ec
|
Merge branch 'master' into iconnor_video
|
2016-04-01 12:54:09 -04:00 |
Isaac Connor
|
c9a1a9020d
|
Merge h264
|
2016-03-31 11:03:36 -04:00 |
Isaac Connor
|
e5a36c02bd
|
Merge remote-tracking branch 'origin/master' into video_remote
|
2016-03-30 16:55:24 -04:00 |
Isaac Connor
|
ea49dc20d1
|
Merge branch 'master' into storageareas
|
2016-03-30 10:58:07 -04:00 |
Isaac Connor
|
22554603b1
|
remove duplicate zmtelemetry.pl entry
|
2016-03-29 12:31:27 -04:00 |
Isaac Connor
|
f0a307e082
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
Conflicts:
distros/ubuntu1504_cmake/control
|
2016-03-29 11:53:17 -04:00 |
Isaac Connor
|
e3564f6a63
|
add zmtelemtry.pl
|
2016-03-29 11:51:03 -04:00 |
Sándor Czettner
|
38e3c92546
|
Minor grammar fixes
|
2016-03-25 13:18:43 +00:00 |
Isaac Connor
|
6d4d05184c
|
fix typo
|
2016-03-23 09:49:38 -04:00 |
Isaac Connor
|
d3558c5688
|
Merge pull request #1323 from knnniggett/zmfilter
fix missing Net::SFTP::Foreign::debug warning
|
2016-03-21 10:47:50 -04:00 |
Isaac Connor
|
3a8352eb6b
|
Merge branch 'master' into storageareas
|
2016-03-21 10:25:03 -04:00 |
Kyle Johnson
|
4e1af516d7
|
Don't output sudo test cmd to /dev/null. Other tests aren't, and info us useful.
|
2016-03-11 14:29:48 -07:00 |
Kyle Johnson
|
b9085cea64
|
Fix issue where programs are installed in unexpected paths.
For example, on freebsd, sudo is in /usr/local/bin, and as things
were pre-this commit, sudo wasn't being found.
|
2016-03-11 14:28:16 -07:00 |
Andrew Bauer
|
facae6cb0d
|
use make "-f" parameter instead of "--makefile"
|
2016-03-10 13:58:41 -06:00 |
Andrew Bauer
|
4606d2fbca
|
Update zmtrigger.pl.in
mention the %Q placholder when using showtext
|
2016-03-10 10:13:38 -06:00 |
Isaac Connor
|
313f46dceb
|
add zmtelemetry.pl to autotools build
|
2016-03-09 11:26:10 -05:00 |
Isaac Connor
|
0e8fc7953d
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-03-07 21:46:10 -05:00 |
Andy Bauer
|
ab3c35c629
|
fix missing Net::SFTP::Foreign::debug warning
|
2016-03-04 17:21:32 -06:00 |
Isaac Connor
|
0d8c63f578
|
Merge branch 'master' into storageareas
|
2016-03-02 09:11:55 -05:00 |
Kyle Johnson
|
bc89b95470
|
Merge pull request #1292 from ZoneMinder/telemetry
Telemetry Data
|
2016-03-01 07:17:16 -07:00 |
SteveGilvarry
|
d40bf89b17
|
Remove Phone BW settings used with mobile skin
|
2016-02-26 22:43:37 +11:00 |
SteveGilvarry
|
6b169af655
|
Remove eyezm configdata
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
|
2016-02-26 22:35:24 +11:00 |
SteveGilvarry
|
5ff427d9e9
|
Removed Autotools Makefile.am
Conflicts:
Makefile.am
misc/Makefile.am
src/Makefile.am
web/includes/Makefile.am
web/js/Makefile.am
web/skins/classic/css/classic/views/Makefile.am
web/skins/classic/css/flat/views/Makefile.am
web/skins/classic/views/Makefile.am
web/skins/classic/views/js/Makefile.am
|
2016-02-26 22:19:02 +11:00 |
Isaac Connor
|
86c223668d
|
Merge branch 'master' into storageareas
|
2016-02-25 19:11:38 -05:00 |
Andy Bauer
|
7a42a8c3f9
|
add Netcat ONVIF compatible ptz control
|
2016-02-24 10:15:59 -06:00 |
Isaac Connor
|
e12152602b
|
t push origin masterMerge branch 'knnniggett-zmtrigger2' into storageareas
|
2016-02-22 09:15:45 -05:00 |
Andrew Bauer
|
0fce33b2d3
|
one too many curly brackets
|
2016-02-22 06:59:14 -06:00 |
Andy Bauer
|
a2e06ed70c
|
Prevent zmtrigger from crashing when memory handles change
|
2016-02-21 17:55:04 -06:00 |
Isaac Connor
|
66e76e4c2e
|
Merge branch 'zm_trigger_improvements' into storageareas
|
2016-02-19 11:09:41 -05:00 |
Isaac Connor
|
826a22a2a8
|
add missing .
|
2016-02-19 11:07:06 -05:00 |
Isaac Connor
|
3b07b56400
|
Use more descriptive names for the channels
|
2016-02-19 11:05:55 -05:00 |
Isaac Connor
|
64c5b64068
|
Log error before croaking and include port# in the error message
|
2016-02-19 11:04:02 -05:00 |
Isaac Connor
|
327a01cb20
|
Log error before croaking and show path to file in the error message
|
2016-02-19 10:59:40 -05:00 |
Isaac Connor
|
3a512f87a5
|
Log the reason for croaking before croaking.
|
2016-02-19 10:57:52 -05:00 |
Isaac Connor
|
68babd783b
|
Merge branch 'master' into storageareas
|
2016-02-17 09:46:56 -05:00 |
Isaac Connor
|
d1ba45c56a
|
include the sock path in the error message and output an error on failure to open pid file
|
2016-02-16 10:02:30 -05:00 |
Andrew Bauer
|
8a2dc2897d
|
Perl DateTime dependency not needed
|
2016-02-15 14:11:58 -06:00 |
Andrew Bauer
|
041585b4a2
|
Change Info to Debug
|
2016-02-15 14:03:16 -06:00 |
Andrew Bauer
|
e3afa5d1ec
|
change to testing5
|
2016-02-15 12:38:13 -06:00 |
Andrew Bauer
|
87aceef479
|
change server endpoint
|
2016-02-15 08:50:11 -06:00 |
Andrew Bauer
|
cd8a4adfab
|
replace uname system call with native perl when applicable
|
2016-02-15 08:43:34 -06:00 |
Andy Bauer
|
47eaea78be
|
use units of bytes for total memory
|
2016-02-13 15:01:22 -06:00 |
Andy Bauer
|
ee3f87a2ad
|
additional refinements to zmtelemetry
|
2016-02-13 14:53:22 -06:00 |
Andy Bauer
|
08af88df10
|
fix compilation errors
|
2016-02-13 08:54:40 -06:00 |
Isaac Connor
|
0ff0262c8b
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-02-12 19:12:12 -05:00 |
Andrew Bauer
|
87857f5dc1
|
more debug and warnings
|
2016-02-12 17:45:08 -06:00 |
Andrew Bauer
|
24838a91c9
|
set kernel, distro, and version for Mac OS
|
2016-02-12 17:38:00 -06:00 |
Andrew Bauer
|
3c48d81edb
|
tweak regex's. add debug
|
2016-02-12 17:15:04 -06:00 |
Andrew Bauer
|
5045da9382
|
add initial distro determination logic to zmtelemetry
|
2016-02-12 15:18:45 -06:00 |
Andrew Bauer
|
c892e912cf
|
use uname -p for telemetry architecture
|
2016-02-12 10:47:12 -06:00 |
Andrew Bauer
|
b04e1eb0c6
|
let mysql generate the uuid
|
2016-02-12 09:18:15 -06:00 |
Andrew Bauer
|
799437fdf1
|
retrieve telemetry data from the monitors table
|
2016-02-12 08:59:16 -06:00 |
Andrew Bauer
|
017417d8f8
|
small changes to zmtelemetry
|
2016-02-12 08:06:51 -06:00 |
Andrew Bauer
|
1b6af8afae
|
modify telemetry parameters
|
2016-02-11 13:10:36 -06:00 |
Andrew Bauer
|
1811d71562
|
make date format compatible with *BSD
|
2016-02-11 08:10:16 -06:00 |
Andrew Bauer
|
f5ff5d152c
|
Add count query subroutine
|
2016-02-11 07:22:31 -06:00 |
Andy Bauer
|
6d81ef247e
|
build telemetry hash then jsonencode it
|
2016-02-10 20:46:05 -06:00 |
Andrew Bauer
|
177a70a248
|
add getIP subroutine to zmtelemetry.pl
|
2016-02-10 14:05:34 -06:00 |
Andrew Bauer
|
f48ffb60e6
|
update ZM_TELEMETRY_UUID after creating uuid
|
2016-02-10 13:37:22 -06:00 |
Andrew Bauer
|
18c493a180
|
Add getUUID subroutine, Add ZM_TELEMETRY_LAST_UPLOAD
|
2016-02-10 13:04:14 -06:00 |
Isaac Connor
|
ddb377245e
|
fix error report
|
2016-02-10 13:29:55 -05:00 |
Isaac Connor
|
b7256a6891
|
Merge branch 'master' into storageareas
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
version
|
2016-02-10 09:17:40 -05:00 |
Isaac Connor
|
2cd21a07c0
|
use system() instead of backticks
|
2016-02-10 09:09:36 -05:00 |
Isaac Connor
|
1cb8a7ecf5
|
add missing -
|
2016-02-10 09:07:48 -05:00 |
Andrew Bauer
|
7a9740b1a4
|
Update zmtelemetry.pl.in
|
2016-02-09 14:35:45 -06:00 |
Kyle Johnson
|
609784f902
|
Update telemetry host, port and protocol
|
2016-02-09 12:49:09 -07:00 |
Andy Bauer
|
b718bd298f
|
Merge branch 'vivotek-ePTZ' of https://github.com/schrorg/ZoneMinder into schrorg-vivotek-ePTZ
|
2016-02-09 06:56:38 -06:00 |
Dmitry Smirnov
|
5bcc414038
|
codespell: misc. spelling corrections
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
|
2016-02-08 20:41:36 +11:00 |
Andrew Bauer
|
f607e3a6fa
|
zmtelemetry - the typo of my typo is my friend
|
2016-02-06 14:50:02 -06:00 |
Andrew Bauer
|
4ad31695ba
|
fix typo in cmakefile
|
2016-02-06 14:25:00 -06:00 |
Andrew Bauer
|
e0ee05e05c
|
add zmtelemetry to cmake
|
2016-02-06 14:10:42 -06:00 |
Andrew Bauer
|
8a537029ea
|
Initial commit to add zmtelemetry.pl
|
2016-02-06 14:08:28 -06:00 |
Isaac Connor
|
2ca2b07a5e
|
detaint calls for concurrent zmfilter.pl
|
2016-02-05 13:14:04 -05:00 |
Isaac Connor
|
d7f350ac34
|
fix parm => name
|
2016-02-05 11:41:54 -05:00 |
Isaac Connor
|
009211ae1e
|
exec zmfilter concurrently if the flag is et
|
2016-02-05 11:24:40 -05:00 |
Isaac Connor
|
1837cc89ea
|
Merge branch 'schrorg-vivotek-ePTZ' into storageareas
Conflicts:
CMakeLists.txt
configure.ac
version
|
2016-02-04 12:24:07 -05:00 |
Isaac Connor
|
89cff287cd
|
Merge branch 'master' into storageareas
|
2016-02-04 12:14:16 -05:00 |
Isaac Connor
|
d65c9d797b
|
fix merge, update to 1.30.1
|
2016-02-04 12:13:48 -05:00 |
Isaac Connor
|
9ace6c518d
|
Merge pull request #1225 from Simpler1/profiles
Added profiles for Wanscam-HW0025 and IPCC-7210W
|
2016-02-04 11:55:48 -05:00 |
Isaac Connor
|
d3755611c5
|
Merge pull request #1247 from bodegard/master
Corrected DB update version comments, fixed typos, and skin font modification
|
2016-02-04 11:54:02 -05:00 |
Isaac Connor
|
52e16dbdd0
|
Merge pull request #1249 from knnniggett/pelcop
Fix PelcoP checksum calculation
|
2016-02-04 11:52:51 -05:00 |
Andrew Bauer
|
748754a213
|
Merge pull request #1209 from adamreiser/StrictKeyChecking
Strict key checking
|
2016-02-04 10:07:19 -06:00 |
Isaac Connor
|
11b206e281
|
fix getPath -> Path
|
2016-02-01 12:52:14 -05:00 |
Isaac Connor
|
ff46344175
|
Use Storage Areas in geteventPath
|
2016-02-01 12:51:43 -05:00 |
SteveGilvarry
|
7301e803ed
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
|
2016-01-30 15:45:08 +11:00 |
Andy Bauer
|
fa168027b3
|
Fix PelcoP checksum calculation
|
2016-01-24 07:45:04 -06:00 |
Andrew Bauer
|
50b113cd02
|
Merge pull request #1189 from marcolino7/master
PTZ - Added autostop to Down command on FI8918W
|
2016-01-24 07:40:30 -06:00 |
Brandon Odegard
|
9c72579c2e
|
Corrected typo in function info
|
2016-01-22 12:12:39 -06:00 |
Andy Bauer
|
66c66106f5
|
Process off+time delay condition
|
2016-01-15 20:31:31 -06:00 |
Isaac Connor
|
7700623b16
|
Move SQL debug to Execute
|
2016-01-13 09:02:37 -05:00 |
Isaac Connor
|
f1831383da
|
add a check for valid event link. Ignore anything that doesn't look right
|
2016-01-08 10:36:38 -05:00 |
Isaac Connor
|
270c737f40
|
Merge branch 'master' into storageareas
|
2016-01-05 09:36:36 -05:00 |
Isaac Connor
|
f0486e5b5e
|
fix dumb mistake, undefing ZM_SERVBER_ID after setting it.
|
2016-01-04 22:07:07 -05:00 |
Isaac Connor
|
a6c3d05071
|
Debug return events and the sql used
|
2016-01-04 16:01:07 -05:00 |
Isaac Connor
|
455f6d5b7b
|
have to use ->Path() as {Path} might not be filled in
|
2016-01-04 15:57:35 -05:00 |
Isaac Connor
|
88f902ea20
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-01-04 15:29:10 -05:00 |
Isaac Connor
|
17adc2b4e5
|
Rough in a Monitor class
|
2016-01-04 15:27:42 -05:00 |
Isaac Connor
|
196339b48b
|
Add new object classes to autoconf
|
2016-01-04 15:19:46 -05:00 |
Isaac Connor
|
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 |
Isaac Connor
|
f04ba9c87e
|
linefeed when saying that a db monitor doesn't exist in fs
|
2016-01-04 15:05:49 -05:00 |
Isaac Connor
|
fb7b171d6e
|
fix merge
|
2016-01-04 14:37:23 -05:00 |
Simpler1
|
1432c6ae1f
|
Added profiles for Wanscam-HW0025 and IPCC-7210W
|
2016-01-04 12:30:46 -05: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
|
bf2195828f
|
Merge branch 'multi-server' into storageareas
Conflicts:
docs/installationguide/index.rst
|
2016-01-02 14:42:47 -05: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 |