Commit Graph

23582 Commits (add_startup_delay)

Author SHA1 Message Date
IgorA100 c69f6e8908
Fix Removing excess styles & Aligning a form vertically
Additional modernization required
2024-03-06 01:14:59 +03:00
IgorA100 696837e22f
Fix Removing excess styles 2024-03-06 01:11:16 +03:00
IgorA100 21cb1c8c29
Fix layout 2024-03-06 01:06:45 +03:00
Isaac Connor 55df0fd8f7 Only save permissions if passed in POST. We might not be able to see all monitors, so might not exist in POST. 2024-03-05 16:33:41 -05:00
IgorA100 a4ed614763
Fix set chosen width for modal window
For the modal window, set the width chosen to 100%
2024-03-06 00:23:11 +03:00
Isaac Connor 2981966b1c Don't treat stream already exists as an error. 2024-03-05 16:20:16 -05:00
Isaac Connor c078cf7bba Use per-monitor permission on save button 2024-03-05 14:02:20 -05:00
Isaac Connor b5e1d5e611 Fix invalid canEditMonitor call, simplify login in canView and canEdit to prefer per-monitor permissions 2024-03-05 14:02:01 -05:00
Isaac Connor b4bbff6353 Use per-monitor permissions 2024-03-05 14:00:40 -05:00
Isaac Connor 5120baa9ee Implement object permissions vs entity permissions so that we can handle the new group based permissions on Monitors. This fixes status updates when MOnitors=None but there is a per-monitor group based view permission. 2024-03-05 14:00:23 -05:00
Isaac Connor 302f3ad96d Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-03-05 11:48:16 -05:00
Isaac Connor beda6cd66d Remove unused linked monitor array population. All is done in javascript now 2024-03-05 11:47:39 -05:00
Isaac Connor 5de9e7800c Use monitor->canEdit when making source link clickable because it is per-monitor instead of User['Monitors'] 2024-03-05 11:47:15 -05:00
Isaac Connor 4ab1aaa1d0 Fix Linked monitor expression not updating 2024-03-05 11:46:42 -05:00
Isaac Connor b95cf3c9fe
Merge pull request from Simpler1/master
Lint fixes
2024-03-05 11:32:30 -05:00
Isaac Connor ed14fc7449 Don't allow linking to ourselves 2024-03-05 11:14:58 -05:00
Isaac Connor 5c360c2a91 Add mid to available globals 2024-03-05 10:35:07 -05:00
Simpler1 9eee9fcb1e Lint fixes 2024-03-05 08:14:28 -05:00
IgorA100 634bffea80
Adaptation of Chosen to Bootstrap (Height alignment) 2024-03-05 15:43:01 +03:00
IgorA100 74a43745d3
Fix: Order of loading css files
Initially, you need to load third-party styles and only then load your own styles.
This way we will get rid of the confusion of styles and the need to use "!important"
2024-03-05 15:20:02 +03:00
IgorA100 8f521a7221
Fix Entrust management of enabling search in select to the Chosen plugin 2024-03-05 14:06:13 +03:00
IgorA100 610109d569
Feat Entrust management of enabling search in select to the Chosen plugin
On Options page it is necessary to use Chosen plugin for all “selects”, otherwise the design will not be beautiful.
Search disabling is managed by Chosen plugin.
2024-03-05 12:07:45 +03:00
Isaac Connor 3bab238ee4 Limit score to 255 2024-03-04 17:54:25 -05:00
Isaac Connor 260c49ba5d Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-03-04 17:31:12 -05:00
Isaac Connor fb37cd3c30 Remove refs to event from Info because there might not be an event. Fix crash. 2024-03-04 17:31:06 -05:00
Isaac Connor bc16f526ac
Merge pull request from IgorA100/patch-10
Added button for editing the monitor during live viewing.
2024-03-04 17:09:22 -05:00
Isaac Connor efaffa3156
Merge pull request from IgorA100/patch-11
Fix Handling a button click
2024-03-04 17:08:52 -05:00
IgorA100 8902f902ea
Update skin.css 2024-03-05 00:58:05 +03:00
IgorA100 1f6279a00f
Update skin.css 2024-03-05 00:56:59 +03:00
IgorA100 b07ae01e89
Fix cursor for <a> 2024-03-05 00:53:47 +03:00
IgorA100 7482d28af8
Fix Handling a button click
For some reason, an old, faulty code was sent..
2024-03-04 23:15:10 +03:00
IgorA100 7920f17c8a
Handling button click 2024-03-04 23:03:42 +03:00
Isaac Connor f5cdab131f Include rc in debug 2024-03-04 14:13:41 -05:00
IgorA100 38acd931e4
Added monitor edit button 2024-03-04 21:22:10 +03:00
Isaac Connor c0860dd43d Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-03-04 13:20:27 -05:00
Isaac Connor 067ca68549 Add debugging of db failures 2024-03-04 13:20:21 -05:00
Isaac Connor 6f467dd0d4 Revert "regexp: port to pcre2"
This reverts commit fd09feb5f4.
2024-03-04 09:54:18 -05:00
Isaac Connor 7d142faeef
Merge pull request from IgorA100/patch-9
Fix: Responsive design with use bootstrap for live view
2024-03-04 09:41:23 -05:00
Isaac Connor b9da90522b Wait forever until reconnect, the fallthrough case had us retrying the sql on a closed connection which may have led to a crash. 2024-03-04 09:32:15 -05:00
IgorA100 a370ce19ea
Fix style 2024-03-04 17:28:30 +03:00
IgorA100 f173974f2b
Fix: Scaling 2024-03-04 17:22:32 +03:00
IgorA100 ea17631de9
Fix Control panel
At least temporarily.
In general, a lot of work.
2024-03-04 17:07:55 +03:00
IgorA100 074751e068
Fix style
Managed by bootstrap
2024-03-04 17:00:20 +03:00
IgorA100 a18167377e
Fix: scaleToFit function
It is required to pass an object in parameters
2024-03-04 16:52:04 +03:00
IgorA100 66ff90c8c1
Update watch.js 2024-03-04 16:47:46 +03:00
IgorA100 a05540bd3d
Fix: Responsive design with use bootstrap 2024-03-04 16:30:09 +03:00
Isaac Connor 89de8b7765
Merge pull request from IgorA100/patch-8
Added a link to live viewing from monitor event viewer
2024-03-03 14:29:57 -05:00
IgorA100 55244441c3
Add processing for clicking on the button to view all events 2024-03-03 18:50:02 +03:00
IgorA100 1793e7813c
Added value "Edit" to "translate" array for translation 2024-03-03 18:20:40 +03:00
IgorA100 45bf972fea
Ref: style
Bootstrap is now used more
2024-03-03 18:14:29 +03:00