Commit Graph

7589 Commits

Author SHA1 Message Date
Isaac Connor b3fd156c11 add boost to build depends 2016-05-25 20:01:42 -04:00
Isaac Connor abd43bdc9f Merge ../ZoneMinder.master into storageareas 2016-09-29 14:25:11 -04:00
Isaac Connor f9fd715657 Merge branch 'master' into storageareas 2016-09-29 14:25:02 -04:00
Isaac Connor 603d903297 add an environment setting for TZ which eliminates a stat on /etc/locatime on every log line 2016-09-29 14:24:49 -04:00
Isaac Connor 8d6217f19d Add a line to set the TZ variable in the env before spawning zoneminder. This prevents /etc/localtime from being stat'd on every logging call. 2016-09-29 14:06:12 -04:00
Isaac Connor eb30a9079e code style, commenting 2016-09-29 14:04:32 -04:00
Isaac Connor 52df5174e7 fix zm_av_frame_alloc define for trusty 2016-09-29 13:21:24 -04:00
Isaac Connor af0af70732 filter successful logins 2016-09-29 12:35:10 -04:00
Isaac Connor f1012f60ec add libswresample to build depends 2016-09-29 12:31:02 -04:00
Isaac Connor 0b5f597918 Merge ../ZoneMinder.connortechnology into storageareas 2016-09-29 12:23:04 -04:00
Isaac Connor 07d8d008ba Merge branch 'fix_auth_timeout' into storageareas 2016-09-29 12:22:56 -04:00
Isaac Connor e423e0802c put back the needed sql and add a lot of debugging 2016-09-29 12:22:32 -04:00
Isaac Connor 0d08c50199 change quotes 2016-09-29 12:22:01 -04:00
Isaac Connor 795665f8c7 Merge branch 'startup_time' into storageareas 2016-09-29 11:07:55 -04:00
Isaac Connor 29c015ecd3 need to put zmGetStartupTime in exports 2016-09-29 11:07:33 -04:00
Isaac Connor 441020e8b8 fix_type 2016-09-29 10:49:40 -04:00
Isaac Connor ab8b58ba48 Merge branch 'fix_auth_timeout' into storageareas 2016-09-29 10:44:30 -04:00
Isaac Connor 0ab84abe5b Since we are returning a hash called user, it should really contain all data for that user. 2016-09-29 10:43:07 -04:00
Isaac Connor ef6b3d01e4 Merge pull request #4 from ZoneMinder/master
Updates
2016-09-29 10:26:04 -04:00
Isaac Connor d1facae287 Merge branch 'fix_auth_timeout' into storageareas 2016-09-29 10:12:05 -04:00
Isaac Connor 404bbb79f0 must return the generated hash 2016-09-29 10:11:37 -04:00
Isaac Connor 5c867aa5f5 Merge branch 'fix_auth_timeout' into storageareas 2016-09-29 10:10:38 -04:00
Isaac Connor 8bc7b9562f introduce config option ZM_AUTH_HASH_TTL which is the # of hours to make an auth hash valid for 2016-09-29 10:04:53 -04:00
Isaac Connor 02ef99584c Revert "alter code to use libv4l2"
This reverts commit 00ef0f4d78.
2016-09-29 09:30:12 -04:00
Isaac Connor f5a29bb679 Revert "add recipes to detect libv4l2"
This reverts commit d67cb0d0df.
2016-09-29 09:29:57 -04:00
Isaac Connor 07ae6b6aa2 commit authhash to session 2016-09-28 11:49:00 -04:00
Isaac Connor 09f7c9ddf9 Merge pull request #1633 from bhaal2/storageareas
Storageareas
2016-09-28 09:43:00 -04:00
Isaac Connor 9808297d72 Merge ../ZoneMinder.connortechnology into storageareas 2016-09-28 09:14:54 -04:00
Isaac Connor d67cb0d0df add recipes to detect libv4l2 2016-09-28 09:14:44 -04:00
Isaac Connor a3a4574c84 Merge ../ZoneMinder.connortechnology into storageareas 2016-09-28 09:09:19 -04:00
Isaac Connor 994f1d566e fix [ 2016-09-28 09:09:01 -04:00
Isaac Connor 9bf48d27b1 implement caching the authhash in the session 2016-09-28 09:08:49 -04:00
Isaac Connor 1ae23b49bf generateAuthHash early when session is active, it will get cached in session 2016-09-28 09:08:36 -04:00
Isaac Connor 48d9f31fa9 add more debug 2016-09-28 09:08:00 -04:00
Isaac Connor 00ef0f4d78 alter code to use libv4l2 2016-09-28 08:43:41 -04:00
Isaac Connor b074a3257d add StartTime to log line about deleting an event. 2016-09-28 08:35:19 -04:00
Isaac Connor 02a196d98b add missing ] 2016-09-28 08:30:22 -04:00
Isaac Connor 4e87ca96c6 Merge ../ZoneMinder.connortechnology into storageareas 2016-09-28 07:10:44 -04:00
Isaac Connor 187e952ffc append PATH_WEB for relative dir_events when instsantiating default Storage Object 2016-09-28 07:10:20 -04:00
Isaac Connor ce2c52c07d allow libavdevice55 and 57 2016-09-27 16:15:24 -04:00
Isaac Connor da5bad7ec2 Merge ../ZoneMinder.connortechnology into storageareas 2016-09-27 15:09:14 -04:00
Isaac Connor 24e33fec7f allow libvlccore8 2016-09-27 15:08:00 -04:00
Isaac Connor 730d7a648d add -f to rm 2016-09-27 14:15:38 -04:00
Isaac Connor 0ee9345433 Merge ../ZoneMinder.connortechnology into storageareas 2016-09-27 13:34:26 -04:00
Isaac Connor 89d4b9fec5 ifdef the libswresample lib stuff 2016-09-27 13:34:10 -04:00
Isaac Connor a77de33997 add a test for lib existence 2016-09-27 12:51:04 -04:00
Isaac Connor ee93424bf9 update jpeh deps to match official debian repo 2016-09-27 12:33:50 -04:00
Isaac Connor e217ca17cd Merge branch 'fix_auth_timeout' into storageareas 2016-09-27 11:57:53 -04:00
Isaac Connor 303a2c6c5f re-open session if neccessary to save AuthHashGeneratedAt 2016-09-27 11:56:31 -04:00
Isaac Connor 6840031ee3 fix auth timeout and user session[username] when checking auth hash for speedup 2016-09-27 11:51:55 -04:00