Commit Graph

19116 Commits

Author SHA1 Message Date
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 06f1ab4d46 Fix Event count subsitutions in emails because they are no longer in Monitor_Status. They are in Event_Summaries. So create a new object for them and use it. 2021-10-28 13:19:43 -04:00
Isaac Connor 42ab65f7a0 Merge pull request #3361 from criadoperez/debian-install
Added Debian 11 (bullseye) installation instructions
2021-10-28 13:17:38 -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 2de36f01db Handle auth to mysql problems more gracefully 2021-10-28 13:15:18 -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 0dc9017472 reset starttime when changing events. Fixes super fast playback after switch to next event. Also, skip some unneeded calculations and logging. 2021-10-28 13:02:58 -04:00
Isaac Connor ee30c0f05e add a comment about rollbacks 2021-10-28 12:03:58 -04:00
Isaac Connor a6795cd026 Just return the error 2021-10-28 11:59:36 -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 dd758aacac Fix Event count subsitutions in emails because they are no longer in Monitor_Status. They are in Event_Summaries. So create a new object for them and use it. 2021-10-27 12:21:30 -04:00
Isaac Connor 8893a29b51 Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2021-10-25 17:06:40 -04:00
Isaac Connor 1ab58aabc6 Bump version to 1.36.10 2021-10-25 17:05:06 -04:00
Isaac Connor 4b5bc09c41 Merge new logic from master. We now delete a non-keyframe from head instead of waiting in capture. 2021-10-25 17:03:36 -04:00
Isaac Connor 22f398dd6f set vertical-align:top on monitor edit labels 2021-10-25 16:55:42 -04:00
Isaac Connor d4467dba36 Fix logic ordering in 1.35.14 updated that moves columns from Monitors table to Monitor_Status 2021-10-25 16:55:42 -04:00
Isaac Connor c600725a1a Fix monitor type labels by adding an Unknown for entry 0. Implement Function_Strings. Fix decoding_enabled not being recalculated correctly because we havn't loaded savejpegs or videowriter yet. 2021-10-25 16:44:09 -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 522f8dd5ba Do no commit on error as it releases locks. Add better storage loading error handling 2021-10-25 09:44:27 -04:00
Isaac Connor a258567c16 You cannot commit on error because it releases the locks. 2021-10-25 09:44:27 -04:00
Isaac Connor 501aa3fa4a enforce default action 2021-10-19 15:27:37 -04:00
Isaac Connor 6245a4df6a Correct logic so that RECORD and MOCORD also get events. 2021-10-19 15:24:01 -04:00
Isaac Connor 5f317b3651 Merge pull request #3373 from havardAasen/minor_fixes
Update man-pages and typos.
2021-10-19 14:55:59 -04:00
Isaac Connor 7cd8f3d887 Only record when in modect or nodect. Linked monitors would cause a monitor in monitor mode to record 2021-10-19 14:55:59 -04:00
Isaac Connor 1a2665d8e5 Bump version to 1.36.9 2021-10-19 14:24:59 -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 b5bb5e67ff Change commands used to set and goto presets. Fixes #3371 2021-10-19 13:16:21 -04:00
Isaac Connor 1dd19d425a always correct decoding_enable, as zms needs to know it's correct value 2021-10-19 13:15:54 -04:00
Isaac Connor ba38e71b29 Correct definition of Importance. Want less importance to have a hgiher value. Make not null. 2021-10-19 13:14:36 -04:00
Isaac Connor f2e537f177 Fix loading importance. Needs to be -1 not -2. The first value is 1, but we want zero based. 2021-10-19 13:13:18 -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 7b5ab0adae fix index -> image_index 2021-10-17 15:13:14 -04:00
Isaac Connor ed901b0235 Improve debug logging of packetqueue cleaning 2021-10-17 15:01: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