Commit Graph

9183 Commits

Author SHA1 Message Date
Isaac Connor c2d21289e1 always offer to upload to zmrepo 2017-07-06 11:57:56 -04:00
Isaac Connor a886d30aa7 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-06-29 15:08:06 -04:00
Isaac Connor a263de144b fixup defaults for Filter 2017-06-29 15:00:17 -04:00
Isaac Connor 7a85e22bfc Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-06-28 16:22:16 -04:00
Isaac Connor 621d2e0e41 remove debug code 2017-06-28 15:18:12 -04:00
Isaac Connor 8b1459a510 fixes for cambozola on ie, and fixes to setting fixed widths 2017-06-28 15:17:55 -04:00
Isaac Connor ed4da1e8bc change to single quotes 2017-06-28 14:27:09 -04:00
Isaac Connor 90696331a9 Merge branch 'master' into storageareas 2017-06-26 21:58:11 -04:00
Andrew Bauer 043b382bdd include conf.d folder contents in debian packaging (#1934) 2017-06-26 14:44:33 -04:00
Isaac Connor c1b8105c0e only include csrf if it's going to be used. This fixes view_video using up all ram sending a video file 2017-06-26 14:23:54 -04:00
Isaac Connor 6db9a78dab add compressing options to the sample logrotate config 2017-06-26 12:17:49 -04:00
Isaac Connor d97d156efb Don't do csrf for view_video 2017-06-26 11:48:26 -04:00
Isaac Connor 24dd3a8c66 fix loading starttime of event 2017-06-26 11:20:10 -04:00
Isaac Connor 0d8e4656dc fix braces 2017-06-26 09:46:07 -04:00
Isaac Connor 92c25dc58c Merge branch 'master' into storageareas 2017-06-23 10:43:46 -04:00
Isaac Connor 5d63bc47cc I believe level should be effectiveLevel here 2017-06-23 10:22:37 -04:00
Isaac Connor 52f1e2d235 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-23 10:11:52 -04:00
Isaac Connor 12c3bde8b0 remove debug 2017-06-23 10:04:50 -04:00
Isaac Connor 25b66e9629 whitespace mostly. 2017-06-23 09:58:54 -04:00
Isaac Connor 3a00656c3f WHen can't open file log, turn on terminal logging so that the message goes somewhere useful. 2017-06-23 09:58:19 -04:00
Isaac Connor 2460e1acd9 fix whitspace 2017-06-23 09:58:01 -04:00
Isaac Connor 609c9a351f Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-23 09:04:52 -04:00
Isaac Connor b5565bb16a fix filters, refreshparent in wrong block 2017-06-23 09:04:46 -04:00
Isaac Connor fcc852c859 fix cpplint.py complaints 2017-06-22 16:06:31 -04:00
Andrew Bauer b10779ab3a Update rsync_xfer.sh
add rsync -l flag to transfer symlinks
2017-06-22 10:57:11 -05:00
Isaac Connor c241b6dddd Merge branch 'split_zmeventstream' into storageareas 2017-06-22 10:46:32 -04:00
abishai 950c8f19d3 Upstream FreeBSD patches (#1926)
* apply FreeBSD patches

* timeval struct needs time.h

* typo

* added forgotten destination for systemd startup script install
2017-06-22 10:14:24 -04:00
Isaac Connor 394001604d add the new files for EventStream 2017-06-22 10:12:04 -04:00
Isaac Connor 226514e887 split EventStream into it's own files 2017-06-22 10:10:28 -04:00
Isaac Connor a29ad958c9 Merge branch 'master' into storageareas 2017-06-22 10:00:28 -04:00
Isaac Connor 1bba664e3d whitspace 2017-06-22 09:55:45 -04:00
Isaac Connor 76f63686cb Merge branch 'fix_event_viewing' into storageareas 2017-06-22 09:24:31 -04:00
Isaac Connor eac6537d7c Merge ../ZoneMinder.master into fix_event_viewing 2017-06-21 17:21:06 -04:00
Isaac Connor 5ee230a141 always restart zoneminder on upgrade, not just when doing a db update 2017-06-21 17:20:50 -04:00
Isaac Connor c33b179a59 :Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-21 17:18:49 -04:00
Isaac Connor 5e75588bfb Fix event viewing. Output a frame immediately on zoom in/out. Fix recursive loop on play/pause 2017-06-21 17:14:02 -04:00
Andrew Bauer 36683d15d2 Update zoneminder.spec
bump zm version in rpm specfile
2017-06-20 11:41:53 -05:00
Isaac Connor c7026a1b65 requests should be csrf'd. view_video does not need to be 2017-06-20 10:56:59 -04:00
Isaac Connor 1932fa7f81 don't do CSRF for requests, and when not auth, clear the request so that we don't do it. 2017-06-20 10:52:16 -04:00
Isaac Connor 375e4a3e9c More filter UI fixes 2017-06-20 10:45:16 -04:00
Isaac Connor 25acf1756c Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-06-20 09:10:26 -04:00
Isaac Connor 5bdfb8ae4e add a question mark to delete confirm message and just submit the form 2017-06-20 09:09:21 -04:00
Isaac Connor 5df4494c6c make Filters a main window view instead of a popup 2017-06-20 09:08:57 -04:00
Isaac Connor 93f81daa8d Fix saving logic 2017-06-20 09:08:25 -04:00
Isaac Connor dc96ca72a8 Fix AutoDetail=>AutoDelete, add Id to defaults and remove debugging 2017-06-20 09:08:15 -04:00
Isaac Connor db68d3e0a2 use restart instead of start 2017-06-19 13:57:00 -04:00
Isaac Connor f8cc5b00c1 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-06-19 13:40:40 -04:00
Isaac Connor be8be3b0fd Put back Lost Storageareas code 2017-06-19 13:40:32 -04:00
Isaac Connor 965b306ebc continue redoing filters 2017-06-19 13:24:02 -04:00
Isaac Connor 1d9e0b7d69 fix saving filters 2017-06-19 10:18:44 -04:00