ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,205 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

7721 Commits

Author SHA1 Message Date
Isaac Connor 8de122ef26 remove await that we can't use 2021-01-12 14:13:42 -05:00
Isaac Connor c6cf1da47d Merge branch 'master' into zma_to_thread 2021-01-11 17:08:44 -05:00
Isaac Connor a51dfe552b Remove auth_hash var that overlaps global auth_hash var. Use attr('src') instead of src 2021-01-11 16:41:43 -05:00
Isaac Connor 3639593ae5 use js.post instead of getJSON. 2021-01-11 15:22:15 -05:00
Isaac Connor bb50de268b Fix setting img.src to new url. Won't have any effect here as we are reloading the whole page. 2021-01-11 15:21:39 -05:00
Isaac Connor 8204d2d7eb Introduce sleep() function. Use it on ajax error to wait 1 second before reloading page 2021-01-11 13:57:39 -05:00
Andrew Bauer 1f2c10dcc0 replace mootools getelement and addevent 2021-01-11 13:47:36 -05:00
Andrew Bauer 2f8f0a0b4a use plain js to get the livestream rather than mootools 2021-01-11 13:47:36 -05:00
Andrew Bauer ac5c821bbd use plain js for mouseover thumb animation 2021-01-11 13:47:36 -05:00
Andrew Bauer 11bc2d7682 bind this to streamCmdQuery 2021-01-11 13:47:36 -05:00
Andrew Bauer 4dea379673 increase timeout value for streamQuery to avoid contention with streamScale during jpeg playback 2021-01-11 13:47:36 -05:00
Andrew Bauer a761b9c0ff deprecate legacy "stills" option from event view 2021-01-11 13:47:34 -05:00
Andrew Bauer 5b40589d61 add a button to go to the stats view 2021-01-11 13:46:51 -05:00
Andrew Bauer 6796126ae2 autohide frame stats when out of pixels 2021-01-11 13:46:51 -05:00
Andrew Bauer 61dc0adb60 remove extra uneeded on change event handler 2021-01-11 13:46:51 -05:00
Andrew Bauer bbf233b332 fix frame view scale control 2021-01-11 13:46:51 -05:00
Andrew Bauer 64f755be4a clean up postlogin js 2021-01-11 13:46:51 -05:00
Andrew Bauer 751102fa6d eslint 2021-01-11 13:46:51 -05:00
Andrew Bauer 8d75f30d22 remove unneeded comment 2021-01-11 13:46:51 -05:00
Andrew Bauer 2e932571f3 autohide the event stats when out of pixels 2021-01-11 13:46:51 -05:00
Andrew Bauer beb74cb54a replace mootools Request.JSON 2021-01-11 13:46:51 -05:00
Andrew Bauer 381bf0c219 fix cyclePrev with only 1 monitor 2021-01-11 13:46:51 -05:00
Andrew Bauer 3f73c3bc9d replace Mootool delay with setTimeout 2021-01-11 13:46:50 -05:00
Andrew Bauer 57da991e7a go back rather than close window 2021-01-11 13:46:50 -05:00
Andrew Bauer 638e801c07 replace mootools .delay method 2021-01-11 13:46:50 -05:00
Andrew Bauer 0963795e44 eslint 2021-01-11 13:46:50 -05:00
Andrew Bauer 774d522cee eslint 2021-01-11 13:46:50 -05:00
Andrew Bauer 2e815bc23e eslint 2021-01-11 13:46:50 -05:00
Andrew Bauer a1678f5ea4 replace mootool Cookie object with plain JS 2021-01-11 13:46:50 -05:00
Andrew Bauer 85da53f86f add reference to browserInfo function 2021-01-11 13:46:50 -05:00
Andrew Bauer 50bf1d649f replace Mootools Browser object with our own 2021-01-11 13:46:50 -05:00
Andrew Bauer d2cc65c8a3 eslint 2021-01-11 13:46:50 -05:00
Andrew Bauer a6964f66e2 use JS instead of Mootools to detect IE browser 2021-01-11 13:46:50 -05:00
Andrew Bauer fe8561d868 replace mootools periodical method 2021-01-11 13:46:50 -05:00
Isaac Connor 6d9fa27b37 Fix changeScale not updating zms url when the page initially loads as not scale to fit 2021-01-11 13:46:50 -05:00
Isaac Connor 0db759ede1 split long line 2021-01-11 13:46:50 -05:00
Andrew Bauer 8e3217b38a eslint 2021-01-11 13:46:50 -05:00
Andrew Bauer 1b385ee195 show alarm state and fps on zones view 2021-01-11 13:46:50 -05:00
Andrew Bauer 29f3e9007a replace mootools in MonitorStream 2021-01-11 13:46:50 -05:00
Andrew Bauer 70f73f5475 modernize monitors view 2021-01-11 13:46:50 -05:00
Andrew Bauer cf10ce010c tableExport plugin is no longer used 2021-01-11 13:46:50 -05:00
Andrew Bauer aeec7b025d remove js files that define popupSizes 2021-01-11 13:46:50 -05:00
Andrew Bauer 5c6e093b13 old overlay code is no longer used 2021-01-11 13:46:50 -05:00
Andrew Bauer 69268f79a4 remove obsolete controlpreset js files 2021-01-11 13:46:50 -05:00
Andrew Bauer 590d65671c WIP jquery conversion 2021-01-11 13:46:50 -05:00
Andrew Bauer ad3894ab1b WIP replace with jquery 2021-01-11 13:46:50 -05:00
Andrew Bauer 4ade926df4 eslint 2021-01-11 13:46:50 -05:00
Andrew Bauer d25d2b4894 replace mootools in montagereview.js 2021-01-11 13:46:50 -05:00
Andrew Bauer 3d77069b0b bring montage minimize chervron into the view 2021-01-11 13:46:50 -05:00
Andrew Bauer 113d2d1797 replace mootools in montage.js 2021-01-11 13:46:50 -05:00
Andrew Bauer 0a5d6ca4ba replace mootools in cycle.js 2021-01-11 13:46:50 -05:00
Andrew Bauer b1b71e5f09 fix return too soon when no log results 2021-01-11 13:46:50 -05:00
Andrew Bauer ddce421cab eslint 2021-01-11 13:46:50 -05:00
Andrew Bauer cb6bf682e8 eslint 2021-01-11 13:46:50 -05:00
Andrew Bauer b6d5802301 revert back to a standard modal (no static backdrop) for objdetect 2021-01-11 13:46:50 -05:00
Andrew Bauer d9a97fbf40 eslint 2021-01-11 13:46:50 -05:00
Andrew Bauer 6f78b5a105 eslint 2021-01-11 13:46:50 -05:00
Andrew Bauer b95f1baa96 WIP replace mootools in zone.js 2021-01-11 13:46:50 -05:00
Andrew Bauer e6a6c1b52f WIP replace mootools in zone.js 2021-01-11 13:46:50 -05:00
Andrew Bauer 0dbeb89c62 remove replace mootools in drawZonePoints function 2021-01-11 13:46:50 -05:00
Andrew Bauer dcda8cb679 handle objdetect links in a more consistent manner 2021-01-11 13:46:50 -05:00
Andrew Bauer a8f79a6e00 prevent page scrolling when objdetect modal is opened 2021-01-11 13:46:50 -05:00
Andrew Bauer 6da429f49f remove redundant modal toggle from events.js 2021-01-11 13:46:50 -05:00
rabsym 56bb4a74fc Avoid top-scroll when returning from bs_modal objdetect 2021-01-11 13:46:50 -05:00
Andrew Bauer e27dd44547 upgrade to bootstrap-table 18.1 release 2021-01-11 13:46:50 -05:00
Isaac Connor f7de6045ef Change Disabled to Auto and add h265 as codec options 2021-01-11 13:46:50 -05:00
Andrew Bauer 9e9860d6c0 replace mootools getelement and addevent 2021-01-11 09:06:21 -06:00
Andrew Bauer 2094f78adf use plain js to get the livestream rather than mootools 2021-01-11 07:27:11 -06:00
Andrew Bauer ff7a1037be use plain js for mouseover thumb animation 2021-01-11 07:21:51 -06:00
Andrew Bauer 9968a65ee6 bind this to streamCmdQuery 2021-01-10 14:21:52 -06:00
Andrew Bauer 4a2b3e569b increase timeout value for streamQuery to avoid contention with streamScale during jpeg playback 2021-01-10 13:02:07 -06:00
Andrew Bauer d45b4ca434 deprecate legacy "stills" option from event view 2021-01-10 10:25:22 -06:00
Andrew Bauer 2e0b32b2fc add a button to go to the stats view 2021-01-09 16:13:33 -06:00
Andrew Bauer 08d640a06c autohide frame stats when out of pixels 2021-01-09 16:01:32 -06:00
Andrew Bauer 1ea4ee6ef1 remove extra uneeded on change event handler 2021-01-09 15:09:20 -06:00
Andrew Bauer 9cb1709f77 fix frame view scale control 2021-01-09 15:08:08 -06:00
Andrew Bauer e415118f77 clean up postlogin js 2021-01-09 14:40:38 -06:00
Andrew Bauer 22be24ccde eslint 2021-01-09 08:54:13 -06:00
Andrew Bauer 4eeb0a90f6 remove unneeded comment 2021-01-09 08:45:20 -06:00
Andrew Bauer df44afb164 autohide the event stats when out of pixels 2021-01-09 08:43:53 -06:00
Andrew Bauer a55e53a737 replace mootools Request.JSON 2021-01-08 14:34:10 -06:00
Andrew Bauer ece8fccc63 fix cyclePrev with only 1 monitor 2021-01-08 13:16:16 -06:00
Andrew Bauer c67c1ce6a0 replace Mootool delay with setTimeout 2021-01-08 13:06:56 -06:00
Andrew Bauer c7690a7088 go back rather than close window 2021-01-08 12:40:26 -06:00
Andrew Bauer 9ec09c0c85 replace mootools .delay method 2021-01-08 12:25:17 -06:00
Andrew Bauer 72eaf267c1 eslint 2021-01-08 10:45:59 -06:00
Andrew Bauer c0431eca86 eslint 2021-01-08 10:42:45 -06:00
Andrew Bauer 55d99e8e7c eslint 2021-01-08 10:10:47 -06:00
Andrew Bauer f816c72517 replace mootool Cookie object with plain JS 2021-01-08 10:04:46 -06:00
Andrew Bauer b56883a985 add reference to browserInfo function 2021-01-08 09:35:32 -06:00
Andrew Bauer 62fc1fb1aa replace Mootools Browser object with our own 2021-01-08 09:32:51 -06:00
Andrew Bauer d0f035596c eslint 2021-01-08 08:50:57 -06:00
Andrew Bauer d3a71aff14 use JS instead of Mootools to detect IE browser 2021-01-08 08:27:06 -06:00
Andrew Bauer 43fabd9b65 replace mootools periodical method 2021-01-08 07:32:52 -06:00
Andrew Bauer a431f08133 eslint 2021-01-06 15:57:30 -06:00
Andrew Bauer 4756a03b16 show alarm state and fps on zones view 2021-01-06 14:27:06 -06:00
Andrew Bauer 9d7f738f61 replace mootools in MonitorStream 2021-01-06 14:19:25 -06:00
Andrew Bauer 6dcedb584d modernize monitors view 2021-01-05 10:16:51 -06:00
Andrew Bauer ebbd2888f0 tableExport plugin is no longer used 2021-01-04 15:40:53 -06:00
Andrew Bauer bd18904bf4 remove js files that define popupSizes 2021-01-04 15:33:26 -06:00
Andrew Bauer 51132cb5e1 old overlay code is no longer used 2021-01-04 13:51:03 -06:00
Andrew Bauer 0cdc2b448d remove obsolete controlpreset js files 2021-01-04 13:18:05 -06:00
Andrew Bauer 75e2f526ae WIP jquery conversion 2021-01-04 13:05:33 -06:00
Andrew Bauer a1b26c8f61 WIP replace with jquery 2021-01-04 10:28:16 -06:00
Andrew Bauer 21180777b4 eslint 2021-01-03 14:23:13 -06:00
Andrew Bauer 49a535abaa replace mootools in montagereview.js 2021-01-03 11:45:53 -06:00
Andrew Bauer 0dd98855cc bring montage minimize chervron into the view 2021-01-03 08:53:07 -06:00
Andrew Bauer 1f6b2798ff replace mootools in montage.js 2021-01-03 07:40:50 -06:00
Andrew Bauer 1ab181ec54 replace mootools in cycle.js 2021-01-02 16:57:23 -06:00
Andrew Bauer c166b0de0f fix return too soon when no log results 2021-01-02 16:33:56 -06:00
Andrew Bauer 5ad8e90dda
eslint 2021-01-02 13:48:40 -06:00
Andrew Bauer f0610b5eb7
eslint 2021-01-02 13:25:38 -06:00
Andrew Bauer 56e88aea89
revert back to a standard modal (no static backdrop) for objdetect 2021-01-02 12:34:33 -06:00
Andrew Bauer 809e67d352 eslint 2021-01-02 12:24:12 -06:00
Andrew Bauer e9bdaa988e eslint 2021-01-02 12:06:02 -06:00
Andrew Bauer cc69b150de WIP replace mootools in zone.js 2021-01-02 11:58:03 -06:00
Andrew Bauer 62575c0d0e WIP replace mootools in zone.js 2021-01-02 11:33:21 -06:00
Andrew Bauer ebad6194ee remove replace mootools in drawZonePoints function 2021-01-02 10:52:17 -06:00
Andrew Bauer 12c0ccea7c handle objdetect links in a more consistent manner 2021-01-02 08:52:26 -06:00
Andrew Bauer a61da04969 prevent page scrolling when objdetect modal is opened 2021-01-02 08:06:35 -06:00
Andrew Bauer ea7184e619
remove redundant modal toggle from events.js 2021-01-01 09:36:49 -06:00
rabsym b7970d69a5 Avoid top-scroll when returning from bs_modal objdetect 2021-01-01 14:15:35 +01:00
Steve Gilvarry 7c783aa53d
Deal with Error for Auto not in Array 
Add value auto into the array, even if not implemented as without it you cannot save a monitor.
 2021-01-01 14:38:33 +11:00
