Isaac Connor
|
b3fd156c11
|
add boost to build depends
|
2016-05-25 20:01:42 -04:00 |
Isaac Connor
|
abd43bdc9f
|
Merge ../ZoneMinder.master into storageareas
|
2016-09-29 14:25:11 -04:00 |
|
Isaac Connor
|
f9fd715657
|
Merge branch 'master' into storageareas
|
2016-09-29 14:25:02 -04:00 |
|
Isaac Connor
|
eb30a9079e
|
code style, commenting
|
2016-09-29 14:04:32 -04:00 |
|
Isaac Connor
|
52df5174e7
|
fix zm_av_frame_alloc define for trusty
|
2016-09-29 13:21:24 -04:00 |
|
Isaac Connor
|
af0af70732
|
filter successful logins
|
2016-09-29 12:35:10 -04:00 |
|
Isaac Connor
|
f1012f60ec
|
add libswresample to build depends
|
2016-09-29 12:31:02 -04:00 |
|
Isaac Connor
|
0b5f597918
|
Merge ../ZoneMinder.connortechnology into storageareas
|
2016-09-29 12:23:04 -04:00 |
|
Isaac Connor
|
07d8d008ba
|
Merge branch 'fix_auth_timeout' into storageareas
|
2016-09-29 12:22:56 -04:00 |
|
Isaac Connor
|
0d08c50199
|
change quotes
|
2016-09-29 12:22:01 -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
|
441020e8b8
|
fix_type
|
2016-09-29 10:49:40 -04:00 |
|
Isaac Connor
|
ab8b58ba48
|
Merge branch 'fix_auth_timeout' into storageareas
|
2016-09-29 10:44:30 -04:00 |
|
Isaac Connor
|
d1facae287
|
Merge branch 'fix_auth_timeout' into storageareas
|
2016-09-29 10:12:05 -04:00 |
|
Isaac Connor
|
5c867aa5f5
|
Merge branch 'fix_auth_timeout' into storageareas
|
2016-09-29 10:10:38 -04:00 |
|
Isaac Connor
|
02ef99584c
|
Revert "alter code to use libv4l2"
This reverts commit 00ef0f4d78.
|
2016-09-29 09:30:12 -04:00 |
|
Isaac Connor
|
f5a29bb679
|
Revert "add recipes to detect libv4l2"
This reverts commit d67cb0d0df.
|
2016-09-29 09:29:57 -04:00 |
Andrew Bauer
|
ceaacf91bf
|
Merge pull request #1470 from connortechnology/api_improvements
Api improvements
|
2016-05-25 12:45:03 -05:00 |
|
Isaac Connor
|
b309837f02
|
put back zmDbRow use
|
2016-05-25 10:21:44 -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 |
|
Andrew Bauer
|
575f8ec265
|
Merge pull request #1488 from ZoneMinder/hide_rtspdescribe
Hide rtspdescribe
|
2016-05-25 08:44:17 -05:00 |
|
Isaac Connor
|
8f1596d683
|
use setStyle('display','table-row') since mootools suck and .show() will use display:block on a tr
|
2016-05-25 09:08:28 -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
|
7cfa2a5eaa
|
Replace the server attribute with a server entry, populated with a dropdown.Makes things more friendly and less error-prone
|
2016-05-24 16:46:34 -04:00 |
|
Isaac Connor
|
277fdafa85
|
Remove entry for Server Name, making Server Id just say Server. The filters will be populated with a dropdown, so no need to go by Id or Name
|
2016-05-24 16:45:55 -04:00 |
|
Isaac Connor
|
8fabeb78d3
|
Merge branch 'fix_zone_edit' into storageareas
|
2016-05-24 15:55:49 -04:00 |
|
Isaac Connor
|
a8e407172a
|
split out versus get functionality in includes/functions. Fix positioning of svg over image stream
|
2016-05-24 15:50:22 -04:00 |
|
Isaac Connor
|
89f58daf89
|
Merge branch 'master' into fix_zone_edit
|
2016-05-24 15:30:56 -04:00 |
|
Isaac Connor
|
ae1eb94f27
|
fix getStreamHTML when using helper
|
2016-05-24 15:10:37 -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 |
|
Isaac Connor
|
00abd36af8
|
fix the other case of the wrong case of rtsp
|
2016-05-24 12:19:31 -04:00 |
|
Isaac Connor
|
056eed6df9
|
fix to show RTSP describe option when switching back to rtsp
|
2016-05-24 12:15:59 -04:00 |
|
Isaac Connor
|
0522b03364
|
Merge pull request #1499 from knnniggett/mserver_msg
move multiserver message to display once during startup only
|
2016-05-24 11:08:11 -04:00 |
|
Andy Bauer
|
d12b9dc16d
|
fix typo. needs }
|
2016-05-24 09:24:18 -05:00 |
|
Andrew Bauer
|
11701357aa
|
remove one unlink, add better error reporting to the rest
|
2016-05-24 09:01:32 -05:00 |
|
Andy Bauer
|
6e82f2c9a9
|
add messages back with debug 3
|
2016-05-24 08:50:09 -05:00 |
|
Isaac Connor
|
bc49aa6aa6
|
add missing ; and remove extra )
|
2016-05-24 09:34:36 -04:00 |
|
Isaac Connor
|
5eac0559e2
|
Merge branch 'master' into hide_rtspdescribe
|
2016-05-24 09:32:41 -04:00 |
|
Andrew Bauer
|
bec14bf111
|
Merge pull request #1478 from ZoneMinder/fix_montage_server_refs
pass in the server url into the monitor object to use instead of the …
|
2016-05-23 20:14:35 -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 |
|
josh4trunks
|
2ab79820a1
|
Add back changes
|
2016-05-22 08:08:12 -07:00 |
|
Isaac Connor
|
47db5819db
|
Merge pull request #1494 from pliablepixels/1493-api-fix-add-monitor-daemonc
don't pass partial data to daemoncontrol
|
2016-05-22 10:15:40 -04:00 |
|
Isaac Connor
|
d18bbc032f
|
Merge pull request #1495 from pliablepixels/update-api-docs
added alarm apis
|
2016-05-22 10:15:00 -04:00 |
|
Isaac Connor
|
68bc10eb93
|
Merge pull request #1497 from ZoneMinder/zmtelemetry
fix invalid key name in config hash
|
2016-05-22 10:14:12 -04:00 |