Isaac Connor
|
4b782efd54
|
Whitespace fixes
|
2016-05-05 15:30:24 -04:00 |
|
Isaac Connor
|
49dc917b2e
|
Merge isaac:ZoneMinder.p1 into storageareas
|
2016-05-05 15:24:14 -04:00 |
Isaac Connor
|
27b928839c
|
deprecate view=image-ffmpeg
|
2016-05-05 15:04:11 -04:00 |
|
Isaac Connor
|
f9a24d7171
|
bump today's release
|
2016-05-05 14:51:57 -04:00 |
|
Isaac Connor
|
e64376ed02
|
increase debug level for Zone motion detection
|
2016-05-05 14:51:41 -04:00 |
|
Isaac Connor
|
88a0bdc026
|
Add some code comments. Make mocord always honour section_length
|
2016-05-05 14:51:26 -04:00 |
|
Isaac Connor
|
e8cbb90125
|
increase log debug level for blend routing reporting
|
2016-05-05 14:50:50 -04:00 |
|
Isaac Connor
|
1f6425b1b7
|
Fix for SQL to load next and previous event
|
2016-05-05 14:50:15 -04:00 |
|
Isaac Connor
|
0e74778dda
|
add find and find_all functions
|
2016-05-05 14:49:57 -04:00 |
|
Isaac Connor
|
df960bb1ea
|
rework image.php view to properly handle fid being the FrameId instead of fid. Fix scaling.
|
2016-05-05 14:49:40 -04:00 |
|
Isaac Connor
|
c3628a8dfd
|
Merge branch 'updated-console' into storageareas
|
2016-05-03 14:34:58 -04:00 |
|
Isaac Connor
|
4defe92911
|
Merge branch 'master' into updated-console
|
2016-05-03 14:22:37 -04:00 |
|
Isaac Connor
|
18442be77f
|
Merge branch 'merge_db_connects' into storageareas
|
2016-05-03 14:09:18 -04:00 |
|
Isaac Connor
|
516bacdfd3
|
Merge branch 'updated-console' into storageareas
|
2016-05-03 13:38:57 -04:00 |
Kyle Johnson
|
a1b4869ee6
|
Add state modal to options view
|
2016-05-03 13:33:22 -04:00 |
|
Kyle Johnson
|
0a77da8a2f
|
Remove header from log view
|
2016-05-03 13:33:08 -04:00 |
|
Kyle Johnson
|
c2fd3dd84a
|
Also don't load additional JS to Log view
Another issue with mootools & jquery conflicts
|
2016-05-03 13:25:39 -04:00 |
|
Kyle Johnson
|
6768fe5554
|
Don't include extra js libraries for monitor view.
This is a workaround for an issue where you couldn't change tabs
whlie in the monitor view, but probably makes sense anyway.
|
2016-05-03 13:06:28 -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
|
e53bd1292e
|
increase events list width to accomodate thumbnails
|
2016-05-02 14:30:54 -04:00 |
|
Isaac Connor
|
240d08133d
|
implement caching of scaled images.
|
2016-05-02 14:12:30 -04:00 |
|
Isaac Connor
|
fe63e4af80
|
remove extra semi colon
|
2016-05-02 13:42:42 -04:00 |
|
Isaac Connor
|
550fdc9295
|
change thumbnail path to specify eid and fid instead of path to the jpg.
|
2016-05-02 13:42:15 -04:00 |
|
Isaac Connor
|
b8c8ff3807
|
fix if structuring
|
2016-05-02 13:36:19 -04:00 |
Isaac Connor
|
5321fe35bd
|
Merge pull request #1321 from SteveGilvarry/ffmpeg3_deprecation
FFMPEG 3.0 deprecation fixes
|
2016-05-02 12:44:16 -04:00 |
|
Isaac Connor
|
b38aa60209
|
fix height of function popup
|
2016-05-02 11:56:42 -04:00 |
|
Isaac Connor
|
79572270d3
|
bump version
|
2016-05-02 10:46:23 -04:00 |
|
Isaac Connor
|
9d6a7541c8
|
add Id column to storage areas
|
2016-05-02 10:40:42 -04:00 |
|
Isaac Connor
|
00f38cdd1b
|
version bump
|
2016-05-02 10:39:41 -04:00 |
|
Isaac Connor
|
272e1da958
|
rough in Server object support
|
2016-05-02 10:37:19 -04:00 |
|
Isaac Connor
|
4aafd1d417
|
Make api use zm.conf
|
2016-04-30 13:50:09 -04:00 |
|
Isaac Connor
|
0044161b9c
|
Merge branch 'fix_zone_edit' into storageareas
|
2016-04-29 10:46:37 -04:00 |
|
Isaac Connor
|
be5f0cd4a9
|
replace OutputVideoStream and OutputImageStream with versions that return a string. Call getStreamHTML before we output the headers because we use streamMode and streamSrc in the header .js.php
|
2016-04-29 10:44:46 -04:00 |
|
Isaac Connor
|
819dad455e
|
whitespace/tabs
|
2016-04-29 09:11:14 -04:00 |
|
Isaac Connor
|
b41a3b1b25
|
fix tabs/shiftwidth
|
2016-04-29 09:01:28 -04:00 |
|
Isaac Connor
|
5eebc50bfb
|
tabs to spaces
|
2016-04-29 08:57:31 -04:00 |
|
Isaac Connor
|
728bffa6a0
|
Check and set audio to mono
|
2016-04-29 08:52:25 -04:00 |
|
Isaac Connor
|
af66105c37
|
Merge branch 'master' into storageareas
|
2016-04-29 08:28:53 -04:00 |
Steve Gilvarry
|
513d1568d0
|
Merge pull request #1444 from ZoneMinder/handle_disk_free_space_error
handle disk_free_space error
|
2016-04-29 21:36:29 +10:00 |
|
Steve Gilvarry
|
e73935a15b
|
Clean up extraneous avutil include
|
2016-04-29 21:29:07 +10:00 |
|
Steve Gilvarry
|
8452c4bce5
|
Fix tab to spaces merge issues
|
2016-04-29 21:27:28 +10:00 |
|
Steve Gilvarry
|
66a3fef61e
|
Merge pull request #1384 from ZoneMinder/tabs_to_spaces
tabs to spaces and use 2space indenting
|
2016-04-29 19:27:12 +10:00 |
|
Isaac Connor
|
097e7f3906
|
Merge branch 'master' into storageareas
|
2016-04-28 16:40:44 -04:00 |
|
Isaac Connor
|
d06a0cf2a4
|
2016042801 build
|
2016-04-28 12:58:09 -04:00 |