ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
6,865 Commits
32 Branches
93 Tags
163 MiB
Commit Graph

6865 Commits (07e988266a04b38494d4708df00c78b86aeae1fe)

Author SHA1 Message Date
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
Steve Gilvarry 97a4cf0852 Add the changes...doh 2016-05-01 15:06:45 +10:00
Steve Gilvarry d7f7a0f074 Rename ubuntu1504, which is unsupported, to ubuntu 1604. Fix control file 
to current libav packages and php virtual packages. Update debian build
script to use new folder for any non-trusty build.
 2016-05-01 13:46:09 +10: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
Isaac Connor 30b3fa8a8b add a cast to help the compile figure out which function to use 2016-04-28 12:57:38 -04:00
Isaac Connor 1096461793 Need a cast to handle old avformat 2016-04-28 12:57:14 -04:00
Isaac Connor 1282e36bb2 av_get_media_type_string is not available in trusty 2016-04-28 12:56:40 -04:00
Isaac Connor 337d8a748c simplify the separator stuff 2016-04-28 12:56:19 -04:00
Isaac Connor a141064aad Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-04-28 11:34:49 -04:00
Isaac Connor fac07cba6d Merge branch 'master' into tabs_to_spaces 2016-04-28 09:31:40 -04:00
Isaac Connor 629f141734 Merge pull request #1441 from SteveGilvarry/remove_commented_code 
Delete large commented out code segment
 2016-04-28 09:30:43 -04:00
Isaac Connor 5e20831030 Don't return of disk_free_space returns false, just log it. 2016-04-28 09:29:40 -04:00
Isaac Connor 59406fd03a Merge branch 'master' into storageareas 2016-04-28 09:24:36 -04:00
Isaac Connor 24e3306955 master master 2016-04-28 09:20:56 -04:00
Steve Gilvarry af361042ef Merge pull request #1446 from ZoneMinder/stdstring_instead_of_c_string 
use std::string instead of C strings. Mostly this will quiet build wa…
 2016-04-28 22:13:44 +10:00
Steve Gilvarry 6bf43631e2 Merge pull request #1428 from ZoneMinder/better_zmvideo 
Better zmvideo
 2016-04-28 22:00:52 +10:00
Steve Gilvarry 6549f7bf29 Merge pull request #1403 from ZoneMinder/fix_grant 
Fix grant
 2016-04-28 21:49:21 +10:00
Steve Gilvarry ac5fdb8956 Merge pull request #1421 from connortechnology/fix_events_pagination 
remove the if(pages>1) so that the if  >  line always happens
 2016-04-28 21:43:54 +10:00
Steve Gilvarry d9fd0faa32 Merge pull request #1447 from ZoneMinder/simplify_zm_signal 
Simplify zm signal
 2016-04-28 21:37:55 +10:00