Commit Graph

22105 Commits (e216b6b00818a7791d3e4aeaf427194a67c351ea)

Author SHA1 Message Date
Isaac Connor 047d1fb4e8 Fix missing / on close li tags 2023-01-25 16:39:05 -05:00
Isaac Connor 79d3d05060 Remove brackets and add and cnj for default filters. Use Event Loading SQL similar to other views, allowing filtering by monitor Name etc. Remove specific Archive filter. 2023-01-25 13:27:55 -05:00
Isaac Connor 4826b2edf4 Make monitor filters flex, and wrap when on mobile 2023-01-25 13:26:47 -05:00
Isaac Connor c8e4dcbe51 Add valid case for Archived 2023-01-25 13:25:33 -05:00
Isaac Connor ecf790b1d6 Diskspace(null) updates the db record so no need to call save as well 2023-01-25 12:27:59 -05:00
Isaac Connor 1658164ee1 explode the val in term for Monitor rule type. It will be a comma separated value, not an array 2023-01-25 11:50:16 -05:00
Isaac Connor d6de278070 Only add filter terms if not in live mode. Use filter sql instead of manual rules 2023-01-25 11:50:16 -05:00
Isaac Connor c48fc3ce6e Define events even if sql fails 2023-01-25 11:50:16 -05:00
Isaac Connor 6f991d81ea Go to history mode when viewing matches 2023-01-25 11:50:16 -05:00
Isaac Connor 031f5fe6f4 Don't output preg_match errors 2023-01-25 11:50:16 -05:00
Isaac Connor 874119c04d Event->Diskspace(null) automatically updates the db. So don't do a second save 2023-01-25 11:50:16 -05:00
Isaac Connor d5d5f33806 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-01-25 11:42:01 -05:00
Isaac Connor 774c963810 Merge branch 'master' of ../otherbranch 2023-01-25 11:41:52 -05:00
Isaac Connor fe95e5b2bc Add valid test case for AlarmFrames 2023-01-25 11:41:38 -05:00
Isaac Connor fd327d9b91 Replace hr with borders. Make all content scrollable fixing buttons being off screen. Shrink labels on mobile 2023-01-24 21:33:42 -05:00
Isaac Connor 56dea17703 Fix issues with removing minTime and maxTime 2023-01-24 21:33:32 -05:00
Isaac Connor caf6fc2528 Merge branch 'master' of ../otherbranch 2023-01-24 21:31:45 -05:00
Isaac Connor 4d543073ec disable minTime and maxTime inputs, in favour of filter versions 2023-01-24 21:31:30 -05:00
Isaac Connor b9c3be907c Merge branch 'master' of ../otherbranch 2023-01-24 21:23:42 -05:00
Isaac Connor 86d1ac81e6 Use 'Y-m-d H:i:s' for formatting as datetimepicker doesn't want timezone. Use Filter object methods instead of arrays. Usse Monitor instead of MonitorId in filter so that widget looks better 2023-01-24 21:23:31 -05:00
Isaac Connor d2a6c83056 Merge branch 'master' of ../otherbranch 2023-01-24 21:17:45 -05:00
Isaac Connor 1431eca868 Remove stripslashes when saving config values. The values in REQUEST have not been escaped, so stripslashes is not appropriate. Fixes #3655 2023-01-24 11:47:31 -05:00
Isaac Connor 9e46cc598e Apply chosen styles to dropdowns in Options 2023-01-24 10:42:47 -05:00
Isaac Connor 08f02ecd09 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-24 10:28:38 -05:00
Isaac Connor 9c52ae7856 Increase infomation in packet lock debugging 2023-01-24 10:26:46 -05:00
Isaac Connor 5e71a8fb72 Add operator filtering to has_term 2023-01-21 18:41:11 -05:00
Isaac Connor 9789e02f2a create archiveTypes static function. Use it. Add has_term function 2023-01-21 18:40:44 -05:00
Isaac Connor 77d27ceccc Merge ../ZoneMinder.connortechnology 2023-01-21 18:39:53 -05:00
Isaac Connor 1bfd45ea34 Don't need to call chosen in monitor.js as it is called in body 2023-01-20 14:15:22 -05:00
Isaac Connor 38853e22d7 Remove uneeded classes and tags 2023-01-20 14:12:19 -05:00
Isaac Connor 39f2fa5fbb When auto scaling, if we get a negative new height, just make it 100% width 2023-01-20 14:12:02 -05:00
Isaac Connor 9479ccae8f Add scroll bar to watch content when sticky 2023-01-20 14:11:39 -05:00
Isaac Connor 90388e6483 Spacing 2023-01-20 14:11:19 -05:00
Isaac Connor 15f1930968 Remove style on chosen selects making them bigger than content 2023-01-20 14:10:02 -05:00
Isaac Connor 8c62f86797 Add styling for ul/li layout and fix mobile layout. Fixes #3654 2023-01-20 13:49:21 -05:00
Isaac Connor df43de9496 replace use of tables for layout with ul/li/label 2023-01-20 13:12:37 -05:00
Isaac Connor a0bbdfc140 Add flip to watch 2023-01-19 17:07:48 -05:00
Isaac Connor d6e3a325aa Remove dropdown class from menu items that aren't dropdowns 2023-01-19 17:07:48 -05:00
Isaac Connor 21bc35f4d2 Override portrait menu styles so that the menus look good on mobile 2023-01-19 17:07:48 -05:00
Isaac Connor 6fa39d25c1 Separate account status section. 2023-01-19 17:07:48 -05:00
Isaac Connor 4b7680bc43 Use & instead 2023-01-19 17:07:47 -05:00
Isaac Connor 382e9840ca Make chosen work on mobile https://realize.be/blog/mobile-support-chosen 2023-01-19 17:07:47 -05:00
Isaac Connor 0fd9ca00d0 Make #header always 100% no matter responsive width 2023-01-19 17:07:47 -05:00
Isaac Connor 6eceda0267 Fix complaint 2023-01-18 16:01:42 -05:00
Isaac Connor 388f1c6e1b Add const to MonitorId 2023-01-18 16:01:32 -05:00
Isaac Connor 1469562927 Fix bulk frame adjustment doing string concat instead of integer addition 2023-01-18 10:08:33 -05:00
Isaac Connor aa3bc1a28d Add TimeStampSecs to fields returned for Frames. 2023-01-18 10:07:41 -05:00
Isaac Connor 1a4c349505 Need height: 100% to make logsTable div take up the space and show scrollbar 2023-01-17 20:05:10 -05:00
Isaac Connor 8300a7b40d 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:10:55 -05:00
Isaac Connor 2b789f0051 Properly quote some fields and add missing fields to defaults 2023-01-17 12:54:21 -05:00