Commit Graph

8026 Commits

Author SHA1 Message Date
Isaac Connor 7cd2f6c69e use glyphicon for sort 2017-01-23 21:51:17 -05:00
Isaac Connor bb3d47ab45 get rid of mapping 2017-01-23 21:34:06 -05:00
Isaac Connor e937b4099b add an ajax file for console to do sorting 2017-01-23 10:13:16 -05:00
Isaac Connor fdd71a826a implement dragndrop sorting 2017-01-23 10:12:57 -05:00
Isaac Connor 35148008b6 make img an inline-block so that it continues having space, even when is a broken link 2017-01-18 21:14:15 -05:00
Isaac Connor 8ce7719a33 remove extra db call cuz i sredundant 2017-01-18 21:12:54 -05:00
Isaac Connor 61827fec0c remove redundant mkdir eventdir. 2017-01-18 09:31:08 -05:00
Isaac Connor ff1b369a99 add in the required updated file 2017-01-17 12:10:00 -05:00
Isaac Connor d63972ac3b need to bump version due to runstate stuff 2017-01-17 09:21:23 -05:00
Isaac Connor 7116d66500 use the correct pointer casts 2017-01-16 21:57:21 -05:00
Isaac Connor 1f3644f6bd Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-01-16 21:14:39 -05:00
Isaac Connor 0a660040d5 Merge branch 'update_do_debian_release' into storageareas 2017-01-16 21:14:18 -05:00
Isaac Connor 0e8d1baebb add an urgency flag 2017-01-16 21:13:56 -05:00
Isaac Connor 19bc79a5ec move nRet into the block where it is used. Add a comment. 2017-01-16 21:11:28 -05:00
Isaac Connor 9afec3f78b Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-01-16 21:08:25 -05:00
Isaac Connor f6d1707382 fix event insert 2017-01-16 21:08:13 -05:00
Isaac Connor b2435e3000 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-01-15 17:20:56 -05:00
Isaac Connor 5db6e8cbb3 add auto-uploading to zmrepo for jessie 2017-01-15 17:20:40 -05:00
Isaac Connor c5ad62b9fc Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-01-15 14:24:58 -05:00
Isaac Connor 29acad163c Add some casts to quiet warnings. The warnings happen because we are doing arithmetic on pointers. 2017-01-15 14:24:50 -05:00
Isaac Connor 6be61403f5 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-01-15 14:07:55 -05:00
Isaac Connor f16fdb8b21 Merge branch 'update_do_debian_release' into storageareas 2017-01-15 14:07:37 -05:00
Isaac Connor b7ee64ff41 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-01-15 13:35:45 -05:00
Isaac Connor a30af05bcf change parameters to use -o= or --option= and add interactive flag 2017-01-15 12:18:51 -05:00
Isaac Connor 052807aaf5 remove extra my 2017-01-15 10:57:39 -05:00
Isaac Connor c79dfb6a16 fix typos 2017-01-15 10:56:57 -05:00
Isaac Connor 4973d8c74c add support for connect options 2017-01-15 10:54:46 -05:00
Isaac Connor d24d151f53 Slurp db update file in and do() it instead of calling mysql 2017-01-15 10:54:23 -05:00
Isaac Connor 899b1b82b9 Merge branch 'filter_by_runstate' into storageareas 2017-01-14 17:07:20 -05:00
Isaac Connor 8d02607a90 add an update script to add StateId to Events table 2017-01-14 16:58:22 -05:00
Isaac Connor 242e5a56d8 rough in the ability to filter on RunState 2017-01-14 16:55:28 -05:00
Isaac Connor 5df5698e7a Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-01-14 10:54:15 -05:00
Isaac Connor babe4f07fb Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-01-14 10:53:49 -05:00
Isaac Connor 27d764909f Merge branch 'update_do_debian_release' into storageareas 2017-01-14 10:53:11 -05:00
Isaac Connor d7f81393a8 fixes to detect and use environment variables for AUTHOR and debsign keys 2017-01-14 10:53:05 -05:00
Isaac Connor b8dcebadd5 remove iconnor references 2017-01-14 10:01:55 -05:00
Isaac Connor 01e75a746d Merge branch 'update_do_debian_release' into storageareas 2017-01-14 09:59:02 -05:00
Isaac Connor e3f073b275 update to add binary options, dput to ppa and use alternate fork. Also support newer distros and wheezy. 2017-01-14 09:58:36 -05:00
Isaac Connor 2ce4bad39b fix Event being undefined when called by path 2017-01-13 14:42:10 -05:00
Isaac Connor 21c1e1d26f add a call to av_interleaved_write_Frame to clear out the queues in the destructor 2017-01-13 14:37:18 -05:00
Isaac Connor ed5c3c4ed4 remove debug stautement 2017-01-12 12:58:09 -05:00
Isaac Connor d9ce1a68c6 restore defaults 2017-01-12 12:56:55 -05:00
Isaac Connor e94a797a5e remove debug stautement 2017-01-12 12:56:20 -05:00
Isaac Connor 65f7350313 remove debug stautement 2017-01-12 12:55:27 -05:00
Isaac Connor 82eaacc624 switch quotes 2017-01-12 12:54:46 -05:00
Isaac Connor 42484f7680 switch quotes, load monitors at the beginnign 2017-01-12 12:54:40 -05:00
Isaac Connor 0197c550ae Use a real variable for file handle so that it sticks around 2017-01-12 12:54:14 -05:00
Isaac Connor 0f67d9847e remove caching of verified status of an mmap. 2017-01-12 12:53:57 -05:00
Isaac Connor 251264ac92 bump ffmpeg version required to use codecpar 2017-01-11 14:31:30 -05:00
Isaac Connor 23b40da598 fix whitespacing causing a warning when compiling. In this case braces are not neccessary. 2017-01-11 14:25:12 -05:00