Isaac Connor
|
d0c1f823f4
|
Apply chosen styles to dropdowns in Options
|
2023-01-20 01:38:44 -05:00 |
|
Isaac Connor
|
af57b53583
|
Queue packets instead of packet locks in event thread. Since we are using std::shared_ptr and not modifying the packet, should not need locking. Also, locking in one thread and unlocking in another is apparentlyundefined behaviour and doesn't work infreebsd.
|
2023-01-20 01:38:09 -05:00 |
|
Isaac Connor
|
a0b4aa04c5
|
Increase infomation in packet lock debugging
|
2023-01-20 01:36:51 -05:00 |
|
Isaac Connor
|
52f02d97d8
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2023-01-17 20:42:59 -05:00 |
|
Isaac Connor
|
237b6fda90
|
Fix complaint
|
2023-01-18 16:18:30 -05:00 |
|
Isaac Connor
|
4282c25493
|
include sys/socket.h to define MSG_DONTWAIT
|
2023-01-18 01:14:02 +00:00 |
|
Isaac Connor
|
577c827bac
|
Upgrade sendfile7 to not mash size on stack. offset is a nullptr most of the time, don't dereference it. When falling back to read/write, just read in chunks of 4096, because I don't know how to make llvm use c99 dynamic arrays. Check for HAVE_SENDFILE. Fixes #3505
|
2023-01-17 16:09:30 -05:00 |
|
Isaac Connor
|
c4d0c4ded4
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2023-01-17 13:09:50 -05:00 |
|
Isaac Connor
|
779ae5051e
|
Don't wait for decode in Analyze.
|
2023-01-17 12:58:52 -05:00 |
|
Isaac Connor
|
2883e53a02
|
Must tell everyone in the packetqueue that we are done before expecting everyone to leave the packetqueue. This syncs up with master.
|
2023-01-08 15:07:33 -05:00 |
|
Isaac Connor
|
61b9dec336
|
Hide timestamp caption from bottom of video.js event view. It serves no purpose. Fixes #3488
|
2023-01-03 19:20:20 -05:00 |
|
Isaac Connor
|
5833812514
|
Add 2>&1 to command to delete event dir so that we get error messages logged.
|
2023-01-03 19:12:27 -05:00 |
|
Isaac Connor
|
e805a22844
|
Move code from Event to Storage to implement delete_path()
|
2023-01-03 19:12:23 -05:00 |
|
Isaac Connor
|
cd61619bce
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2023-01-03 18:09:26 -05:00 |
|
Isaac Connor
|
390d914b61
|
Use ajax() instead of getJSON with no timeout when deleting events.
|
2023-01-03 13:37:57 -05:00 |
|
Isaac Connor
|
29e7f7de4c
|
Update monitor preset view: Use a submit button instead of input with javascript. Remove no longer needed js code. Sort presets by Name.
|
2023-01-02 17:22:13 -05:00 |
|
Isaac Connor
|
4bcfc2360d
|
Remove stopping the statusCmdTimer, it isn't used.
|
2023-01-02 17:06:35 -05:00 |
|
Isaac Connor
|
d78d30836b
|
Fix saving Server modal. Form was incomplete, action and view were duplicated. Don't need javascript just use the submit button Save.
|
2022-12-22 12:54:54 -05:00 |
|
Isaac Connor
|
43bdbcc43e
|
Bump version to 1.36.33
|
2022-11-29 13:01:11 -05:00 |
|
Isaac Connor
|
0eeb9bff10
|
Improve info when moving event to show source and Dest paths
|
2022-11-29 12:59:08 -05:00 |
|
Isaac Connor
|
a996dbe99a
|
Remove dead code from report_event_audit.js
|
2022-11-29 12:57:00 -05:00 |
|
Isaac Connor
|
17b51355ed
|
Use Y-m-d H:i:s instead of c for date formatting to match what datetimepicker expects. remove unused action input and put view in the get part of form action
|
2022-11-29 12:56:49 -05:00 |
|
Isaac Connor
|
1130790ff6
|
Add styles to table headers to left align them to match the body
|
2022-11-29 12:56:38 -05:00 |
|
Isaac Connor
|
6c8e2b61db
|
Remove debug
|
2022-11-18 14:21:30 -05:00 |
|
Isaac Connor
|
38b5ddd80a
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-11-17 13:28:52 -05:00 |
|
Isaac Connor
|
46ddbeba92
|
Must convert strings into integers before doing math as of php 8.2 Fixes Unsupported operand types: string - int
|
2022-11-17 13:28:31 -05:00 |
|
Isaac Connor
|
101aa82776
|
implode the output from zmu to fix php complaint abou array to string conversion
|
2022-11-16 16:16:27 -05:00 |
Michael
|
940bfcdfa6
|
Set web backend db connection to utf8
|
2022-11-16 10:36:14 -05:00 |
|
Isaac Connor
|
03fe7fb627
|
Cleanup the state modal. Fix form post
|
2022-11-16 10:15:31 -05:00 |
|
Isaac Connor
|
16528cadf6
|
Make .form-group styles export page specific because they are affecting modals
|
2022-11-16 10:15:19 -05:00 |
|
Isaac Connor
|
1a0c08c32c
|
Fix crash in zmfilter DiskSpace Update when Event doesn't exist
|
2022-11-15 13:39:41 -05:00 |
|
Isaac Connor
|
0eacb7d650
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-11-15 13:38:43 -05:00 |
|
Isaac Connor
|
a31879f2f8
|
Fix warning about parentheses around assignment used as truth value
|
2022-11-15 13:04:27 -05:00 |
|
Isaac Connor
|
244cb69de1
|
Add error message when minTime >= maxTime
|
2022-11-15 12:45:21 -05:00 |
|
Isaac Connor
|
ed330dc280
|
Fix infinite recursion in montagereview
|
2022-11-15 12:15:40 -05:00 |
|
Isaac Connor
|
0f5ad49547
|
Check for return value of openEvent. In the situation where opening the event fails we must not crash.
|
2022-11-15 11:58:58 -05:00 |
|
Isaac Connor
|
2ef917801a
|
Turn back on error_reporting, just don't display them
|
2022-11-14 14:24:21 -05:00 |
|
Isaac Connor
|
d1455774f0
|
Don't report errors from mkdir, it normally exists
|
2022-11-14 14:13:21 -05:00 |
|
Isaac Connor
|
94ac27c4b8
|
Try out just using connkey as the semaphore key instead of ftok
|
2022-11-14 14:12:25 -05:00 |
|
Isaac Connor
|
12d6069734
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-11-14 12:37:44 -05:00 |
|
Isaac Connor
|
fedd6d0909
|
Allow MonitorName as default sort field as well as Monitor
|
2022-11-14 12:37:25 -05:00 |
|
Isaac Connor
|
83a84d7dd9
|
Better logging of view and action when using GET
|
2022-11-03 21:39:58 -04:00 |
Andrew Bauer
|
f8e5fd5aa5
|
fix git cherry-pick gone wrong
|
2022-11-03 09:33:59 -05:00 |
|
Andrew Bauer
|
55ee6fc727
|
replace php Memcached with Apc on Fedora
|
2022-11-03 09:29:10 -05:00 |
|
Isaac Connor
|
a3a44e2f27
|
Handle empty but defined REQUEST[action]
|
2022-11-02 10:10:38 -04:00 |
|
Isaac Connor
|
3cd0a477fb
|
Make button on Filter Debug modal be Close instead of Cancel
|
2022-11-02 10:10:26 -04:00 |
|
Isaac Connor
|
83a0e295ad
|
Add Cuase, Notes and EndDateTime to columns in events list on watch view
|
2022-11-02 10:10:17 -04:00 |
|
Isaac Connor
|
7938524b14
|
Add Access-Control-Allow-Credentials: true so that we can pass cookies along with xhr requests.
|
2022-11-02 10:09:50 -04:00 |
|
Isaac Connor
|
ed98fec9d3
|
Set xhrFields: widthCredentials: true so that we send cookies with our streaming xhr requests so that we pick up new auth hashes
|
2022-11-02 10:09:36 -04:00 |
Isaac Connor
|
cb2480ddf6
|
Fix _ instead of __git_main in file::Find::find, clean up use of __git_main
|
2022-11-02 10:09:13 -04:00 |