Isaac Connor
|
1bf93d76b7
|
fix www and parenthesis.
|
2016-12-13 14:56:29 -05:00 |
|
Isaac Connor
|
6ceb4cc93e
|
fix qqq and replace doube quotes with single quotes
|
2016-12-13 14:32:28 -05:00 |
|
Isaac Connor
|
708f52beda
|
Merge branch 'disk_space_in_events' into storageareas
|
2016-12-13 13:36:18 -05:00 |
|
Isaac Connor
|
a9548d3f6b
|
Add a config entry to turn event disk space on/off
|
2016-12-13 13:34:56 -05:00 |
|
Isaac Connor
|
2c0a868eea
|
fix typo
|
2016-12-08 11:02:59 -05:00 |
Andrew Bauer
|
ecbaaef59a
|
Merge pull request #1670 from connortechnology/fix_braces
Fix braces
|
2016-12-06 08:39:43 -06:00 |
Isaac Connor
|
02cd3e8cba
|
Merge branch 'master' into small_fixes
|
2016-11-22 10:52:07 -05:00 |
|
Isaac Connor
|
911256785e
|
Merge branch 'fix_braces' into storageareas
|
2016-11-08 13:14:12 -05:00 |
|
Isaac Connor
|
1be6c57aee
|
fix extra semi colon
|
2016-11-08 13:11:10 -05:00 |
|
Isaac Connor
|
5f0c1c0e26
|
fix layout in a complex map
|
2016-11-08 12:55:07 -05:00 |
|
Isaac Connor
|
4b3ac63a68
|
merge master, deprecate qqq()
|
2016-11-08 11:30:44 -05:00 |
|
Isaac Connor
|
eb2177e76a
|
whitespace fixes in prep for merging master
|
2016-11-08 10:44:00 -05:00 |
|
Isaac Connor
|
0dbde8e290
|
correct a lot of braces
|
2016-11-04 15:53:14 -04:00 |
|
Isaac Connor
|
93725b3f4b
|
fixup spacing in ConfigData
|
2016-11-04 14:05:51 -04:00 |
|
Isaac Connor
|
3d17067276
|
change tabs to spaces
|
2016-11-03 14:30:23 -04:00 |
|
Isaac Connor
|
68c8178648
|
remove some extra spaces
|
2016-11-03 14:21:07 -04:00 |
|
Isaac Connor
|
bb371612c3
|
tabs to spaces
|
2016-11-03 14:18:03 -04:00 |
|
Isaac Connor
|
d9a31f7fb6
|
Merge branch 'master' into storageareas
|
2016-10-26 13:39:31 -04:00 |
Andrew Bauer
|
191efed8e3
|
change fast_delete to off - fixes #1597
|
2016-10-19 14:10:28 -05:00 |
|
Isaac Connor
|
10e451faa6
|
fix log line
|
2016-10-02 12:23:19 -04:00 |
|
Andrew Bauer
|
24d471f452
|
Merge pull request #1503 from ZoneMinder/id_on_console
add option to show monitor ID on console
|
2016-08-06 10:59:03 -05:00 |
Isaac Connor
|
9d65ef3bb2
|
Merge pull request #1556 from knnniggett/banner
custom banner text on web console
|
2016-08-06 10:59:53 -04:00 |
|
Andrew Bauer
|
382896dc0d
|
Merge pull request #1498 from josh4trunks/mysql_port_socket
Add support for MySQL Port / Unix Socket
|
2016-08-06 09:32:32 -05:00 |
|
Andrew Bauer
|
e6b1cf90df
|
Merge pull request #1566 from gerdesj/Keekoon
Control script for Keekoon cameras.
|
2016-08-06 09:09:40 -05:00 |
Jon Gerdes
|
ee720c4561
|
Control script for Keekoon cameras. Tested with KK002.
|
2016-07-25 11:20:49 +01:00 |
Dmitry Smirnov
|
aed3c3d29a
|
reduce noise on "zmupdate.pl" invocation
|
2016-07-14 00:43:32 +10:00 |
|
Andy Bauer
|
19265b631a
|
custom banner text on web console
|
2016-07-09 13:11:30 -05:00 |
|
Isaac Connor
|
1069b301a0
|
functions have been moved from ConfigAdmin to Config
|
2016-06-12 15:38:59 -04:00 |
|
Isaac Connor
|
1983f106f4
|
Add a missing sth->finish
|
2016-05-27 09:01:01 -04:00 |
|
Isaac Connor
|
b0116f25e9
|
put back in the lines that populate ZM_SERVER_ID. They got lost somehow in the perl db undo
|
2016-05-27 08:59:46 -04:00 |
|
Isaac Connor
|
f969186abb
|
add the ZM_WEB_ID_ON_CONSOLE option and use it to show the ID column on the console
|
2016-05-26 11:15:13 -04:00 |
|
Isaac Connor
|
795665f8c7
|
Merge branch 'startup_time' into storageareas
|
2016-09-29 11:07:55 -04:00 |
|
Isaac Connor
|
29c015ecd3
|
need to put zmGetStartupTime in exports
|
2016-09-29 11:07:33 -04:00 |
|
Isaac Connor
|
5c867aa5f5
|
Merge branch 'fix_auth_timeout' into storageareas
|
2016-09-29 10:10:38 -04:00 |
|
Isaac Connor
|
8bc7b9562f
|
introduce config option ZM_AUTH_HASH_TTL which is the # of hours to make an auth hash valid for
|
2016-09-29 10:04:53 -04:00 |
|
Isaac Connor
|
b074a3257d
|
add StartTime to log line about deleting an event.
|
2016-09-28 08:35:19 -04:00 |
|
Isaac Connor
|
a3e99cf08d
|
quick update to Monitor to use Object methods
|
2016-09-20 12:15:48 -04:00 |
|
Isaac Connor
|
e228de6ebe
|
detect relative path for ZM_PATH_EVENTS and use ZM_PATH_WEB to make a full path
|
2016-09-19 16:44:43 -04:00 |
|
Isaac Connor
|
8f33ed6ca6
|
introduce another sharedmem variable called startup_time, which is set by zmc indicating when the process started.
|
2016-09-15 11:16:05 -04:00 |
|
Isaac Connor
|
2451768295
|
Merge branch 'master' into storageareas
|
2016-08-08 18:08:46 -04:00 |
|
Isaac Connor
|
99289e4713
|
Deprecate MAX_AGED_DIRS. Only check age if the fs event isn't in the db. This should work much better.
|
2016-08-04 12:22:33 -04:00 |
|
Isaac Connor
|
208337635a
|
Merge branch 'master' into storageareas
|
2016-08-01 19:30:01 -04:00 |
|
Isaac Connor
|
1e2ec7028e
|
better debugging. add back deleting of zmswap files. detaint them so that they can be deleted. Use Objects to fix up deleting events
|
2016-07-12 14:16:20 -04:00 |
|
Isaac Connor
|
26369268bb
|
merge Steve's updates, work on zmaudit
|
2016-07-12 11:27:25 -04:00 |
Isaac Connor
|
76cb031a5e
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-06-12 07:14:30 -04:00 |
|
Isaac Connor
|
2460bccdac
|
fix missing $
|
2016-06-06 10:18:21 -04:00 |
|
Isaac Connor
|
ef9c0ca33a
|
Debug the SQL on execute, not on parse
|
2016-06-03 11:15:40 -04:00 |
|
Isaac Connor
|
b8c406f969
|
Merge branch 'master' into storageareas
|
2016-06-03 09:32:55 -04:00 |
|
Isaac Connor
|
8a14d6f4d2
|
Don't not load the event if it was videod before
|
2016-05-30 14:57:46 -04:00 |
|
Isaac Connor
|
4469f909fa
|
Add support for DefaultVideo to video generation
|
2016-05-30 14:07:40 -04:00 |