Commit Graph

7028 Commits

Author SHA1 Message Date
Isaac Connor 03c8e86908 update some quotes 2020-10-10 11:09:51 -04:00
Isaac Connor 9e6db17e68 Fix getting next event due to case of asc 2020-10-10 11:09:39 -04:00
Isaac Connor 630d9011f3 Fix redirect when saving users 2020-10-10 09:48:09 -04:00
Isaac Connor 9cc7f0d360 Merge branch 'release-1.34' 2020-10-08 09:28:25 -04:00
Isaac Connor c28ff1f2b4 Include loading EndTime when loading Events data so that we can determine if an event is in-progress
Keep track of last_id which is the last frame id that we have info for. Use it instead of Frame Count to prevent
accessing non-existent frame records
close ffmpeg_input on event change
include duration in status messages because it may change when playing an in-progress event.
when we hit the end of our frame data if it is an in-progress event, reload the event data instead of moving to the next event.
Include X-Timestamp in http headers to match live stream behaviour
Only send time to next event when mode=ALL
Fix scale behaviour on event view
2020-10-08 09:06:56 -04:00
Isaac Connor 624006022c Use a redirect to get rid of post on reload 2020-10-07 11:59:11 -04:00
Isaac Connor 95b09ad182 Add samesite=strict to all Cookie setting 2020-10-07 11:26:18 -04:00
Isaac Connor b683d5326a Test for empty array in htmlOPtions when notifying about not selecting a value 2020-10-07 11:22:42 -04:00
Isaac Connor efd56a2e09 spacing 2020-10-07 11:16:02 -04:00
Isaac Connor 7f67d09749 test for monitorIds value before calling explode because explode will return an array with an empty first element instead of an empty array 2020-10-07 11:14:57 -04:00
Isaac Connor ae7ed5a342 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-06 16:51:24 -04:00
Isaac Connor 9abde9ee06 Merge branch 'release-1.34' 2020-10-06 16:51:12 -04:00
Isaac Connor 044ce61ddb Always do event change detection whether we are paused or not. Because we might be single-stepping. Change progress to a double as that it what it should be. 2020-10-06 16:47:51 -04:00
Isaac Connor d7429014b6 Convert progress to a double instead of int. 2020-10-06 16:36:56 -04:00
Isaac Connor 0e89d28c26 Send SEEK as two integers representing a float 2020-10-06 16:34:06 -04:00
Andrew Bauer 87fd316e5b makePopupButton removed, use makeButton instead 2020-10-05 16:40:14 -05:00
Andrew Bauer 76af02cc76 whitespace 2020-10-05 16:31:26 -05:00
Andrew Bauer 01596ec26c whitespace 2020-10-05 15:53:46 -05:00
Andrew Bauer 9c7ebf8c9e unpopup video view 2020-10-05 15:44:07 -05:00
Andrew Bauer f93450f9ea remove plugin support for viewing downloads 2020-10-05 14:44:45 -05:00
Andrew Bauer 321de3c604 only update changed elements in video view 2020-10-05 13:59:44 -05:00
Andrew Bauer 862f0ca732 add xmlfooter to video view, replace mootools 2020-10-05 09:37:00 -05:00
Isaac Connor 2faedc6248 Sort sessions by access time so that we list active users first 2020-10-05 10:34:52 -04:00
Isaac Connor 1cf181372f Only load users for logged in sessions 2020-10-05 10:30:57 -04:00
Isaac Connor fa641a0345 Convert progress to a double instead of int. 2020-10-05 10:30:38 -04:00
Isaac Connor 6d1e5330e3 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-05 09:30:49 -04:00
Isaac Connor 93021f5806 Update getNearEvents to handle when event doesn't exist 2020-10-05 09:30:33 -04:00
Andrew Bauer 2852d14ca6 use data-on-change-this instead of inline js 2020-10-04 08:04:11 -05:00
Andrew Bauer 2e6efbb349 replace inlince onchange event in control view 2020-10-03 21:44:24 -05:00
Andrew Bauer d9b8a7ceb2 remove unused view 2020-10-03 21:35:38 -05:00
Andrew Bauer adb715c42c fix typo 2020-10-03 21:32:07 -05:00
Andrew Bauer a0ad52bac9 replace another inline onchange event 2020-10-03 21:30:48 -05:00
Andrew Bauer b4d2fa5e75 replace inline onchange event 2020-10-03 21:14:24 -05:00
Andrew Bauer 65b6dad48c eslint 2020-10-03 17:38:56 -05:00
Andrew Bauer 8d19cee811 unpopup the addnewuser button 2020-10-03 17:12:44 -05:00
Andrew Bauer aee5430bc8 only load preset and settings modals when needed 2020-10-03 17:00:20 -05:00
Andrew Bauer 1643fb686b convert settings popup to modal 2020-10-03 16:51:25 -05:00
Andrew Bauer 1ef1b48c71 remove warnings used for testing 2020-10-03 07:08:04 -05:00
Andrew Bauer 391ce88f05 eslint 2020-10-02 21:11:54 -05:00
Andrew Bauer a97e526298 fix save button in controlpreset modal 2020-10-02 16:10:32 -05:00
Andrew Bauer 802e439cb5 convert controlpreset view to a modal 2020-10-02 15:46:28 -05:00
Isaac Connor 311ba4ef69 use bootstrap styles on logged in user table. Include ip address 2020-10-02 16:04:56 -04:00
Isaac Connor 7261a7b1dd Merge branch 'sessions_in_db' 2020-10-02 15:57:11 -04:00
Isaac Connor e9d120f032 remove debug 2020-10-02 15:56:56 -04:00
Isaac Connor bc5002515e remove debug 2020-10-02 15:56:50 -04:00
Isaac Connor d97f8af215 Finish showing logged in users 2020-10-02 15:56:39 -04:00
Isaac Connor 23f2c1468f rough in a table of the logged in users 2020-10-02 15:21:58 -04:00
Isaac Connor 5d20dde85c Implement a Session class that takes over session functions and stores in the database 2020-10-02 14:50:22 -04:00
Andrew Bauer 7b5090ceab move newlog view to log view 2020-10-02 13:26:35 -05:00
Andrew Bauer c5f69b9441 eslint 2020-10-02 13:24:30 -05:00