ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,243 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

8243 Commits

Author SHA1 Message Date
Isaac Connor 8ef7a708bd updates in filters, try to get the new filter loaded when saving with a new name 2017-03-27 13:12:37 -04:00
Isaac Connor 146ac87b51 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-03-24 11:53:53 -04:00
Isaac Connor 7360619941 Merge branch 'master' into storageareas 2017-03-24 11:53:45 -04:00
Isaac Connor 99a011da77 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-03-23 19:56:01 -04:00
Isaac Connor 56acea30fe implement a command line option to limit the monitor to which zmaudit is doing it's job 2017-03-23 19:54:16 -04:00
Andrew Bauer a43adc241f fix incorrect gpl license mailing address 2017-03-22 07:03:53 -05:00
Isaac Connor eaca58bb7c Merge pull request #1815 from mnoorenberghe/postlogin 
Properly escape postLoginQuery. Fixes #1797
 2017-03-21 10:27:13 -04:00
Isaac Connor 730d76189d Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-03-21 09:53:41 -04:00
Isaac Connor 670c1a3c7c pass NULL for ['width'] 2017-03-21 09:47:07 -04:00
Isaac Connor 676f92d3f1 Merge pull request #1828 from mnoorenberghe/api_user_enabled 
Fix check that API user is enabled
 2017-03-20 21:09:14 -04:00
Matthew Noorenberghe ea558c79a0 Fix check that API user is enabled 2017-03-20 17:16:24 -07:00
Isaac Connor df5a238857 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-03-20 15:14:50 -04:00
Isaac Connor 0cd2e346d3 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-03-20 15:13:41 -04:00
Isaac Connor 0a1b2eab01 Merge branch 'uri_decode_in_zms' into storageareas 2017-03-20 15:13:19 -04:00
Isaac Connor f5dc896a45 missed one case 2017-03-20 15:12:23 -04:00
Isaac Connor 7b8ff44163 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-03-20 15:04:54 -04:00
Isaac Connor 816b0a9e01 add getsockopt test 2017-03-20 15:04:05 -04:00
Isaac Connor f8c157475f Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-03-20 13:52:55 -04:00
Isaac Connor feb9d55613 fix syntax 2017-03-20 13:52:10 -04:00
Isaac Connor 063fa7b6fe put back these nice files from master 2017-03-20 13:45:22 -04:00
Isaac Connor badbf1c74c Merge pull request #1816 from mnoorenberghe/flat_window_sizes 
Increase default window sizes for the flat theme. Fixes #1059
 2017-03-20 13:10:13 -04:00
Isaac Connor 07bf76b0d3 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-03-20 12:10:38 -04:00
Isaac Connor 70246ce55a whitespace corrections and ensure that options[width] and options[height] are defined 2017-03-20 12:10:28 -04:00
Isaac Connor b75e7fc990 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-03-20 12:05:44 -04:00
Isaac Connor eba6cec7a1 Merge branch 'master' into storageareas 2017-03-20 12:01:20 -04:00
Isaac Connor a546c9e37f merge uri_decode in zms 2017-03-20 12:00:14 -04:00
Isaac Connor 9f30ccfa75 Use new UriDecode function to decode username and password 2017-03-20 11:16:39 -04:00
Isaac Connor 3b15ba91d1 Rough in a CURL based UriDecode 2017-03-20 11:16:21 -04:00
Andrew Bauer 7bb0d12a4f Merge pull request #1819 from ZoneMinder/Copyright_patch1 
Fix failure to attribute previous work
 2017-03-20 09:17:03 -05:00
Andrew Bauer 2dcd95bc7f Merge pull request #1504 from ZoneMinder/improve_filter 
Improve filter
 2017-03-18 21:12:58 -05:00
Steve Gilvarry 3a69238381 Fix failure to attribute previous work 
Just fixing this up as there is a issue logged from Debian for it.
 2017-03-18 23:05:32 +11:00
Matthew Noorenberghe 91ad6afffb Increase default window sizes for the flat theme. Fixes #1059 
Used the computed height of <html> and rounded up the nearest multiple of 5.
 2017-03-17 22:24:42 -07:00
Matthew Noorenberghe ea5342abd2 Properly escape postLoginQuery. Fixes #1797 2017-03-17 21:05:28 -07:00
Isaac Connor 8834109812 code style and whitespace changes 2017-03-17 09:59:23 -04:00
Isaac Connor c24853ad11 Merge pull request #1806 from adam900710/compile_fix 
ZoneMinder: Rename public enum CHAR_WIDTH/CHAR_HEIGHT to avoid conflicts
 2017-03-17 09:42:15 -04:00
Isaac Connor b041e299fc Merge branch 'adam900710-compile_fix' into storageareas 2017-03-17 09:41:42 -04:00
Isaac Connor 654282d82e fix merge 2017-03-17 09:41:04 -04:00
Isaac Connor d9c665b021 Merge branch 'fix_crash_with_invalid_zones' into storageareas 2017-03-17 09:35:11 -04:00
Andrew Bauer 0d4acb9bc8 Merge pull request #1811 from connortechnology/fix_crash_with_invalid_zones 
Fix zmc crashing when zones are no good
 2017-03-16 14:51:42 -05:00
Isaac Connor 6a447194eb Fix zmc crashing when zones are no good bby decreasing n_zone before continuing 2017-03-16 10:55:13 -04:00
Andrew Bauer 9681a444b4 Merge pull request #1765 from SteveGilvarry/ffmpeg_url 
Align Method description to what it is actually doing
 2017-03-16 09:32:30 -05:00
Andrew Bauer 7e0ac4b239 Merge pull request #1780 from connortechnology/fix_1775 
use escapeshellarg on inputs to daemonControl and other functions
 2017-03-16 09:27:04 -05:00
Isaac Connor 5bccd92b68 fix scoping of scale var 2017-03-16 09:53:53 -04:00
Isaac Connor 63fb424bc7 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-03-13 15:43:12 -04:00
Isaac Connor 147c2546b3 include HAVE_MP4V2_MP4V2_H and MP4_H 2017-03-13 15:42:51 -04:00
Isaac Connor d5312ce21f fix libswscale for 1604 2017-03-13 15:37:55 -04:00
Isaac Connor b22e48868b Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-03-13 14:40:27 -04:00
Isaac Connor 67b7b76e1a add libswresample and mp4v2 2017-03-13 14:40:01 -04:00
Isaac Connor fc464d988c add x264 2017-03-13 14:36:08 -04:00
Isaac Connor 1cbcd3612f add libswscale4 2017-03-13 14:28:13 -04:00