Isaac Connor
|
b647280766
|
FIx arrap_map to array_map. Don't assume _REQUEST[mids] exists. Fixes #3859
|
2024-03-10 10:59:56 -04:00 |
|
Isaac Connor
|
f0088e49d7
|
Remove debug
|
2024-03-06 16:21:44 -05:00 |
|
Isaac Connor
|
6124678fb8
|
Add scaling to zms url
|
2024-03-06 16:21:19 -05:00 |
|
Isaac Connor
|
32dc9cff2f
|
Remove use strict to appease eslint for now. Use a zms url instead of view=image
|
2024-03-06 16:02:50 -05:00 |
|
Isaac Connor
|
ada974ef51
|
Fix eslint
|
2024-03-06 14:21:18 -05:00 |
|
Isaac Connor
|
1278613832
|
Merge fixes in findEventByTime and fineFrameByTime with better debugging. Turn on use strict. Update when datetimepickers close instead of onchange
|
2024-03-06 13:31:36 -05: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 |
|
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 #3853 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 |
|
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 #3850 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 #3851 from IgorA100/patch-11
Fix Handling a button click
|
2024-03-04 17:08:52 -05: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 #3849 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 #3845 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 |
|
IgorA100
|
99779681fb
|
Fix: style
Not required, because now using Bootstrap
|
2024-03-03 17:27:14 +03:00 |
|
IgorA100
|
21abe20234
|
Fix: style
Not required, because now using Bootstrap
|
2024-03-03 17:26:09 +03:00 |
|
Isaac Connor
|
dbff17e294
|
Merge pull request #3824 from davvid/debian/pcre2
regexp: drop obsolete pcre3 and port regexp usage to pcre2
|
2024-03-03 09:25:03 -05:00 |
|
IgorA100
|
373fa15440
|
Fix: rem style
Not required, because now using Bootstrap
|
2024-03-03 17:21:30 +03:00 |
|
IgorA100
|
9aa8919fb8
|
Fix: Button layout
|
2024-03-03 17:04:59 +03:00 |