Isaac Connor
|
e6f08959fa
|
Fix use of result instead of NearEvents
|
2020-10-21 10:40:26 -04:00 |
|
Isaac Connor
|
8f8526c2f1
|
add some debug to session garbage collection
|
2020-10-21 10:38:42 -04:00 |
|
Isaac Connor
|
946a59ce8b
|
add special case for sort_field being StartDateTime. This is not an event column and must be corrected to StartTime
|
2020-10-21 10:37:39 -04:00 |
|
Isaac Connor
|
1c5e161909
|
quotes
|
2020-10-21 10:37:06 -04:00 |
|
Isaac Connor
|
1dfebc24b0
|
Fix ZM\
|
2020-10-21 10:36:58 -04:00 |
|
Isaac Connor
|
34ce3a1498
|
Use Filter::parse instead of parseFilter. Use Filter->addTerm to limit to User's monitor restrictions. Return early with better logging in the event of error. Introduce Filter->addTerm
|
2020-10-21 10:36:40 -04:00 |
|
Isaac Connor
|
452416e72a
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-10-20 19:23:12 -04:00 |
|
Isaac Connor
|
d88fd5e4e0
|
Revert WEB_EVENT_SORT_FIELD change from StartTime to StartDateTime back to StartTime. StartTime is the column name.
|
2020-10-20 19:23:03 -04:00 |
|
Isaac Connor
|
b950962f98
|
Revert WEB_EVENT_SORT_FIELD change from StartTime to StartDateTime back to StartTime. StartTime is the column name.
|
2020-10-20 19:21:15 -04:00 |
Isaac Connor
|
aef0cc55eb
|
fix merge
|
2020-10-20 18:27:03 -04:00 |
|
Isaac Connor
|
2eda49333f
|
Merge branch 'master' into zma_to_thread
|
2020-10-20 16:20:29 -04:00 |
|
Isaac Connor
|
56bbd91a02
|
Merge branch 'zma_to_thread' of github.com:Connortechnology/zoneminder into zma_to_thread
|
2020-10-20 16:05:35 -04:00 |
|
Isaac Connor
|
5fa70da092
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-10-20 16:04:23 -04:00 |
Andrew Bauer
|
b5aa215e31
|
WIP events view server pagination
|
2020-10-20 12:59:30 -05:00 |
|
Andrew Bauer
|
6357c02ec9
|
WIP events view server pagination
|
2020-10-20 12:13:12 -05:00 |
|
Isaac Connor
|
41ed267b71
|
move view to the form action so that it is part of get request instead of post
|
2020-10-20 12:31:38 -04:00 |
|
Isaac Connor
|
bb5646baac
|
Load Logout modal content on click instead of every page load
|
2020-10-20 12:31:06 -04:00 |
|
Isaac Connor
|
5b27d77ea4
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-10-20 11:52:25 -04:00 |
|
Isaac Connor
|
1a77958548
|
Make loading the function modal happen on click instead of every page load.
|
2020-10-20 11:52:18 -04:00 |
|
Andrew Bauer
|
bfa45b0c43
|
continue work on event view server pagination
|
2020-10-20 08:10:43 -05:00 |
|
Andrew Bauer
|
4e391708f1
|
event view server pagination WIP
|
2020-10-19 14:18:21 -05:00 |
|
Isaac Connor
|
8a6aaa019f
|
Bump version for release to 1.34.22
|
2020-10-19 14:29:18 -04:00 |
|
Isaac Connor
|
0e63874533
|
fix calling changeScale when scale is 0 instead of auto
|
2020-10-19 14:28:21 -04:00 |
|
Isaac Connor
|
127ef9a130
|
Fix scaling when using ScaleToFit
|
2020-10-19 14:28:02 -04:00 |
|
Isaac Connor
|
080557d580
|
add an id to buttons div so that we can use it when calling scaleToFit
|
2020-10-19 14:27:43 -04:00 |
|
Isaac Connor
|
617a1faa99
|
Add pre-alarm frames when alarm_frame_count > 1 and prealarmcount=0
|
2020-10-19 13:25:26 -04:00 |
|
Andrew Bauer
|
89f298771f
|
server pagination backend improvements
|
2020-10-19 12:25:13 -05:00 |
|
Isaac Connor
|
eefbed04c1
|
Add debugging for min_section_length keeping us in ALERT
|
2020-10-19 13:24:30 -04:00 |
Isaac Connor
|
df2f5f814b
|
fix case in mocord where cause would not contain motion
|
2020-10-19 13:24:08 -04:00 |
|
Isaac Connor
|
cc24df9593
|
init shared_data in the purpose=QUERY case to prevent crash. Also don't load zones if we don't need them
|
2020-10-19 13:23:40 -04:00 |
|
Andrew Bauer
|
7ae7e05f14
|
roughin ajax call in event.js for server side pagination
|
2020-10-19 09:29:39 -05:00 |
|
Isaac Connor
|
e2b76257eb
|
Merge branch 'release-1.34'
|
2020-10-19 09:10:28 -04:00 |
|
Isaac Connor
|
14894dfb00
|
remove extra comma
|
2020-10-19 09:08:25 -04:00 |
|
Andrew Bauer
|
6f45de04f8
|
partial roughin ajax event view server side pagination
|
2020-10-19 07:50:11 -05:00 |
Andrew Bauer
|
97d05c2f88
|
move newlog ajax request to log
|
2020-10-18 07:20:59 -05:00 |
|
Isaac Connor
|
220a89b459
|
fix eslint
|
2020-10-17 16:17:30 -04:00 |
|
Andrew Bauer
|
be63acdcc0
|
rollback bstable to 1.17.1git90f47e7
|
2020-10-17 11:49:17 -05:00 |
|
Andrew Bauer
|
5bf0524bdc
|
chinese locale designation was backwards, fixing...
|
2020-10-17 07:29:32 -05:00 |
|
Andrew Bauer
|
442fadb585
|
link bstable locale to zoneminder's
|
2020-10-17 07:28:14 -05:00 |
|
Andrew Bauer
|
4044d60412
|
update bstable to 9fa4c82, add bstable locale extenstion
|
2020-10-17 07:23:26 -05:00 |
|
Isaac Connor
|
06c8ce57c2
|
Make zm_terminate available to anyone who includes zm.h
|
2020-10-16 20:06:53 -04:00 |
|
Isaac Connor
|
2f06a79ad8
|
fix compiler warnings
|
2020-10-16 20:04:26 -04:00 |
|
Isaac Connor
|
8a9d01290a
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-10-16 19:05:59 -04:00 |
|
Andrew Bauer
|
1ed160866b
|
add legacy watch view alarm buttons to toolbar
|
2020-10-16 15:47:42 -05:00 |
|
Isaac Connor
|
3fdbae7761
|
add 1440p to the resolution list
|
2020-10-16 14:54:54 -04:00 |
|
Isaac Connor
|
c5cd617204
|
Load logoutModal on click instead of always
|
2020-10-16 14:51:47 -04:00 |
|
Isaac Connor
|
d6dfde5630
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-10-16 12:21:22 -04:00 |
|
Isaac Connor
|
8c7c4c4b1b
|
add a call to drawZonePoints to handle case where image doesn't load. Remove debug and dead code
|
2020-10-16 12:21:12 -04:00 |
|
Isaac Connor
|
b9b45d8b9e
|
definitionPanel shouldn't be floated, or relse should be set to 100% width
|
2020-10-16 12:14:58 -04:00 |
|
Isaac Connor
|
c70493a43f
|
Add clear: both to content div. In general the content div is 100% so should drop below floats
|
2020-10-16 12:14:31 -04:00 |