Commit Graph

16896 Commits

Author SHA1 Message Date
Isaac Connor 1c10cc492b Fix StartTime to StartDateTime 2020-12-02 13:15:32 -05:00
Andrew Bauer aac47ed361 fixes to export functions 2020-12-02 12:02:24 -06:00
Andrew Bauer f13533cab7 convert export functions to jquery 2020-12-02 10:53:55 -06:00
Andrew Bauer 70689acf8d remove data-mobile-responsive, use table-responsive-sm instead 2020-12-02 07:47:57 -06:00
hax0kartik 59d5860560 Merge branch 'Font' of https://github.com/hax0kartik/zoneminder into Font 2020-12-02 09:45:16 +05:30
hax0kartik 1ec13f3d06 Free font->data only when font itself is valid 2020-12-02 09:44:49 +05:30
Kartik db9883389f
Merge pull request #1 from connortechnology/font
Font
2020-12-02 04:46:24 +05:30
Andrew Bauer 347c64eb7d remove warning 2020-12-01 13:30:57 -06:00
Andrew Bauer 6da826d79c fix typo 2020-12-01 13:29:43 -06:00
Isaac Connor 8397ec3b9d Merge branch 'release-1.34' 2020-12-01 14:28:10 -05:00
Isaac Connor 48775e2230 Fix Clear Log by using minTime and maxTime as timestamps. Fix export including unselected filters. Can't just serialize the form asit may contain fields in teh querystring so you get an array of values instead of a single value 2020-12-01 14:24:41 -05:00
Isaac Connor baeb1dbd5b Take an optional debug param in dbQuery 2020-12-01 14:07:23 -05:00
Isaac Connor ae7a706526 Handle minTime and maxTime being specified as either a timstamp or a datetime. Remove duplicated query building code. Reduce ram requirements when exporting logs. 2020-12-01 14:04:51 -05:00
Andrew Bauer 051e361958 eslint 2020-12-01 12:19:01 -06:00
Andrew Bauer b0da7f5920 fix navbar bandwidth dropdown 2020-12-01 10:27:08 -06:00
Andrew Bauer 93f11bbc82 set responsive breakpoint for small screens on watch & events views 2020-12-01 09:50:32 -06:00
Andrew Bauer f12c8f453e after deleting an event, call streamNext rather than reload 2020-12-01 09:30:06 -06:00
Andrew Bauer 23fcd1f2c5 modernize the event playback view 2020-12-01 09:07:42 -06:00
Isaac Connor ff2981b9b3 code style. Remove unused members. Make WriteFrameImage const 2020-12-01 09:53:51 -05:00
Isaac Connor 3c11b4f151 Add CMakeLists so that fonts get installed 2020-12-01 09:35:24 -05:00
Isaac Connor d1c3864778 Use the ZM_FONTDIR substitution instead of hardcoding a path 2020-12-01 09:21:54 -05:00
Isaac Connor 7326af95a9 Add ZM_FONTDIR as a place to store fonts for timestamping 2020-12-01 09:21:25 -05:00
Andrew Bauer ac01e0638a
Update skin.css 2020-11-30 10:19:12 -06:00
Andrew Bauer ee9f98d7e6
make modal content more readable on dark skin 2020-11-30 10:06:35 -06:00
Isaac Connor 836cd2d58d Merge branch 'Font' of https://github.com/hax0kartik/zoneminder into font 2020-11-30 09:45:39 -05:00
hax0kartik d290ffc1b3 Set individual rgb components instead of memset which is wrong 2020-11-30 17:57:59 +05:30
Isaac Connor 67dac2651b Log an error with path when can't open video 2020-11-29 17:06:07 -05:00
Isaac Connor 159edbfce9 Fix video file having wrong id 2020-11-29 16:25:33 -05:00
hax0kartik 32e2563643 Free font data when destructor is called 2020-11-29 10:53:20 +05:30
hax0kartik 890a52605f Satisfy cpplint 2020-11-29 10:25:06 +05:30
hax0kartik bbeb599fce Remove bigfont 2020-11-28 20:28:34 +05:30
hax0kartik b212b0e450 Allow modifying font file location 2020-11-28 20:18:17 +05:30
hax0kartik 0a7b7b9661 Bound check values 2020-11-28 19:44:45 +05:30
hax0kartik 528699f942 Use ctzll + new font format for improving drawing speed 2020-11-28 18:46:20 +05:30
Isaac Connor d68b922632 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-11-27 13:30:31 -05:00
Isaac Connor 8c56ac80c5 Make Name,Path,Url in storage modal 100% 2020-11-27 13:30:24 -05:00
Isaac Connor 80c4e2fa57 Fix table not being 100%. Use appropriate bootstrap style labels for radios 2020-11-27 13:29:57 -05:00
Isaac Connor 3a943d6f09 Add ServerId method, code style 2020-11-27 13:29:05 -05:00
Isaac Connor 95cbc053fc Try other storage areas if we fail to create event dir on the assigned area. 2020-11-27 13:28:38 -05:00
Isaac Connor a6245d9e90 Minor code style update 2020-11-27 13:27:51 -05:00
Andrew Bauer a67fb0bb16 eslint 2020-11-26 19:28:25 -06:00
Andrew Bauer 8d8054bc0f deploy bstable to watch view 2020-11-26 17:00:05 -06:00
Andrew Bauer 08dabf1a4f don't add "zoom" class when thumb animation is off 2020-11-25 13:29:14 -06:00
Andrew Bauer 28614ce703 change where we check for web_animate_thumbs 2020-11-25 13:16:11 -06:00
Andrew Bauer ff4b0e6309 add option to disable thumb animation 2020-11-25 13:03:16 -06:00
Isaac Connor d6345d32fd Reduce error level of warnings about monitors having Function==NONE 2020-11-25 09:53:06 -05:00
Isaac Connor be27630a85 escape the word Groups 2020-11-23 19:33:53 -05:00
Isaac Connor 4deb3a8d84 escape the word Groups 2020-11-23 19:31:21 -05:00
Isaac Connor e0a30ab5e0 Only log an error if we haven't been given sigpipe. 2020-11-22 17:28:53 -05:00
Isaac Connor 660636c0e2 loop if we get egain when flocking. Warn when format not specified. 2020-11-22 16:54:42 -05:00