Isaac Connor
|
d102732a7e
|
add autoplay tag. Fixes #3343
|
2021-08-29 09:44:04 -04:00 |
|
Isaac Connor
|
048b8b13a3
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2021-08-29 09:17:36 -04:00 |
|
Isaac Connor
|
6de8c71d2a
|
Set shm->valid to false on disconnect.
|
2021-08-29 09:17:31 -04:00 |
Isaac Connor
|
4af979c842
|
spacing
|
2021-08-29 09:15:40 -04:00 |
|
Isaac Connor
|
a52b9057ba
|
stretch has debhelper 10
|
2021-08-27 11:40:46 -04:00 |
Isaac Connor
|
11137f9b7a
|
Merge pull request #3342 from gmanproxtreme/patch-1
Updated WEB_TITLE section from ToDo.
|
2021-08-27 10:14:46 -04:00 |
gmanproxtreme
|
84ccf10e65
|
Updated WEB_TITLE section from ToDo.
The Web_Title's use was unknown. I have seen the changed title appear on the login screen. Documentation updated to reflect this.
|
2021-08-27 20:21:02 +10:00 |
|
Isaac Connor
|
a4c079d1b3
|
Add code to set colour ranges so that we can safely convert to YUV420p instead of YUVJ420P
|
2021-08-26 14:15:09 -04:00 |
|
Isaac Connor
|
dbe16a9cb4
|
Don't use AUTH_HASH_IPS when talking to zmu as it doesn't support that at this time.
|
2021-08-26 10:45:36 -04:00 |
|
Isaac Connor
|
7c1c8482c6
|
Make failure to resolve non fatal
|
2021-08-24 10:23:24 -04:00 |
|
Isaac Connor
|
2640791b89
|
spacing
|
2021-08-23 18:13:19 -04:00 |
|
Isaac Connor
|
848a537a0f
|
Fix zms giving 500 code instead of displaying error image due to not having sent the headers yet.
|
2021-08-23 18:10:31 -04:00 |
|
Isaac Connor
|
4596f61250
|
Merge pull request #3335 from r01k/master
Fixed "Call to undefined function" Exception in control_functions.php
|
2021-08-21 10:38:43 -04:00 |
r01k
|
79e041d0f0
|
Fixed bug that caused 'Call to undefined function Error()' in control_functions.php. Exception was being raised due to logger.php not being included in control_functions.php.
|
2021-08-20 22:42:57 -04:00 |
|
Isaac Connor
|
4a5bc88882
|
Always set image width to 100%. it should fill it's div and we will set the width of the div.
|
2021-08-19 18:57:00 -04:00 |
|
Isaac Connor
|
68a7635d9b
|
Only show thumbnail if Function is != None
|
2021-08-19 18:40:50 -04:00 |
|
Isaac Connor
|
7a6c244aa7
|
spacing. When the selected layout is not freeform, calculate the ratio of computed size to stream source size to calculate a value for scale.
|
2021-08-19 16:05:43 -04:00 |
|
Isaac Connor
|
89d7685b14
|
Change Montage Layouts to reset width when choosing Freeform. Use full width instead of slightly less. I think at some point I fixed our layout so that we can use 25% instead of 24.5% etc.
|
2021-08-19 15:42:39 -04:00 |
|
Isaac Connor
|
44823e0c94
|
spacing remove dead code
|
2021-08-18 18:40:25 -04:00 |
|
Isaac Connor
|
8ddec91870
|
Allow snapshot downloading
|
2021-08-18 10:53:59 -04:00 |
|
Isaac Connor
|
7127a944a1
|
Use event->canView so that events in snapshots can be exported
|
2021-08-18 10:53:59 -04:00 |
|
Isaac Connor
|
ba9a871daf
|
Move CSP stuff down to view parsing. ajax requests only output json, so CSP shouldn't be relevant. Only end output buffer if there is one. archive view for example clears all output buffers.
|
2021-08-18 10:53:59 -04:00 |
|
Isaac Connor
|
eb1124c406
|
Spacing and quotes
|
2021-08-18 10:53:59 -04:00 |
|
Isaac Connor
|
b9efe627f3
|
implement Event->canView
|
2021-08-18 10:53:59 -04:00 |
|
Isaac Connor
|
e7e8996060
|
Can export events if canView Snapshots. Event->canView will filter events that are not in a snapshot
|
2021-08-18 10:53:59 -04:00 |
|
Isaac Connor
|
c12d88d874
|
Use canView.Snapshots for snapshot permissions instead of canView.Events
|
2021-08-18 10:53:59 -04:00 |
|
Isaac Connor
|
301d8fa5fa
|
Change monitor->canView semantics so that a specified monitorId trumps the Monitors:None setting. This is so that the console can be hidden, but the group dropdown still gets populated.
|
2021-08-18 10:53:59 -04:00 |
Andrew Bauer
|
aa48133096
|
Update zoneminder.spec
rpm specfile changelog not in chronological order (causes build failure on el8).
|
2021-08-15 12:46:19 -05:00 |
|
Isaac Connor
|
92a924044a
|
turn Save, SaveAs and Execute into submit buttons. Put Id into the form action so that it shows up in the url bar. Disable putting the form contents into the url bar in parse_rows.
|
2021-08-12 13:44:49 -04:00 |
|
Isaac Connor
|
a311455526
|
clean up code logic so that if we are executing an unchanged filter we don't do the unecessary save.
|
2021-08-12 13:42:36 -04:00 |
|
Isaac Connor
|
248ca9a5f9
|
Fix building SQL for ExistsInFileSystem PostCondition. Fix how we turn the rows into Event objects. Fix value handling in ExistsInFileSystem post condition.
|
2021-08-12 13:41:17 -04:00 |
|
Isaac Connor
|
cd3359c3eb
|
spacing. Add defaults for AutoMoveTo and AutoCopyTo so that we don't get false changes. redirect is a global, so make it so. Re-null the Id of the filter object after temp execute so that we don't reference a no longer existing filter.
|
2021-08-12 12:53:46 -04:00 |
|
Isaac Connor
|
ccb4bb27dd
|
Add more versions to support bionic
|
2021-08-10 17:01:26 -04:00 |
|
Isaac Connor
|
bae8d38301
|
Drop back to debhelper 11 as that is what is in bionic
|
2021-08-09 11:33:11 -04:00 |
|
Isaac Connor
|
cb4e17e49a
|
Merge branch 'release-1.36'
|
2021-08-09 10:27:24 -04:00 |
|
Isaac Connor
|
ea83e8c3b1
|
Add libjwt-dev as a build dependency. libjwt-gnutls-dev doesn't exist in bionic anymore.
|
2021-08-09 10:23:02 -04:00 |
|
Isaac Connor
|
066bb891af
|
Fix url to ajax endpoint for deleting snapshots.
|
2021-08-06 19:18:27 -04:00 |
|
Isaac Connor
|
f0b2f75d91
|
Cleanup, split export and download functions in snapshot.
|
2021-08-06 19:18:02 -04:00 |
|
Isaac Connor
|
672de6e84f
|
event may have changed (have endtime set) between load and saving Archived bit. Lock the event which now also reloads it.
|
2021-08-06 19:15:22 -04:00 |
|
Isaac Connor
|
500ced2dc5
|
When locking, use the results to reload the object fields fresh as they may have changed since the object was loaded
|
2021-08-06 19:14:43 -04:00 |
|
Isaac Connor
|
f2a1d06f64
|
Snapshot exports are now flat, without frame images
|
2021-08-06 13:18:31 -04:00 |
|
Isaac Connor
|
eecf568041
|
Pass exportStructure around so that it can be used to put the right filename to the jpg in the html. Fix flat zips. Fix video files being included if exportMisc is true.
|
2021-08-06 13:18:06 -04:00 |
|
Isaac Connor
|
105851b70c
|
Actually delete the snapshot record, not just the event connection
|
2021-08-06 13:17:02 -04:00 |
|
Isaac Connor
|
f236e25e22
|
Fix deleting snapshots
|
2021-08-06 13:11:04 -04:00 |
|
Isaac Connor
|
1f1678064e
|
Allow specifying export Structure to get a flat zip
|
2021-08-06 13:10:44 -04:00 |
|
Isaac Connor
|
222909feb3
|
zmu may still output results even if it encounters errors, so continue even if we have an error return status from zmu.
|
2021-08-05 14:48:14 -04:00 |
|
Isaac Connor
|
7db25a5e1b
|
Continue to work even if opener isn't defined, which it isn't anymore because we got rid of popups. Fixes save button on monitorprobe.
|
2021-08-05 14:48:14 -04:00 |
|
Isaac Connor
|
acdd8bb08b
|
Merge script sections just to remove bytes per view.
|
2021-08-05 14:48:14 -04:00 |
|
Isaac Connor
|
a3a592d5e1
|
Fix errors due to not stopping the dbQueue. Fix crash when querying v4l devices
|
2021-08-05 14:48:14 -04:00 |
|
Isaac Connor
|
45bf28a104
|
Merge pull request #3321 from anon8675309/gitlab-ci
Gitlab ci
|
2021-08-05 13:34:05 -04:00 |