Commit Graph

3022 Commits

Author SHA1 Message Date
Isaac Connor 66a1660423 Add missing comma 2020-12-10 14:08:01 -05:00
Isaac Connor 4667e21636 Add DecodingEnabled to Function modal 2020-12-10 14:06:40 -05:00
Isaac Connor 37d4b3472f Add useful help for function modal describing each mode and the purpose of the Enabled checkbox 2020-12-10 13:43:28 -05:00
Andrew Bauer 3a4cdb7e50 eslint 2020-12-09 20:06:38 -06:00
Andrew Bauer e0ac68786f remove unneeded thumb animation functions from frames.js 2020-12-09 18:48:58 -06:00
Andrew Bauer 39023b3e7b don't set zoom class in frames.js 2020-12-09 18:19:10 -06:00
Andrew Bauer 026b8cfb0c eslint 2020-12-09 17:58:46 -06:00
Andrew Bauer 951debab7f watch.js - replace mootools ajax w/ jquery 2020-12-09 12:25:40 -06:00
Andrew Bauer 4e09a32836 fix one canEdit 2020-12-08 14:36:19 -06:00
Andrew Bauer 69e540c104 deploy canView and canEdit js objects 2020-12-08 14:25:48 -06:00
Isaac Connor 63c483ba92 canEditMonitors is set in skin.js.php 2020-12-08 11:27:18 -05:00
Andrew Bauer 691f9a70f9 eslint 2020-12-07 14:44:45 -06:00
Andrew Bauer 1772d37c08 convert updatePresetLabels() to jquery 2020-12-07 12:32:07 -06:00
Andrew Bauer 389ad22dcd watch.js - target not $target 2020-12-07 10:36:14 -06:00
Andrew Bauer 6e17b04a7e WIP continue jquery conversion of watch.js 2020-12-07 10:22:54 -06:00
Isaac Connor 4d33667a85 Merge branch 'release-1.34' 2020-12-05 16:51:42 -05:00
Isaac Connor ea6478b8a0 Escape column names for mysql 8. Fixes #3092 2020-12-05 16:38:53 -05:00
Isaac Connor df35bd75a5 Escape column names for mysql 8 2020-12-05 16:29:23 -05:00
Isaac Connor 0a89b906a0 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-12-05 10:41:35 -05:00
Isaac Connor 9b8f63b36f EstimatedRamUse to Estimated Ram Use so we don't an en_gb translation 2020-12-05 10:23:29 -05:00
Andrew Bauer 0bf39dc954 fix setting the thumbnail class in events 2020-12-04 14:44:05 -06:00
Andrew Bauer 21aeccb5d0 centralize thumb animation js, add delay 2020-12-04 14:35:39 -06:00
Isaac Connor 0d0eac98be Move the form below the navbar because it has a form in it. Remove oninput from minTime and maxTime 2020-12-04 15:28:51 -05:00
Isaac Connor 11f527514e use a common function for datetime changes. 2020-12-04 15:28:26 -05:00
Isaac Connor d998eac6ef Update Filter code and Groups display 2020-12-04 15:17:04 -05:00
Andrew Bauer e93de2a3a4 partial jquery convesion of watch.js 2020-12-03 13:12:01 -06:00
Isaac Connor 6877054fea Parse tree dumping should be debug not warning 2020-12-03 11:17:41 -05:00
Andrew Bauer ce4d9cd657 put back manual refresh button on watch view 2020-12-03 08:38:28 -06:00
Andrew Bauer 74fe47c4c5 don't autorefresh watch view table 2020-12-03 08:31:52 -06:00
Andrew Bauer dd0cac35fe include filterquery in watch view event list ajax 2020-12-03 07:53:09 -06:00
Andrew Bauer a38c392266 eslint 2020-12-03 07:22:32 -06:00
Andrew Bauer d5df996bca deploy animated thumbnails on watch view 2020-12-02 19:44:12 -06:00
Isaac Connor 76eea525b7
Merge pull request #3085 from hax0kartik/Font
Font
2020-12-02 16:16:21 -05: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
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
Andrew Bauer 051e361958 eslint 2020-12-01 12:19:01 -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 836cd2d58d Merge branch 'Font' of https://github.com/hax0kartik/zoneminder into font 2020-11-30 09:45:39 -05:00
hax0kartik 528699f942 Use ctzll + new font format for improving drawing speed 2020-11-28 18:46:20 +05:30
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 cf08010ebe Fix redirect on zone editing 2020-11-18 13:04:56 -05:00
Andrew Bauer f3756def08 deploy server side pagination for frames view 2020-11-14 14:45:22 -06:00
Andrew Bauer 9aa6fea6a3 frames view server pagination WIP 2020-11-14 14:19:28 -06:00