ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
21,838 Commits
32 Branches
93 Tags
163 MiB
Commit Graph

21838 Commits (75430dad9e08beb40c2533f705128c9e2a96ac9b)

Author SHA1 Message Date
Isaac Connor 52c865cfeb Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-11-01 12:40:51 -04:00
Isaac Connor 2859634aaa Set xhrFields: widthCredentials: true so that we send cookies with our streaming xhr requests so that we pick up new auth hashes 2022-11-01 08:22:53 -04:00
Isaac Connor 5bd50fe575 Add Access-Control-Allow-Credentials: true so that we can pass cookies along with xhr requests. 2022-11-01 08:21:59 -04:00
Isaac Connor 09ece9320e Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-10-31 21:20:07 -04:00
Isaac Connor a6b16510d0 Add Cuase, Notes and EndDateTime to columns in events list on watch view 2022-10-31 21:19:41 -04:00
Isaac Connor b5febb1886
Merge pull request #3621 from ovargasp/master 
Adds icon to button for menu on collapsed UI
 2022-10-31 18:21:58 -04:00
Isaac Connor cd4a9fbb98 Merge ../ZoneMinder.connortechnology 2022-10-31 18:01:04 -04:00
Isaac Connor 6199613c40 Merge branch 'add_event_data' 2022-10-31 18:00:32 -04:00
Isaac Connor 85e1f21ca7 Make button on Filter Debug modal be Close instead of Cancel 2022-10-31 17:59:52 -04:00
Isaac Connor 6edbee7c70 Handle empty but defined REQUEST[action] 2022-10-31 17:59:34 -04:00
ovargasp 1bd77022a6
Merge pull request #3 from ovargasp/add-icon-to-hamburger-button-on-collapsed-web-view 
Update functions.php
 2022-10-31 12:10:43 -06:00
ovargasp 6ee083a145
Update functions.php 2022-10-31 11:53:11 -06:00
Isaac Connor 218aef1220 Add libswscale6 and libswresample4 2022-10-31 11:24:34 -04:00
Isaac Connor 1c38e79c1b Add Reports table. Also set ENGINE for other tables that were hard coded to InnoDb. Fixes #3615 2022-10-31 09:29:50 -04:00
Isaac Connor 25100cd592 Fix missed references to oldW and oldH 2022-10-31 09:27:53 -04:00
Isaac Connor 2fb631fa6e Clean up debug. Clone the entire monitor object into oldMonitor instead of cherry-picking properties. Fixes use of new name when deleting old symlink. Always check for existence of monitor dir and symlink after done saving. 2022-10-31 09:27:53 -04:00
Isaac Connor 33455cbad2 Remove left over references to REQUEST['newMonitor']. Add error reporting to creating monitor directory and symlinking when adding a new monitor 2022-10-31 09:27:53 -04:00
Isaac Connor 6b3768fdf6 When saving monitor, only turn off error reporting for symlink. Don't delete old symlink unless the name has changed. 2022-10-31 09:27:53 -04:00
Isaac Connor df421cbd4c remove iiot which shouldn't be there 2022-10-28 08:45:08 -04:00
Isaac Connor 6886400c51 Merge ../ZoneMinder.connortechnology into add_event_data 2022-10-27 17:35:12 -04:00
Isaac Connor b0deed5376 Add EventData section to event view 2022-10-27 17:33:19 -04:00
Isaac Connor f0a1a1b0ee Merge branch 'master' into add_event_data 2022-10-27 17:08:12 -04:00
Isaac Connor 1ef87ab0b8 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-10-27 17:05:24 -04:00
Isaac Connor 1540c3b41b fetchImage now takes a documentElement not a jquery object 2022-10-27 17:01:56 -04:00
Isaac Connor 32951523b8 We no longer have outputHelper, so just output a warning if we don't have streaming support 2022-10-27 17:01:25 -04:00
Isaac Connor b8a97b0fb9 Don't report errors from mkdir, it normally exists 2022-10-27 17:01:00 -04:00
Isaac Connor c20a327eef Fixups to EventData model 2022-10-27 17:00:24 -04:00
Isaac Connor 8a5e9d944d Add authentication to FramesController 2022-10-27 16:59:34 -04:00
Isaac Connor 46fcd79881 Add authentication and fixups to EventDataController.php 2022-10-27 16:59:18 -04:00
Isaac Connor 70b0e53780 Add routing for EventData 2022-10-27 16:58:57 -04:00
Isaac Connor 6d073119cb Rough in views for EventData 2022-10-27 16:57:05 -04:00
Isaac Connor 586d43798f Rough in model and controller for Event_Data 2022-10-27 14:47:21 -04:00
Isaac Connor a25436369f Add db update to create Event_Data table 2022-10-27 14:17:24 -04:00
Isaac Connor ac55528f8f Untested change to use TIMESTAMP instead of DATETIME for Monitor_Status/UpdatedOn. This is for mysql 5.5. 2022-10-27 10:56:11 -04:00
Andrew Bauer 99a5e3b764 replace php Memcached with Apc on Fedora 2022-10-27 08:32:04 -05:00
Isaac Connor 2d9bc06170 Set a 1 second timeout one the communications socket, so that our blocking commandQueue check will check zm_terminate every now an then 2022-10-26 13:09:43 -04:00
Isaac Connor 7cec2d1dc3 Fix eslint, remove debug 2022-10-26 10:33:16 -04:00
Isaac Connor 2965ea2826 Fix eslint, remove debug 2022-10-26 10:33:02 -04:00
Isaac Connor 779d41f583 Add bootstrap-table-1.21.1 to eslint igore. Delete old versions 2022-10-26 10:23:16 -04:00
Isaac Connor f96c90ffa7 Fix saving Server modal. Form was incomplete, action and view were duplicated. Don't need javascript just use the submit button Save. 2022-10-26 09:00:25 -04:00
Isaac Connor ff08b0f871 Make search input the same size as other toolbar elements 2022-10-25 15:17:41 -04:00
Isaac Connor bfc4b5aa67 Implement filtering by ServerId 2022-10-25 13:36:02 -04:00
Isaac Connor 8d8337135b Give ServerId filter an id 2022-10-25 13:32:53 -04:00
Isaac Connor 0e88b5c7a3 Fix function name hash_frame_array_by_key => array_to_hash_by_key 2022-10-25 13:32:06 -04:00
Isaac Connor 91e728c0d3 Sort servers in global array 2022-10-25 13:31:40 -04:00
Isaac Connor d1a7749ff4 fix eslint 2022-10-25 13:27:55 -04:00
Isaac Connor f357327b9c Merge branch 'master' into log_filters 2022-10-25 13:05:43 -04:00
Isaac Connor 418eeb9260 Add Server, Level, StartDateTime, EndDateTime filters to logs view 2022-10-25 13:05:25 -04:00
Isaac Connor d11bb88f94 rough in array_to_hash_by_key function to generate hashes of Id => Object 2022-10-25 12:56:38 -04:00
Isaac Connor 0bc1f2792d add specific filters for level, StartDateTime and EndDateTime. 2022-10-25 12:50:29 -04:00