Commit Graph

16822 Commits

Author SHA1 Message Date
Isaac Connor 06ecb3ccb1 Add update script to add DecodeEnabled 2020-12-10 14:39:14 -05:00
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 ced396e437 Add DecodingEnabled to Monitors 2020-12-10 14:06:26 -05:00
Isaac Connor 42ab098764 Add DecodingEnabled to Monitors 2020-12-10 14:06:16 -05:00
Isaac Connor 7b1ca0e66d Use the new DecodingEnabled function 2020-12-10 14:05:57 -05:00
Isaac Connor 7f72d5399f add decoding_enabled and DecodingEnabled function 2020-12-10 14:05:46 -05:00
Isaac Connor c65e63798d Don't do decode when in RECORD OR NODECT and passthrough and no jpegs 2020-12-10 13:47:30 -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 9fb953bc84 set the right image attributes for frames view 2020-12-10 07:24:48 -06: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 c43ffcf58f eslint 2020-12-09 18:02:34 -06:00
Andrew Bauer 026b8cfb0c eslint 2020-12-09 17:58:46 -06:00
Isaac Connor 5482d3b3d5 Quiet error when calling logout when already logged out 2020-12-09 17:56:27 -05:00
Isaac Connor eb4b7f248d handle sort_field and limit not existing in _REQUEST 2020-12-09 17:56:27 -05: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
Isaac Connor 63e36340c6 Remove extra } 2020-12-08 11:26:52 -05:00
Isaac Connor 84c7a117f5 Use width and height attrs instead of css for rendering speed. Also alt doesn't need validHtmlStr because Event.Id will have no weird characters 2020-12-08 11:26:43 -05:00
Isaac Connor bfe5bb0249 Include code to handle when we are already logged in but trying to auth with a mismatched auth_hash 2020-12-08 11:19:22 -05:00
Isaac Connor c156731f0b Allow users with canView Events to view event list. Don't allow unarchive or delete if they don't have canEdit 2020-12-08 10:33:25 -05:00
Isaac Connor b0f2ff6302 Add Session cleaning 2020-12-08 10:21:55 -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 36b5702c50 Increase LinkedMonitor debugging. Fix LinkedMonitors. Fixes #3091 2020-12-05 19:36:44 -05:00
Isaac Connor 7a827c1fd6 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-12-05 16:57:32 -05: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 fdbca4760f dbFetchAll should always return an array. Not null on error 2020-12-05 16:38:25 -05:00
Isaac Connor df35bd75a5 Escape column names for mysql 8 2020-12-05 16:29:23 -05:00
Andrew Bauer ed043f9d55 bw dropdown - match only on bwselect class 2020-12-05 12:31:30 -06: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 7106cd43a7 eslint 2020-12-04 18:30:05 -06:00
Andrew Bauer ac069e6e5e fix zoom class in skins.js 2020-12-04 14:47:13 -06: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
Isaac Connor 3a7571dd63 undo bogus cache use in Object constructor 2020-12-04 15:16:43 -05:00
Andrew Bauer 5665eb14f5 fix bw select again 2020-12-03 19:33:10 -06:00
Isaac Connor fc6c8ac33d
Merge pull request #3090 from hax0kartik/master
Fix font rendering issue
2020-12-03 19:03:42 -05:00
hax0kartik 8012438573 Fix font rendering issue 2020-12-04 05:22:54 +05:30