Steve Gilvarry
|
413eced6df
|
Merge pull request #1450 from ZoneMinder/bind_fixes
add some error checking, but fix the call to bind
|
2016-05-10 08:00:10 +10:00 |
|
Steve Gilvarry
|
cffcbc6357
|
Merge pull request #1462 from ZoneMinder/merge_storageareas
Merge object model classes from storageareas
|
2016-05-10 07:59:25 +10:00 |
Isaac Connor
|
7f9c70d521
|
when value to be stored is undefined or '', then set the field=NULL
|
2016-05-09 13:39:40 -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
|
41776547cb
|
Merge branch 'master' into fix_zone_edit
|
2016-05-09 12:33:05 -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
|
7ea8b76c03
|
Merge branch 'master' into merge_db_connects
|
2016-05-09 10:39:43 -04:00 |
Isaac Connor
|
6504c2ac53
|
Merge pull request #1453 from SteveGilvarry/Ubuntu1604
Ubuntu 1604 Packaging folder
|
2016-05-09 10:38:28 -04:00 |
Joshua Ruehlig
|
e12160456b
|
Support user defined MySQL Port/Socket in API
|
2016-05-09 00:24:08 -07:00 |
|
Isaac Connor
|
966a9dcd8d
|
Merge pull request #1467 from ZoneMinder/api_fixes
Don't pass request data as a monitor array to daemonControl
|
2016-05-07 18:25:35 -04:00 |
|
Isaac Connor
|
e4171855bb
|
add padding for nabar to body
|
2016-05-07 18:12:31 -04:00 |
|
Isaac Connor
|
ae40dc8b1b
|
revert to fixed navbar
|
2016-05-07 18:11:58 -04:00 |
|
Isaac Connor
|
e35b0a1eb2
|
Merge pull request #1469 from pliablepixels/1468-api-consoleEvents-alarmedFrames
added alarmed frames filter
|
2016-05-07 17:06:37 -04:00 |
arjunrc
|
be329e1e0d
|
switched to named param format, more flexible, in line with other APIs
|
2016-05-07 16:28:25 -04:00 |
|
arjunrc
|
8347b69b09
|
added alarmed frames filter
|
2016-05-07 14:26:09 -04:00 |
|
Isaac Connor
|
5b8f713037
|
fix libavutils -> libavutil
|
2016-05-07 11:28:53 -04:00 |
|
Isaac Connor
|
6d991a1c6c
|
Merge pull request #1466 from pliablepixels/1465-api-alarm-on-off
added alarm enable/disable
|
2016-05-07 11:26:49 -04:00 |
|
arjunrc
|
6f9cc0f19f
|
to be safe, lets add system edit permissions, so rogue users can't turn alarms OFF
|
2016-05-07 11:01:03 -04:00 |
|
Isaac Connor
|
654d4d2bee
|
Merge branch 'api_fixes' into storageareas
|
2016-05-07 10:56:47 -04:00 |
|
Isaac Connor
|
15977f1a3c
|
Don't pass request data as a monitor array to daemonControl
|
2016-05-07 10:56:38 -04:00 |
|
arjunrc
|
0280ae4dd5
|
added alarm enable/disable
|
2016-05-07 10:37:42 -04:00 |
|
Isaac Connor
|
5158bbc670
|
add non-ffmpeg versions of libraries to depends list. ubunutu1604 doesn't seem to list them with the ffmpeg specification
|
2016-05-07 09:43:30 -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
|
51e6372362
|
remove extra hidden fields
|
2016-05-06 18:20:05 -04:00 |
|
Isaac Connor
|
dcdefac48a
|
fix styles in header, move footer back into header
|
2016-05-06 16:08:32 -04:00 |
|
Isaac Connor
|
7219e0624b
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 15:56:07 -04:00 |
|
Isaac Connor
|
9756f59a2c
|
still trying to fix eventcounts
|
2016-05-06 15:56:01 -04:00 |
|
Isaac Connor
|
97a1d5a648
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 15:53:48 -04:00 |
|
Isaac Connor
|
52b4e98e5a
|
fixes
|
2016-05-06 15:53:19 -04:00 |
|
Isaac Connor
|
fc191dfaa5
|
fixes
|
2016-05-06 15:52:07 -04:00 |
|
Isaac Connor
|
38877f802c
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 15:47:48 -04:00 |
|
Isaac Connor
|
905b69a394
|
fix too many {
|
2016-05-06 15:47:29 -04:00 |
|
Isaac Connor
|
a4a23a9494
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 15:47:10 -04:00 |
|
Isaac Connor
|
7c3a7a6fda
|
fix i to monitor_i in for loop
|
2016-05-06 15:46:47 -04:00 |
|
Isaac Connor
|
38e02db9cf
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 15:46:00 -04:00 |
|
Isaac Connor
|
daf10c1b84
|
make displayMonitors global
|
2016-05-06 15:44:35 -04:00 |
|
Isaac Connor
|
f8d7f9906d
|
fixup merging of Event data into the monitor array
|
2016-05-06 15:44:23 -04:00 |