Commit Graph

7978 Commits

Author SHA1 Message Date
Isaac Connor 94752e0cf3 Make delete dialog disappear on success. Fixes #3377 2021-10-28 15:15:24 -04:00
Isaac Connor bd8ed71ffc Remove debugging 2021-10-28 15:11:42 -04:00
Isaac Connor e344141222 merge fix from master for filters not deleting 2021-10-28 15:10:55 -04:00
Steve Gilvarry 8061b4f71d Define Date formats
Set Locale for time to en_GB.utf8, changed STRF_FMT_DATETIME_SHORTER to %x which is locale aware short date, but does include year. Makes event table wider, not sure if that is a problem for others
2021-10-28 14:41:19 -04:00
Isaac Connor 198d9c0f5a Restore the download button's behaviour. It is a simple link to the mp4, not an export. Also add a handler for the video.js rate control to sync up our non video.js rate dropdown and stored cookie. 2021-10-28 14:37:47 -04:00
Isaac Connor bf7c13558c Always include the download button so that we can assume that it exists in the js. So avoid console errors when no mp4. 2021-10-28 14:37:19 -04:00
Isaac Connor 615ce5d4c2 Set rows on email textarea 2021-10-28 14:36:06 -04:00
Andrea Vezzali 649eec4dae Update italian (it_it) translation (#3357) 2021-10-28 14:35:29 -04:00
Andrea Vezzali 0dbcd680df Update it_it.php 2021-10-28 14:35:16 -04:00
Andrea Vezzali 64b60613d8 Update it_it.php 2021-10-28 14:35:08 -04:00
Isaac Connor 8600a0af87 Add some extra parenthesis to make sure the logic works right 2021-10-28 13:21:50 -04:00
Isaac Connor 67504b4f39 Put back generate video button 2021-10-28 13:16:59 -04:00
Isaac Connor 7568dd63ed add js to manage the generate video button 2021-10-28 13:15:27 -04:00
Isaac Connor 33a067c085 fix validInt to take negative integers. Introduce validCardinal to handle positive integers 2021-10-28 13:11:44 -04:00
Isaac Connor 65418abf98 Add sort_asc, sort_field and limit to the filter QueryString 2021-10-28 13:10:37 -04:00
SzymekCRX 9da9d1840c Critical bug in events.php
Two extra brackets causes fatal error in Ajax request causing 500 HTTP error and problems with listing / deleting events
2021-10-28 13:09:41 -04:00
Isaac Connor d03365c9e7 Use filter->sort_asc and sort_field which will use either the value specified in query, or defaults set in system. url params order and sort will override. 2021-10-28 13:09:31 -04:00
Isaac Connor 48494a22db Add sort-name and sort-order to bootstrap table options. Also set data-remember-order=false. This allows orderings set by filters to work. Fixes #3348 2021-10-28 13:09:00 -04:00
Isaac Connor 1f75af7534 add licensing info for fontawesome. 2021-10-28 13:08:29 -04:00
Isaac Connor 6e68a35861 Remove dead code, remove locking from CopyTo, put locking into MoveTo. 2021-10-28 11:59:23 -04:00
Isaac Connor 22f398dd6f set vertical-align:top on monitor edit labels 2021-10-25 16:55:42 -04:00
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