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 |
|
Isaac Connor
|
de5ad5fc61
|
confirm before tar-gzipping orig. Fix default behaviour in dput prompt
|
2021-10-12 14:10:08 -04:00 |
|
Isaac Connor
|
0a7e0c4781
|
Bump version to 1.36.8
|
2021-10-06 10:40:20 -04:00 |
|
Isaac Connor
|
aa44bb0d12
|
spacing. Use a separate boolean to tell if we have specified a new value for controls. This allows negative settings. Fix zmy outputting brightness when contrast is specified.
|
2021-10-06 10:37:54 -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
|
7905f11be6
|
remove useless commit.
|
2021-09-25 14:27:26 -04:00 |
|
Isaac Connor
|
369e0d74b7
|
Add open collective username
|
2021-09-20 13:48:13 -04:00 |
|
Isaac Connor
|
cab4c24d06
|
Remove redundant notify_all, spelling mistake
|
2021-09-15 14:11:32 -04:00 |
Mike Dussault
|
b670bf98e0
|
Fixed a bug in Image::Buffer that would return the wrong location in the image if the image had > 1 channels (and if the request were for x > 0).
|
2021-09-15 14:11:16 -04:00 |
|
Isaac Connor
|
2b18dd5978
|
Don't crash when unable to create source. erase will call the desctructor. Fixes #3344
|
2021-09-15 14:11:03 -04:00 |
|
Isaac Connor
|
6b8dc07018
|
wait won't wake up other threads, so notify first. Since we have the lock, this should be ok
|
2021-09-15 14:10:52 -04:00 |
|
Isaac Connor
|
bbe90dad6e
|
Add support for package version
|
2021-09-15 14:10:36 -04:00 |
|
Isaac Connor
|
ef74294d32
|
More properly fix the threading lock. Instead of waiting on a packet, release it and wait on the packetqueue.
|
2021-09-15 14:10:25 -04:00 |