Isaac Connor
|
7517bdc6ec
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2021-10-25 16:44:01 -04:00 |
|
Isaac Connor
|
b2e1f7ed56
|
Put actions and options in a div, remove hr's and style the resulting div have the borders and clearing required. Make email options 100%
|
2021-10-19 13:17:00 -04:00 |
|
Isaac Connor
|
a1a8f4d09b
|
remove debug hello
|
2021-10-19 13:11:50 -04:00 |
|
Isaac Connor
|
f5b54caa61
|
Improvements to export. Fix tar -v, should be tar --version. make table width:100% and iframe height 100%. Always show thumbnail of video. Show Id of event if no other links. generate Images frame content event if no jpegs but there is an mp4. Set timeout to infinity for generating export. Provide more feedback if it breaks. Fix ticker.
|
2021-10-19 13:11:31 -04:00 |
Isaac Connor
|
41d193afe3
|
Fix removing uneeded checked
|
2021-10-17 19:07:55 -04:00 |
|
Isaac Connor
|
ca1b7ebdc7
|
Test for existence of AutoEmail and AutoMessage. Fixes #3369 issue 2.
|
2021-10-13 11:57:58 -04:00 |
|
Isaac Connor
|
ff87856951
|
Merge pull request #3366 from haade-administrator/patch-1
Update translation
|
2021-10-06 10:36:52 -04:00 |
|
Isaac Connor
|
1a27ac9ab3
|
Handle when SERVER['HTTP_HOST'] is not set
|
2021-10-06 10:36:35 -04:00 |
|
Isaac Connor
|
d622ae9251
|
fix width=0px causing empty looking montage
|
2021-10-06 10:35:52 -04:00 |
|
Isaac Connor
|
f299d57a39
|
Fix js error in montage review when using scaled mode. Fixes #3351
|
2021-09-14 10:27:05 -04:00 |
|
Isaac Connor
|
4553592caa
|
Merge pull request #3352 from vezza/patch-3
Update it_it.php
|
2021-09-14 10:26:52 -04:00 |
Andrea Vezzali
|
ded2c86858
|
Update it_it translation (#3350)
|
2021-09-13 09:31:00 -04:00 |
|
Isaac Connor
|
8c92fa5dc3
|
Fix version of Crud
|
2021-09-09 13:26:59 -04:00 |
|
Isaac Connor
|
12fcae7574
|
canView takes a user object, not a string
|
2021-09-08 19:08:08 -04:00 |
|
Isaac Connor
|
a42786afd1
|
Add missing Importance member
|
2021-09-08 13:59:21 -04:00 |
|
Isaac Connor
|
4612f4ae75
|
add getMonitorStatuses function to return string values for status numbers
|
2021-09-04 09:57:56 -04:00 |
|
Isaac Connor
|
e529d8fcd1
|
add autoplay tag. Fixes #3343
|
2021-09-03 22:29:45 -04:00 |
|
Isaac Connor
|
55080da9dc
|
Don't use AUTH_HASH_IPS when talking to zmu as it doesn't support that at this time.
|
2021-09-03 22:29:16 -04:00 |
|
Isaac Connor
|
be46b063c8
|
spacing
|
2021-09-03 22:28:59 -04:00 |
r01k
|
2d965e7d50
|
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-09-03 22:28:37 -04:00 |
|
Isaac Connor
|
4c213ab453
|
Only show thumbnail if Function is != None
|
2021-09-03 22:28:08 -04:00 |
|
Isaac Connor
|
706e2ff536
|
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-09-03 22:27:53 -04:00 |
|
Isaac Connor
|
dab9bce8f4
|
spacing remove dead code
|
2021-09-03 22:27:26 -04:00 |
|
Isaac Connor
|
25f6935280
|
Allow snapshot downloading
|
2021-09-03 22:26:51 -04:00 |
|
Isaac Connor
|
4c261eb413
|
Use event->canView so that events in snapshots can be exported
|
2021-09-03 22:26:26 -04:00 |
|
Isaac Connor
|
ca4ec91ef3
|
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-09-03 22:26:09 -04:00 |
|
Isaac Connor
|
30aad6ab9a
|
Spacing and quotes
|
2021-09-03 22:25:43 -04:00 |
|
Isaac Connor
|
bed79039f3
|
implement Event->canView
|
2021-09-03 22:25:14 -04:00 |
|
Isaac Connor
|
d884d86b38
|
Can export events if canView Snapshots. Event->canView will filter events that are not in a snapshot
|
2021-09-03 22:23:30 -04:00 |
|
Isaac Connor
|
391fc1fec8
|
Use canView.Snapshots for snapshot permissions instead of canView.Events
|
2021-09-03 22:23:09 -04:00 |
|
Isaac Connor
|
a1fe4e2638
|
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-09-03 22:22:47 -04:00 |
|
Isaac Connor
|
a2f3583481
|
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-09-03 22:22:16 -04:00 |
|
Isaac Connor
|
809183716a
|
clean up code logic so that if we are executing an unchanged filter we don't do the unecessary save.
|
2021-09-03 22:21:40 -04:00 |
|
Isaac Connor
|
3ca920f1a9
|
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-09-03 22:21:21 -04:00 |
|
Isaac Connor
|
2e09334b9c
|
Fix url to ajax endpoint for deleting snapshots.
|
2021-09-03 22:20:51 -04:00 |
|
Isaac Connor
|
a69882ffaf
|
Cleanup, split export and download functions in snapshot.
|
2021-09-03 22:20:27 -04:00 |
|
Isaac Connor
|
b306f92116
|
event may have changed (have endtime set) between load and saving Archived bit. Lock the event which now also reloads it.
|
2021-09-03 22:19:57 -04:00 |
|
Isaac Connor
|
ae1e3d88b2
|
When locking, use the results to reload the object fields fresh as they may have changed since the object was loaded
|
2021-09-03 22:19:39 -04:00 |
|
Isaac Connor
|
cf87f2cc40
|
Snapshot exports are now flat, without frame images
|
2021-09-03 22:19:19 -04:00 |
|
Isaac Connor
|
c089702fab
|
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-09-03 22:19:02 -04:00 |
|
Isaac Connor
|
2c7af3886c
|
Actually delete the snapshot record, not just the event connection
|
2021-09-03 22:18:38 -04:00 |
|
Isaac Connor
|
2f7c44dce2
|
Fix deleting snapshots
|
2021-09-03 22:18:24 -04:00 |
|
Isaac Connor
|
ad9ce720fd
|
Allow specifying export Structure to get a flat zip
|
2021-09-03 22:18:06 -04:00 |
|
Isaac Connor
|
50326cf80c
|
zmu may still output results even if it encounters errors, so continue even if we have an error return status from zmu.
|
2021-09-03 22:17:15 -04:00 |
|
Isaac Connor
|
c280279cf7
|
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-09-03 22:16:30 -04:00 |
|
Isaac Connor
|
6a6d6935e8
|
Merge script sections just to remove bytes per view.
|
2021-09-03 22:15:56 -04:00 |
|
Isaac Connor
|
814e8559aa
|
output an error message image when we can't load a jpeg
|
2021-09-03 22:15:29 -04:00 |
|
Isaac Connor
|
8d5207636a
|
Turn on export functionality for snapshots
|
2021-09-03 22:15:08 -04:00 |
|
Isaac Connor
|
2273deaf17
|
Support specifying the export filename by passing the export_root
|
2021-09-03 22:14:42 -04:00 |
|
Isaac Connor
|
06ff94de2f
|
Fix styling of the shutdown button
|
2021-09-03 22:13:55 -04:00 |