Commit Graph

1457 Commits

Author SHA1 Message Date
Andrew Bauer 591a30f1fe fix typo 2020-09-30 13:33:11 -05:00
Andrew Bauer 4bc373105d fix typo 2020-09-30 13:12:58 -05:00
Andrew Bauer 9b9138f113 replace popup calls in montagereview 2020-09-30 12:20:24 -05:00
Andrew Bauer d77b55d1d6 replace popup code in add_monitor 2020-09-30 10:40:13 -05:00
Andrew Bauer 2d30d7aafa convert download view to modal 2020-09-30 09:12:54 -05:00
Isaac Connor 3024c46dbb Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-29 14:50:13 -04:00
Andrew Bauer 6eaa8aa211 whitespace 2020-09-29 13:05:00 -05:00
Andrew Bauer 4694ce59bb export event function does not need element 2020-09-29 12:55:57 -05:00
Andrew Bauer a12a870e2c download.js - replace mootools with jquery 2020-09-29 12:51:01 -05:00
Isaac Connor a39a656373 Merge branch 'master' into zma_to_thread 2020-09-29 11:02:40 -04:00
Isaac Connor 1af20cea6a Fix unarchive. The reload was killing the getJSON. Should only do that on success 2020-09-29 09:42:31 -04:00
Isaac Connor ecac5e051a Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-28 09:34:14 -04:00
Isaac Connor 0a4a144bbc Merge branch 'location' 2020-09-28 09:33:28 -04:00
Andrew Bauer 699cbed6af add back and refresh buttons to export view 2020-09-27 12:43:12 -05:00
Andrew Bauer 9ea58dc4a1 eslint 2020-09-27 12:16:04 -05:00
Andrew Bauer c1a0afef95 make group view into a modal 2020-09-27 12:12:01 -05:00
Andrew Bauer 47e5a26da4 eslint 2020-09-27 07:41:05 -05:00
Andrew Bauer a6413ccd7f call modal when edit btn is clicked on event view 2020-09-27 07:12:32 -05:00
Andrew Bauer 2655118cbd change call to popup -> view in event.js 2020-09-26 21:21:29 -05:00
Andrew Bauer 9d2450d55d load export view, rather than popup 2020-09-26 21:15:50 -05:00
Andrew Bauer b2cf48a645 remove unused call to filter popup 2020-09-26 21:06:57 -05:00
Andrew Bauer 935f73ad33 reconfig controlcap cancel button 2020-09-26 16:39:31 -05:00
Andrew Bauer 112003f9de eslint 2020-09-26 13:55:56 -05:00
Andrew Bauer 0c4fcbbe97 convert controlcaps view to bstable 2020-09-26 12:09:41 -05:00
Andrew Bauer b7efdebf9a dynamically find the Level col index 2020-09-25 21:26:22 -05:00
Andrew Bauer 582d85f083 unpopup the controlcaps views 2020-09-25 16:12:05 -05:00
Andrew Bauer eedf18073f add navbar to controlcap views 2020-09-25 16:05:16 -05:00
Andrew Bauer 6a5610e404 add back and refresh buttons to user view 2020-09-25 15:49:18 -05:00
Andrew Bauer 2b0badfebe add back and refresh buttons to zones 2020-09-25 13:44:55 -05:00
Andrew Bauer 8018bd4ed9 add back & refresh buttons to zone view 2020-09-25 13:37:06 -05:00
Andrew Bauer d66b0be1bb fix scalecontrol on frame view 2020-09-25 13:08:55 -05:00
Andrew Bauer ae9139b00c unpopup zone view 2020-09-25 10:52:13 -05:00
Andrew Bauer 493b9d0ef7 revert newlog row colors back to former 2020-09-25 07:21:14 -05:00
Isaac Connor a3f4837186 Use config options for tile datam access tokens and turning geolocation on/off 2020-09-24 20:30:57 -04:00
Isaac Connor 386f991364 Merge branch 'master' into location 2020-09-24 19:28:57 -04:00
Andrew Bauer 89fddf3555 decrease refresh timing 2020-09-24 12:27:03 -05:00
Andrew Bauer e4a1bacbbf get adv search working in newlog view 2020-09-24 11:05:34 -05:00
Andrew Bauer 88f1dcca13 centralize bstable icon var, change table refresh icon 2020-09-24 08:25:39 -05:00
Isaac Connor e4bbbce161 fix eslint 2020-09-24 09:13:44 -04:00
Isaac Connor 624bcdcde0 Add Latitude and Longitude to Monitors and monitor edit as well as using the geolocation api to auto-populate them 2020-09-24 09:01:30 -04:00
Andrew Bauer b4450fecec init bootstrap-table only once 2020-09-23 14:32:40 -05:00
Andrew Bauer 16a593e904 eslint 2020-09-23 13:56:41 -05:00
Andrew Bauer 3f2f7359f0 rough in new log view - very rough 2020-09-23 13:09:19 -05:00
Isaac Connor 70be6bc84c Add an estimated ram use to buffer tabs 2020-09-22 16:21:59 -04:00
Isaac Connor ed6d5a55a5 put an onchange on the monitorType causing a form submit so that Source and Storage tabs update. Rename action to save and put it on the submit button 2020-09-22 14:33:26 -04:00
Isaac Connor b6541aa1ff Move log export to a generic modal 2020-09-21 13:01:58 -04:00
Andrew Bauer 1d1b0e58d2 consolidate getJson fail callbacks to one function 2020-09-20 08:41:16 -05:00
Andrew Bauer 0a7848d9d2 remove uneeded state php and js files 2020-09-19 12:36:55 -05:00
Andrew Bauer 03a0e849b8 remove unneeded js from console.js 2020-09-19 10:24:28 -05:00
Andrew Bauer ec20fdf3ad convert function modal to ajax request 2020-09-19 10:18:59 -05:00
Andrew Bauer d2963fe28f convert donate modal to ajax request 2020-09-19 08:55:08 -05:00
Isaac Connor 8f3b3466af setup onblur function for presetSelector 2020-09-17 20:58:18 -04:00
Isaac Connor 6aa4302fe0 Add EventDiskSpace as a term and add a Debug modal button 2020-09-17 15:17:29 -04:00
Andrew Bauer b64bd97a64 whitespace 2020-09-16 18:22:37 -05:00
Andrew Bauer c8c3b75e33
Reload the page after table refresh
This wasn't needed on my machine, but might be on others
2020-09-16 18:21:06 -05:00
Isaac Connor bea23e2241 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-16 09:58:49 -04:00
Isaac Connor c1f872c9aa Reinit chosen on log filters after updating them 2020-09-16 09:58:15 -04:00
Andrew Bauer afdd4702a2 add server modal 2020-09-16 08:30:45 -05:00
Isaac Connor 4fa9237048 Fix eslint 2020-09-16 08:57:44 -04:00
Isaac Connor a430fe1f7a correct EndTime to End Date/Time. EndTime and EndDate terms are also effective 2020-09-15 21:19:10 -04:00
Andrew Bauer 33ef700dda Cause links in events use eventdetail modal 2020-09-15 09:49:03 -05:00
Andrew Bauer 121671327c call eventdetail modal rather than popup 2020-09-15 08:55:32 -05:00
Isaac Connor ab8e2d2e6c Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-14 14:05:02 -04:00
Isaac Connor d02a61e715 change will to might 2020-09-14 14:03:55 -04:00
Andrew Bauer cc7b65e8aa eslint 2020-09-14 10:31:44 -05:00
Andrew Bauer d2bc39f65f replace storage popup with modal 2020-09-14 09:50:04 -05:00
Andrew Bauer 0a0b555c4c refresh table after archive or unarchive 2020-09-13 11:32:28 -05:00
Andrew Bauer 29710f67ac fix table refresh after delete 2020-09-13 11:25:31 -05:00
Andrew Bauer c4c4551436 replace no permission alerts with enoperm() 2020-09-13 11:09:15 -05:00
Andrew Bauer 096f4a446f Use Ajax to load delete confirm modal 2020-09-13 10:39:51 -05:00
Andrew Bauer 7e55dd14a2 eslint 2020-09-13 08:52:52 -05:00
Andrew Bauer 951afc669f eslint 2020-09-13 08:33:47 -05:00
Andrew Bauer 1599bc4c14 load stats on deman via ajax 2020-09-13 07:32:49 -05:00
Andrew Bauer 0c8bb25889 eslint 2020-09-11 16:49:36 -05:00
Andrew Bauer 2ee70442c0 use done() and fail() callbacks for getJSON 2020-09-11 14:30:36 -05:00
Isaac Connor 3fb62b7904 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-10 19:26:23 -04:00
Matthew Noorenberghe 46e69f8c27 Show correct enabled/disabled status in the function dialog
monitor.Enabled is a string and 0 is truthy in JS
2020-09-10 15:12:31 -04:00
Isaac Connor 2e5a897355
Merge pull request #3038 from mnoorenberghe/fix_function_save
Fix saving function changes
2020-09-10 11:52:38 -04:00
Isaac Connor e37c5ac385 Use FrameId instead of FramesId 2020-09-10 11:10:19 -04:00
Isaac Connor 1f837c1718 Hide eventId not FrameId 2020-09-10 11:04:18 -04:00
Matthew Noorenberghe f046b565c6 Fix saving function changes
Wait for the request to complete before reloading.
2020-09-10 11:01:44 -04:00
Isaac Connor 013e007141 run parseRows on init so that datetime fields get their popups etc 2020-09-09 15:40:44 -04:00
Isaac Connor b34c6dcfc2 correct log, code docs 2020-09-07 13:29:36 -04:00
Isaac Connor 74dc8af76f add global 2020-09-07 13:29:21 -04:00
Isaac Connor b3b6445d60 Fix application of scales to montage streams 2020-09-05 09:15:33 -04:00
Isaac Connor 7e6fbe1ab4 Fix ControlTypes dropdown. 2020-09-05 08:46:18 -04:00
Matthew Noorenberghe 77cca7efac eslint --fix 2020-09-04 10:02:43 -04:00
Isaac Connor 46790bf401 Add monitor json data 2020-09-03 18:25:00 -04:00
Isaac Connor 1f810c8947 Populate the function modal from the javascript monitors array before viewing. 2020-09-03 18:24:45 -04:00
Isaac Connor d4d0a971d1 get rid of errant fo 2020-09-03 10:19:59 -04:00
Isaac Connor cf1f408e96 Don't need pauseString and playStream anymore 2020-09-02 17:34:09 -04:00
Isaac Connor c2760ef768 add needed js stuff for streaming 2020-09-02 17:28:08 -04:00
Isaac Connor d243d798ff add needed js stuff for streaming 2020-09-02 17:27:59 -04:00
Isaac Connor 5aef5e2312 populate monitorData for MonitorStream use 2020-09-02 14:45:10 -04:00
Isaac Connor 8d2ced0fbb use MonitorStream to handle the video streaming. update buttons. Add onload event to streaming image so that we redraw the points where they should be. Handle padding in locating points. 2020-09-02 14:44:11 -04:00
Isaac Connor 4f90f37f0e add back request queue 2020-09-02 14:42:47 -04:00
Isaac Connor 5544057a8d Merge branch 'master' into improve_zone_editing 2020-08-31 18:47:24 -04:00
Isaac Connor 0995708b5b Use ajax request instead of webui to delete events. The reason is that the web ui will spit out the events view after performing the action. Without a filter it will try to list every event. 2020-08-31 10:37:03 -04:00
Isaac Connor fa18887f5c zones can now list multiple monitors so populate a listof monitors with json data 2020-08-31 10:13:30 -04:00
Isaac Connor f00f9ead79 Move monitor class into js/MonitorStream for use elsewhere 2020-08-31 10:12:47 -04:00
Isaac Connor 3e09840995 Merge branch 'master' into improve_zone_editing 2020-08-28 17:43:07 -04:00
Andrew Bauer 990b5bd9dc monitor view - convert links to buttons 2020-08-28 15:22:57 -05:00
Andrew Bauer d69b3e7f43 make cancel go back to console 2020-08-28 10:56:09 -05:00
Isaac Connor 04b3f5d294 Merge branch 'master' into improve_zone_editing 2020-08-28 09:43:48 -04:00
Andrew Bauer 2b6090d8c6 console.js - change all createPopup to window.location.assign 2020-08-28 07:58:42 -05:00
Andrew Bauer 1e78307735 add navigation buttons to monitor view 2020-08-27 16:30:49 -05:00
Isaac Connor dc15663030 Fix scales after applying layout 2020-08-27 10:55:14 -04:00
Isaac Connor 4c1446d856 Fixes to scale selection and remove code that altered width&height in zms url. zms doesn't honour them. Calculate new scale and alter that parameter. 2020-08-27 10:33:08 -04:00
Andrew Bauer 8d202aeef0 eslint 2020-08-26 15:36:38 -05:00
Isaac Connor ab68bef39a Merge branch 'master' into filter_pre_post 2020-08-26 15:28:48 -04:00
Isaac Connor 0ced21dda7 Persist video volume in a cookie so that subsequent events remember the volume level.
Fixes #3013
2020-08-26 15:15:57 -04:00
Isaac Connor 74d2ba56db Persist video volume in a cookie so that subsequent events remember the volume level. 2020-08-26 15:15:10 -04:00
Isaac Connor 24d1ba3a00 fix eslint 2020-08-26 13:41:40 -04:00
Andrew Bauer ac7867eab3 make function view a modal 2020-08-26 11:39:48 -05:00
Isaac Connor e3a48c2db4 Handle the case where the layout has invalid json 2020-08-25 12:07:45 -04:00
Isaac Connor 6fbe7457ff Add missing globals 2020-08-25 11:47:49 -04:00
Isaac Connor 626e892b33 add global 2020-08-25 11:43:55 -04:00
Andrew Bauer 0879ecf9a5 update timeline header 2020-08-24 14:33:01 -05:00
Andrew Bauer 8c32511c83 whitespace 2020-08-24 12:05:31 -05:00
Andrew Bauer e5e2c3b347 fix stats off by 1 frame, don't alert on score 0 2020-08-24 10:57:54 -05:00
Andrew Bauer c6e3107a50 make donate view a modal 2020-08-24 09:31:21 -05:00
Isaac Connor 0f27243007 Merge branch 'master' into filter_pre_post 2020-08-24 09:23:24 -04:00
Andrew Bauer 8ea806e264 eslint 2020-08-23 18:40:58 -05:00
Andrew Bauer 699b20b961 whitespace 2020-08-23 17:54:57 -05:00
Andrew Bauer 65181c84ee update frame top toolbar 2020-08-23 17:53:47 -05:00
Andrew Bauer 86f0d41d8e autoinit changeScale in frame view 2020-08-23 13:17:03 -05:00
Andrew Bauer 4b144dea74 whitespace 2020-08-23 13:02:35 -05:00
Andrew Bauer f06bfe7cbb use bootstrap-table on stats view 2020-08-23 12:23:58 -05:00
Andrew Bauer 69ba9e6d0e eslint 2020-08-23 12:14:09 -05:00
Isaac Connor 2a7ea52330 Merge branch 'release-1.34' 2020-08-23 11:51:54 -04:00
Andrew Bauer de1d1c2ac6 change close link to back link 2020-08-22 14:43:53 -05:00
Andrew Bauer 61f89e3306 rough in frames detail view 2020-08-22 12:45:19 -05:00
Andrew Bauer 73a01855f8 rough in thumbnail animation 2020-08-21 20:44:20 -05:00
Isaac Connor ac0976324f Fix case of filterQuery. Fixes #3017 2020-08-21 11:22:47 -04:00
Andrew Bauer 9357017a39 add export fx to tables 2020-08-21 07:11:57 -05:00
Andrew Bauer de4d144cd4 fix scale dropdown in frame view 2020-08-20 10:16:28 -05:00
Andrew Bauer 247ace7fa2 process clicks per cell in frames 2020-08-20 09:13:11 -05:00
Andrew Bauer c9de30d427 click any row to load frame 2020-08-19 17:54:39 -05:00
Andrew Bauer b2a632a3f8 reinit thumbnail ani on click events 2020-08-19 16:16:27 -05:00
Andrew Bauer 8f70ae192d enable thumbnail zoom on frames view 2020-08-19 15:42:35 -05:00
Andrew Bauer a903a885b6 whitepsace 2020-08-19 14:07:00 -05:00
Isaac Connor c2d6b8f493 revert code that passed the div hightlightOn/Off. Better to pass index. Fixes js errors. 2020-08-19 14:39:15 -04:00
Isaac Connor d0c21995cd Fixes to function converting from pixels to percent. Adjust to 100 if > 100. 2020-08-19 14:14:32 -04:00
Isaac Connor efec1e7d4f remove debug 2020-08-19 14:13:48 -04:00
Andrew Bauer f317bf1722
fix copy/paste typo 2020-08-19 12:07:31 -05:00
Andrew Bauer e38a532b78 rough new frames view 2020-08-19 12:04:08 -05:00
Andrew Bauer ad9b9d91cc disable the back button when new page 2020-08-18 16:57:03 -05:00
Isaac Connor b38c5e98a8 Merge branch 'master' into filter_pre_post 2020-08-18 16:33:04 -04:00
Andrew Bauer 1e41bd0823 whitespace 2020-08-18 13:48:18 -05:00
Andrew Bauer df02d84a56 don't go back if not referred 2020-08-18 13:08:17 -05:00
Andrew Bauer 2c9caeb348 whitespace 2020-08-18 12:40:27 -05:00
Isaac Connor 2d5522df14 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-18 13:25:21 -04:00
Isaac Connor c837a17aea Add a warning about missing EndTime term on UpdateDiskSpace 2020-08-18 13:25:18 -04:00
Andrew Bauer bf63500b08 fix thumbnail animation after user event 2020-08-18 12:00:20 -05:00
Isaac Connor e6d6ee1b67 Merge branch 'filter_warnings' 2020-08-18 11:17:46 -04:00
Isaac Connor 16efa9dbb2 Add extra checks for Deleting without an Archived State term and Running in the background without any actions. 2020-08-18 11:17:22 -04:00
Andrew Bauer 287c585d3d use translated text for delete confirmation 2020-08-18 08:26:45 -05:00
Andrew Bauer b32bcab91f add a delete confirmation modal 2020-08-18 08:06:58 -05:00
Isaac Connor 0a3ad719cd Merge branch 'master' into filter_pre_post 2020-08-17 18:30:44 -04:00
Andrew Bauer 1dd0b44334 eslint nanny strikes again 2020-08-17 16:59:57 -05:00
Isaac Connor e3fe75f21b fix case on filterQuery 2020-08-17 17:42:03 -04:00
Andrew Bauer 80b92573b8 set the icons used in bstable toolbar 2020-08-17 16:18:18 -05:00
Isaac Connor e4425d7565 Merge branch 'master' into filter_pre_post 2020-08-17 12:56:20 -04:00
Isaac Connor 1a6154752a Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-16 20:08:49 -04:00
Isaac Connor a8455d4ecf Add necessary globals 2020-08-16 20:08:42 -04:00
Andrew Bauer 5468c0322e appease the eslint nanny 2020-08-16 16:30:35 -05:00
Andrew Bauer 0cbf559821 only hide cols if cookie not exist 2020-08-16 16:02:43 -05:00
Andrew Bauer f27f6e6394 fix archive buttons, remove asterisk from event name 2020-08-16 14:46:56 -05:00
Andrew Bauer 94d666b296 tiny text under event name, add emailed column 2020-08-16 14:41:50 -05:00
Andrew Bauer ee31761627 cleanup & consolidate events view buttons 2020-08-16 13:44:18 -05:00
Isaac Connor 77c391fcae Add booleanvalues for operators support 2020-08-16 13:07:42 -04:00
Isaac Connor 77f9f4bffb Add ExistsInFileSystem support in Filters. This also includes limiting operators to IS/IS NOT 2020-08-16 13:07:21 -04:00
Andrew Bauer 9be63f1d99 reorganize and init eventTable 2020-08-16 11:34:37 -05:00
Andrew Bauer 93475bef7e eslint nanny 2020-08-15 16:08:53 -05:00
Andrew Bauer 252bf7995a eslint nannt 2020-08-15 15:54:58 -05:00
Andrew Bauer 45fde13535 rough in new events view 2020-08-15 15:27:58 -05:00
Isaac Connor 303cec92f6 Add globals, fixing timeline view 2020-08-11 13:47:37 -04:00
Andrew Bauer 4097693b38
appease the eslint nanny 2020-08-10 13:38:53 -05:00
Isaac Connor ec707acdd1 Fixes to function converting from pixels to percent. Adjust to 100 if > 100. 2020-08-09 22:19:43 -04:00
Isaac Connor a001c93321 fix zone editing globals and inputs being too big 2020-08-08 11:41:24 -04:00
Isaac Connor 5fb56c9f57 Merge branch 'master' into zma_to_thread 2020-08-07 17:52:43 -04:00
Isaac Connor fc5fabf1c5 fix zone editing globals and inputs being too big 2020-08-06 12:24:51 -04:00
Isaac Connor a19990f4d7 Merge branch 'release-1.34' 2020-08-06 11:57:35 -04:00
Isaac Connor ef2ad12846 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-05 20:00:45 -04:00
Isaac Connor ddeef6f031 Fix globals and a Fatal without ZM\ prefix 2020-08-05 20:00:39 -04:00
Isaac Connor 76e0d155d3 declare globals 2020-08-05 19:15:01 -04:00
Isaac Connor 90671cd4e5 Add missing globals 2020-08-04 18:07:01 -04:00
Isaac Connor 1ab828c110 Add globals 2020-08-04 17:35:52 -04:00
Isaac Connor ba4d6dff64 Add globals definitions 2020-08-04 17:05:58 -04:00
Isaac Connor c0f21ab55d Fix globals 2020-08-04 16:36:24 -04:00
Isaac Connor eb1d94345f remove crud 2020-08-03 11:05:58 -04:00
Isaac Connor a2958fe288 Spacing, and don't output mootools for postlogin. Don't use mootools in postlogin 2020-08-03 10:57:08 -04:00
Isaac Connor 6f9947b583 Switch to jquery in login.js. We no longer include mootool for login view. 2020-08-02 19:12:07 -04:00
Isaac Connor 6a4ce29bce eslint fixes 2020-07-30 12:15:05 -04:00
Isaac Connor e746f0babe Use 0 instead of the word auto for scale 2020-07-22 17:28:41 -04:00
Isaac Connor 869860bb26 Merge branch 'master' into zma_to_thread 2020-07-21 17:49:39 -04:00
Isaac Connor 7575afc8d5 Merge branch 'master' into zma_to_thread 2020-07-21 17:38:32 -04:00
Isaac Connor f22f3e9262 use a scaled svg and replace inline js 2020-07-13 14:51:07 -04:00
Andrew Bauer cfd57a851f fix eslint 2020-07-08 20:53:12 -05:00
Isaac Connor 880219bb0f Merge branch 'release-1.34' 2020-07-07 18:58:32 -04:00
Isaac Connor 6469300af5 fix some csp violations
y
2020-07-07 18:57:11 -04:00
Isaac Connor 89f975e646 remove code to play a sound on alarm. Not going to support that when editing a zone. 2020-07-07 16:40:33 -04:00
Isaac Connor 33d4680f02 Apply input limits when switching between percent and pixels. pixels must be integer, percent can be decimal. 2020-07-07 16:35:37 -04:00
Isaac Connor 2db65d3821 Merge branch 'release-1.34' 2020-07-04 09:09:24 -04:00
Isaac Connor 8a35ae2daf Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-07-04 09:04:38 -04:00
Isaac Connor d6d70ab06d Put a list of cameras to cycle through on the left 2020-07-04 09:04:26 -04:00
Isaac Connor fd10f545bd if width/height don't evaluate to an integer, set to auto. 2020-07-04 08:58:09 -04:00
Isaac Connor 343d8d832e handle scale values of '' and 'auto' 2020-07-03 19:18:05 -04:00
Isaac Connor e778ea0918 Update saving Users. Don't allow restrictions on admin user. Fix CSP violations. 2020-06-23 22:19:04 -04:00
Romain ODDONE dcb77cdaea
apply stream scale in zoom coordinates 2020-06-17 14:46:10 +02:00
Isaac Connor 30072cf9e1 Apply input limits when switching between percent and pixels. pixels must be integer, percent can be decimal. 2020-06-15 16:06:51 -04:00
Isaac Connor f71926c736 Merge branch 'release-1.34' 2020-06-05 10:09:07 -04:00
Isaac Connor 02bf85bb34
Merge pull request #2950 from roddone/scale_to_fit_watchview
Fix the scale to fit option that is not persisted on page refresh
2020-06-02 12:53:50 -04:00
Romain ODDONE a9c52a21ec call to changeScale() on page init when "scale to fit" is selected 2020-06-02 17:25:07 +02:00
Isaac Connor 20870e22fa fix eslint errors 2020-05-29 13:28:33 -04:00
Isaac Connor a9cec3ebbd spacing 2020-05-23 16:13:29 -04:00
Isaac Connor 46a13237b5 fix eslint errors 2020-05-22 09:28:15 -04:00
Isaac Connor cc04ced406 load zmMontageLayout ddm explicitly instead of passing event element 2020-05-20 09:42:06 -04:00
Isaac Connor 3faf20516f add changeInterface handler 2020-05-19 16:58:45 -04:00
Isaac Connor 270ab36ff4 load zmMontageLayout ddm explicitly instead of passing event element 2020-05-19 16:56:58 -04:00
Isaac Connor 6bb2c09a72 Merge branch 'release-1.34' 2020-05-15 11:41:34 -04:00
Isaac Connor 424a4ed0b1 add onclick to div.zoom 2020-05-15 11:34:23 -04:00
Isaac Connor 94b29c6c7a replace inline javascript in timeline zoom 2020-05-15 10:44:48 -04:00
Isaac Connor edd718afd2 xtell and ytell are data-xtell and data-ytell fixes #2932 2020-05-13 08:02:49 -04:00
Isaac Connor 807efde523 xtell and ytell are data-xtell and data-ytell fixes #2932 2020-05-13 08:01:04 -04:00
Isaac Connor 4ff341a0f5 Merge branch 'master' into zma_to_thread 2020-05-02 18:03:42 -04:00
Isaac Connor 2da88be307 Use auth_relay instead of auth_hash if AUTH_RELAY==plain or none. 2020-05-01 13:04:16 -04:00
Isaac Connor 4c9f67eb5a Fix no redirect on login with palemoon browser 2020-05-01 13:03:56 -04:00
Isaac Connor 289045500b Don't use event as a variable name unless we are talking about window evnt. Change controlCmd to take the event and get the button from event.target 2020-05-01 13:03:35 -04:00
Isaac Connor 8d8d37c648 fix eslint 2020-05-01 09:57:46 -04:00
Isaac Connor 74ab2e2e12 Don't use event as a variable name unless we are talking about window evnt. Change controlCmd to take the event and get the button from event.target 2020-04-29 16:35:04 -04:00
Isaac Connor eebd0a274d Fix no redirect on login with palemoon browser 2020-04-29 16:34:27 -04:00
Isaac Connor 8b0f88a707 Use auth_relay instead of auth_hash if AUTH_RELAY==plain or none. 2020-04-29 16:34:07 -04:00
Isaac Connor bf99daf494 Merge branch 'rate_dropdown' 2020-04-23 16:36:34 -04:00
Isaac Connor 8ef70f9080 defend against XSS in Monitor Name 2020-04-23 16:28:19 -04:00
Isaac Connor 25cd13f8ad When sending eventCmdReq, pass eventCmdParms since it might have been updated. 2020-04-23 16:25:35 -04:00
Isaac Connor da79f761ad add monitorStreamReplayBuffer to javascript vars. Use it to determine whether to update fast forward and reverse buttons 2020-04-23 16:17:27 -04:00
Isaac Connor 908e892d48 Merge branch 'fix_auth_timeouts' 2020-04-23 16:15:30 -04:00
Isaac Connor 81d329af2f spacing, eslint 2020-04-23 16:12:04 -04:00
Isaac Connor 5bf068791b Merge branch 'rate_dropdown' into release-1.34 2020-04-23 16:11:59 -04:00
Isaac Connor 91e78410a9 Stop the montagereview update while we reload the page 2020-04-23 16:08:36 -04:00
Isaac Connor 9a3f699644 Use a little less ram by passing by reference 2020-04-23 16:07:59 -04:00
Isaac Connor d3f2dd4d6a fix 2020-04-23 16:07:23 -04:00
Isaac Connor 7d0421a02c defend against XSS in Monitor Name 2020-04-23 16:06:44 -04:00
Isaac Connor 93a37671c2 Merge branch 'release-1.34' 2020-04-23 16:01:52 -04:00
Isaac Connor 8e2c76df61 minor code cleanup, adding monitor click event in a previous for loop instead of iterating again 2020-04-23 15:59:12 -04:00
Isaac Connor 63aaf76f0d handle a 0 value for scale as the scale to fit value 2020-04-23 15:57:42 -04:00
Isaac Connor 6a9a8f1d5f check length of returned tr array to prevent errors in js log 2020-04-23 15:55:46 -04:00
Isaac Connor 12252f1f37 defend against XSS in Monitor Name 2020-04-23 15:54:12 -04:00
Isaac Connor 7347ef4030 Handle a zero value for scale 2020-04-23 15:52:47 -04:00
Isaac Connor 91b1d7bbeb alter setButtonState to take either an id or an element so that we can log the missing element 2020-04-23 15:43:36 -04:00
Isaac Connor a6f5ae2601 fix cyclePlay button not working. Move SetButtonState into skin.js 2020-04-23 15:42:30 -04:00
Isaac Connor 96774bd038 fix inline javascript in ptz buttons 2020-04-23 15:39:31 -04:00
Isaac Connor e770be2e13 Merge branch 'release-1.34' 2020-04-23 10:26:16 -04:00
Isaac Connor 264ba6525b Remove debug 2020-04-21 12:19:18 -04:00
Isaac Connor 74e5cc3066 eslint 2020-04-10 14:22:44 -04:00
Isaac Connor 365f0240ad fix inline javascript in ptz buttons 2020-04-10 11:30:30 -04:00
Isaac Connor 105be40ce3 fix 2020-04-10 11:09:46 -04:00
Isaac Connor c8128de673 defend against XSS in Monitor Name 2020-04-10 11:06:39 -04:00
Isaac Connor e9430d48a7 defend against XSS in Monitor Name 2020-04-10 11:06:20 -04:00
Isaac Connor aad0b9362c defend against XSS in Monitor Name 2020-04-10 11:05:48 -04:00
Isaac Connor ea8fe7b9a9 check length of returned tr array to prevent errors in js log 2020-04-06 11:59:27 -04:00
Isaac Connor 571ff260cc Merge branch 'release-1.34' 2020-04-04 16:35:09 -04:00
Isaac Connor e2cb8a656d change exportEvent to expertEvents 2020-04-04 11:53:07 -04:00
Isaac Connor 402c38725b Limit version check popups to once per hour 2020-04-04 11:52:40 -04:00
Isaac Connor 87069b99b6 Fix inline-script errors on groups page referenced in #2890 2020-04-02 14:13:28 -04:00
Isaac Connor 4eed0a9c29 Fix selecting layout after save by using value in session. When applying layout, if height is auto, set the img height to auto. 2020-03-27 14:30:41 -04:00
Isaac Connor 1ab294e291 Fix selecting layout after save by using value in session. When applying layout, if height is auto, set the img height to auto. 2020-03-27 12:43:21 -04:00
Isaac Connor 2bd805c1f1 minor code cleanup, adding monitor click event in a previous for loop instead of iterating again 2020-03-24 16:16:32 -04:00
Isaac Connor 5a20ef959f Merge branch 'release-1.34' 2020-03-20 11:07:46 -04:00
Isaac Connor ecaaae90f3 fix streamImg loading when using applet. Also don't alter actParms as it is not a global. 2020-03-20 11:06:01 -04:00
Isaac Connor f8fa0340fc fix eslint 2020-03-14 09:27:07 -04:00
Isaac Connor 9a3127da06 Merge branch 'rate_dropdown' 2020-03-10 18:47:19 -04:00
Isaac Connor 59bd658a96 replace vjsPause with pauseCLicked. Fix behaviour with rate dropdown and reverse/pause etc. 2020-03-10 18:46:20 -04:00
Isaac Connor 84d719f2dd Merge branch 'release-1.34' into rate_dropdown 2020-03-10 16:06:11 -04:00
Isaac Connor e8553babfa remove extra spaces, fix eslint 2020-03-09 14:43:54 -04:00
Isaac Connor 55f63e8e9d Merge branch 'fix_auth_timeouts' 2020-03-04 11:22:08 -05:00
Isaac Connor a9e3d0691f quotes, fix status ajax call using old auth_hash 2020-03-04 11:17:48 -05:00
Isaac Connor a2dd24ae1f When sending eventCmdReq, pass eventCmdParms since it might have been updated. 2020-03-02 14:38:36 -05:00
Isaac Connor 00de49a5c1 add monitorStreamReplayBuffer to javascript vars. Use it to determine whether to update fast forward and reverse buttons 2020-03-02 12:43:07 -05:00
Isaac Connor 967e5ad30f alter setButtonState to take either an id or an element so that we can log the missing element 2020-03-02 11:52:32 -05:00
Isaac Connor b9acf42929 spacing, eslint 2020-02-29 09:28:04 -05:00
Isaac Connor bf9ba39aa2 Merge branch 'release-1.34' 2020-02-25 18:22:55 -05:00
Isaac Connor c08ec996f7 Fix various aspects of the video generating page. Clean up and update code. Remove inline javascript. Fixes #2843 2020-02-25 18:12:25 -05:00
Isaac Connor 23e4b43aa0 Stop the montagereview update while we reload the page 2020-02-25 16:53:08 -05:00
Isaac Connor 3adc20b04e Use a little less ram by passing by reference 2020-02-25 16:52:45 -05:00
Isaac Connor 4c2fb6bf08 populate a js var minTime and maxTime and use it when setting up the calendar widget to set minTime for end calendar. 2020-02-25 13:40:44 -05:00
Isaac Connor dce4d17b51 fix cyclePlay button not working. Move SetButtonState into skin.js 2020-02-25 13:17:02 -05:00
Isaac Connor a7c28be365 change scale to fit value from auto to 0 2020-02-25 12:14:34 -05:00
Isaac Connor e2ff241017 handle a 0 value for scale as the scale to fit value 2020-02-25 12:13:05 -05:00
Isaac Connor 71dd292a8d Revert "Handle a zero value for scale"
This reverts commit a5da6d12f3.
2020-02-25 11:19:09 -05:00
Isaac Connor a5da6d12f3 Handle a zero value for scale 2020-02-25 11:18:28 -05:00
Isaac Connor 8a83449fba Handle a zero value for scale 2020-02-25 11:18:13 -05:00
Isaac Connor 2f89bd28b7 Handle a zero value for scale 2020-02-25 11:18:02 -05:00
Andrew Bauer c29f2cb8cf
fix our friend, eslint 2020-02-21 14:22:53 -06:00
Isaac Connor ce8c8a755c fix eslint 2020-02-21 10:29:27 -05:00
Isaac Connor dab5c520fe Merge branch 'master' into add_alarmed_zone_to_filters 2020-02-19 14:20:08 -05:00
Isaac Connor 789db4e5a6 Fix filter new rows missing their onchange event on attribute dropdown. Fixes #2817 2020-02-18 13:29:06 -05:00
Isaac Connor 52dfbc92e9 put back operator filtering in parseRows. Do it for all attrs. Fix Zone name in AlarmedZoneId attr 2020-01-24 11:10:02 -05:00
Isaac Connor 29a04dc1b9 Merge branch 'improve_filter_emails' into add_alarmed_zone_to_filters 2020-01-24 09:50:53 -05:00
Isaac Connor 948b3d7e43 Impleent click_AutoEmail to hide/show the Email options 2020-01-22 17:02:16 -05:00
Isaac Connor 9d41334e8f Merge branch 'master' into add_alarmed_zone_to_filters 2020-01-22 13:45:37 -05:00
Isaac Connor dbdb13efd7 Instead of passing query string in form post variables, store it in session so that it survives redirects. Fixes #2811 2020-01-20 11:02:43 -05:00
Garrett Scott ead52f30b1 Bug fix: Allows for inital/base install without the option MultiPort config value assigned 2020-01-20 00:44:20 -08:00
Andrew Bauer de5bf21d8a
fix eslint 2020-01-17 15:06:46 -06:00
Isaac Connor d0003215b1 Merge branch 'master' into rate_dropdown 2020-01-17 12:30:35 -05:00
Isaac Connor a398f33e68 fix delTerm button not being enabled because it is a button now, not an input 2020-01-17 09:17:29 -05:00
Isaac Connor 6a43c2deb5 fix zoom_range to zoomout_range 2020-01-16 14:17:40 -05:00
Andrew Bauer f13a7199e1
fix eslint 2020-01-07 21:53:55 -06:00
Isaac Connor c64de372a7 when auth_hash changes, update various CmdParms 2020-01-07 17:08:57 -05:00
Isaac Connor 1c197db619 Merge branch 'master' into rate_dropdown 2020-01-07 14:49:58 -05:00
Isaac Connor 6ac26ec1aa quotes 2020-01-05 17:33:53 -05:00
Isaac Connor 00f8a450de spaces and quotes 2020-01-05 14:59:25 -05:00
Isaac Connor 7fdf6165d5 Fix case in var name 2020-01-03 17:08:11 -05:00
Isaac Connor f572c4092a add checks for Zoom, Focus, White, Iris movement types 2020-01-03 15:58:57 -05:00
Andrew Bauer 98f7fb63b9 fix eslint errors 2019-12-31 19:24:51 -06:00
Isaac Connor 714d304528 Change WebColour to a colour selector input and add a random colour icon. Select a random colour on new Monitor creation 2019-12-31 19:10:29 -05:00
Isaac Connor 42a724891b spacing 2019-12-20 16:11:38 -05:00
Isaac Connor 23dde04725 remove timeout on changing runstate. 2019-12-20 16:10:30 -05:00
Isaac Connor d87bf5a156 replace the rate display with a dropdown 2019-12-20 11:02:12 -05:00
Isaac Connor e39a95d761 Add AlarmedZoned to filters, work on fixing filter behaviour in js. Enable viewing filter results in montagereview 2019-12-18 19:06:10 -05:00
Isaac Connor 3b12b67b4a fix eslint 2019-12-18 10:40:51 -05:00
Isaac Connor 5b7efb2b33 fix mouseover streaming in chrome when adblocker disabled 2019-12-13 17:48:22 -05:00
Isaac Connor 0dbc1ef15c Use multiport when talking monitor stream on montage 2019-12-13 11:51:55 -05:00
Isaac Connor 8e645e45e1 fix selecting Monitors by passing MonitorId as MonitorId[] 2019-12-02 14:21:25 -05:00
Isaac Connor b70b75421b quotes and spacing 2019-12-02 14:18:27 -05:00
Isaac Connor 9d0a416311 remove debugging code 2019-12-02 13:41:42 -05:00
Isaac Connor c9a324b7b3 improve the configureExportButton to look at specific inputs instead of just counting checkboxes 2019-12-02 13:40:02 -05:00
Isaac Connor 09fcbad666 Merge branch 'master' into zma_to_thread 2019-11-30 14:59:39 -05:00
Isaac Connor 50986ce3b4 Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread 2019-11-30 13:53:05 -05:00
Isaac Connor ab9f99bdbb Fix Width & Height rotation when scaling. Fixes #2760 2019-11-22 12:18:30 -05:00
Isaac Connor 207e5918c8 fix lint, remove debug 2019-11-19 11:37:45 -05:00
Isaac Connor 56618aac32 Handle buttons not existing 2019-11-10 15:49:39 -05:00
Isaac Connor 5b02bc76f4 Fix donate now functionality. Improve zmWindow to take an optional sub path so that we can target /donate directly 2019-11-05 10:07:42 -05:00
Isaac Connor 3653ad5ce3 update group editing, solving inline javascript problems and removing cruft 2019-11-01 13:37:52 -04:00
Isaac Connor 6ae220f756 improvements to layout on zones and zone. Use ViewWidth and ViewHeight. Replace inline javascript 2019-10-29 18:06:32 -04:00
Isaac Connor 524a39a224 changeCodec no longer needs to be passed this 2019-10-18 13:40:29 -04:00
Isaac Connor f25a823bc8 Fix event => zm_event 2019-10-16 08:53:40 -04:00
Isaac Connor b1496643eb fix js error in onvif probe 2019-10-03 17:31:10 -04:00
Isaac Connor 95615fee35 fix eslint 2019-10-02 16:42:50 -04:00
Isaac Connor e4b5052fb4 Add delete from logs ajax capability. Make the clear button use it. Fixes #2620 2019-10-02 15:39:04 -04:00
Andrew Bauer 90b02beb94
fix eslint 2019-09-30 09:52:41 -05:00
Isaac Connor 393f0a369c Revamp timeline. Make it handle being full browser width. remove onclicks. 2019-09-28 14:23:23 -04:00
Isaac Connor e4265bd075 spaces 2019-09-26 16:13:49 -04:00
Isaac Connor 1b653e7e79 Add warnings for when SaveJPEGs and VideoWriter are both set to disabled 2019-09-25 10:14:41 -04:00
Isaac Connor 8d95b2f5f8 Don't select Layout when changing size in montage 2019-09-22 14:22:24 -04:00
Isaac Connor d7810bf9b3 fix eslint 2019-09-20 14:16:37 -04:00
Isaac Connor 6c39fd133d fix eslint 2019-09-20 10:44:38 -04:00
Isaac Connor b05ecd881e add onchange to scale 2019-09-19 14:57:21 -04:00
Isaac Connor 2da9edf0ff add onchange to scale 2019-09-19 14:57:17 -04:00