Commit Graph

7357 Commits

Author SHA1 Message Date
Isaac Connor ced396e437 Add DecodingEnabled to Monitors 2020-12-10 14:06:26 -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
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 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
Andrew Bauer e93de2a3a4 partial jquery convesion of watch.js 2020-12-03 13:12:01 -06:00
Isaac Connor 05bd6e1c56 Fix editing groups causing a new Group to be added. You have to tell cakephp which Group you are saving. Also fix the resulting output to be the saved group, not a list of monitors. Fixes #3088 2020-12-03 13:14:19 -05:00
Isaac Connor 6877054fea Parse tree dumping should be debug not warning 2020-12-03 11:17:41 -05:00
Isaac Connor c8aac87f74 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-12-03 10:26:27 -05:00
Isaac Connor 19122d0824 Fix bandwidth dropdown clicking 2020-12-03 10:25:59 -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
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
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
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
Isaac Connor 67dac2651b Log an error with path when can't open video 2020-11-29 17:06:07 -05:00
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
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
Isaac Connor 5bf5d58ac1 Fixes recovering frames from jpegs. Use Time::HiRes stat to get microseconds. 2020-11-16 11:32:50 -05:00
Andrew Bauer a2b5271835 fix copy/paste typo 2020-11-14 17:34:59 -06:00
Andrew Bauer 0ffb5e153c modify FilterTerm to support Frames view searches 2020-11-14 17:33:18 -06: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
Andrew Bauer f88d721ae3 fix issue with events view and ALL pagination 2020-11-14 10:27:33 -06:00
Isaac Connor f32d10a1ab Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-11-13 17:16:13 -05:00
Isaac Connor 66f7cc55dc Spacing code comments, quotes 2020-11-13 17:05:23 -05:00
Andrew Bauer 52e747791d rough in frames server pagination backend 2020-11-13 12:34:01 -06:00
Isaac Connor a581cb9de1 Make various text input options be 90% 2020-11-13 10:18:35 -05:00
Isaac Connor 70ebd570e0 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-11-13 09:52:10 -05:00
Isaac Connor 3cf31435a7 fix next/prev buttons by correcting the sort_field when it is StartTime or EndTime 2020-11-13 09:51:54 -05:00
Andrew Bauer c0225a35aa use different variable assignment for clarity 2020-11-13 07:24:17 -06:00
Andrew Bauer a15c8ea7d8
Merge pull request #3072 from ZoneMinder/iconnor_ajax_event_changes
Rework code to use Filter methods to generate advanced search
2020-11-13 07:10:08 -06:00
Isaac Connor 95f8aad19b Fix detection of filter['id'] 2020-11-11 17:39:55 -05:00
Isaac Connor fe733fe1e6 Must use & instead of & in filter redirect 2020-11-11 17:39:37 -05:00
Isaac Connor 73e8c04b6f Fix encoding of = in filter['Id']. Fixes redirect after saving 2020-11-11 17:39:20 -05:00
Isaac Connor 52c7cc5869 reorganize code. Remove Server caching as it is done in Object.php. 2020-11-11 11:49:44 -05:00
Isaac Connor b4aacde5bf Remove debug. Auth is pretty solid these days 2020-11-10 13:15:46 -05:00
Isaac Connor 5b10fff2a0 Use cached objects when using new instead of only find_one 2020-11-10 13:14:36 -05:00
Isaac Connor f2630b8fbc Merge branch 'master' into move_event_totals_to_monitor_status 2020-11-06 14:17:23 -05:00