Andrew Bauer bc30d303f7 upgrade to bootstrap-table 18.1 release 2020-12-30 08:01:28 -06:00
Isaac Connor 284b9f963f Merge branch 'master' into zma_to_thread 2020-12-29 12:18:26 -05:00
Isaac Connor a362f2abc2
Merge pull request #3102 from connortechnology/fix_3101 
fix api monitor save daemon control
 2020-12-25 13:29:01 -05:00
Andrew Bauer 2adeedf418 additional mootools cleanup in event.js 2020-12-25 07:19:41 -06:00
Andrew Bauer 9209f40daa
eslint 2020-12-24 14:59:27 -06:00
Andrew Bauer 5fa8cbf158 add Frames button to event view 2020-12-24 14:46:13 -06:00
Andrew Bauer 3fd50bb01d reorganize logger.js and use jquery 2020-12-24 14:32:23 -06:00
Andrew Bauer e66b050c72 WIP jquery conversion of event view 2020-12-24 10:38:44 -06:00
Andrew Bauer b093e99688 disable click to select on the events table Cause column 2020-12-24 07:10:47 -06:00
Isaac Connor 3132820a71 Move daemonControl logic into the model. daemonControl needs to be called on the previous monitor data so that it knows which daemons to stop. 2020-12-23 13:48:12 -05:00
Andrew Bauer 816c306518 use jquery for submitTab 2020-12-23 12:29:39 -06:00
Andrew Bauer a94550795b update setButtonState 2020-12-23 12:20:31 -06:00
Andrew Bauer f64f3262ed WIP replace mootools in evnet.js 2020-12-23 12:19:35 -06:00
Andrew Bauer f857d12103 WIP replace mootools in event.js 2020-12-23 10:51:23 -06:00
Andrew Bauer 493bfa6a16 eslint 2020-12-23 09:15:31 -06:00
Andrew Bauer 3c79204592 replace mootools in add_monitors 2020-12-23 08:54:11 -06:00
Isaac Connor 286a5a72a3 Merge branch 'master' into zma_to_thread 2020-12-23 09:47:31 -05:00
Andrew Bauer c91a0b2c09 fixup jquery click functions 2020-12-23 08:37:28 -06:00
Andrew Bauer c497b94378 use tlzoom class to avoid conflict with thumbnail zoom 2020-12-23 07:57:44 -06:00
Andrew Bauer a9b92905ca eslint 2020-12-22 19:07:12 -06:00
Isaac Connor a1917d83d0 Merge branch 'master' into zma_to_thread 2020-12-22 19:52:09 -05:00
Andrew Bauer cc5a732103 continue work on timeline.js 2020-12-22 16:06:21 -06:00
Isaac Connor 6be9b294ef Hidden and hidden are two very different classes 2020-12-22 17:00:07 -05:00
Andrew Bauer 8a26252914 update object detected link in events 2020-12-22 12:42:27 -06:00
Andrew Bauer 9af383db92 set the width style for the objdetect modal 2020-12-22 12:30:44 -06:00
Andrew Bauer 2ea4b39d93 don't use quotes around the event id 2020-12-22 11:46:31 -06:00
Andrew Bauer ee45916526 move objdetect image to a modal 2020-12-22 10:08:31 -06:00