Isaac Connor
|
5b10fff2a0
|
Use cached objects when using new instead of only find_one
|
2020-11-10 13:14:36 -05:00 |
Isaac Connor
|
f2630b8fbc
|
Merge branch 'master' into move_event_totals_to_monitor_status
|
2020-11-06 14:17:23 -05:00 |
|
Isaac Connor
|
59403dc11b
|
Move event stat totals to Monitor_Status.
|
2020-11-06 14:00:18 -05:00 |
|
Isaac Connor
|
6ed006bc60
|
rename StartTime and EndTime to StartDateTime and EndDateTime in the named query params
|
2020-11-06 12:25:04 -05:00 |
|
Isaac Connor
|
402b559b2c
|
Add StartTime and EndTime virtual fields for backwards compatability
|
2020-11-06 11:15:12 -05:00 |
|
Isaac Connor
|
68cdd2123d
|
Merge branch 'release-1.34'
|
2020-11-05 13:55:15 -05:00 |
|
Isaac Connor
|
746882ba85
|
Get rid of zmEventScaleAuto cookie. Just use the per monitor zmEventScale cookie. Fixes #3070
|
2020-11-05 13:45:02 -05:00 |
|
Isaac Connor
|
7b8ee6af9f
|
Rework code to use Filter methods to generate advanced search functionality. Reduces sql queries to 1 or 2, using count() to populate [total] and [totalNotFiltered]. Does pagination using array_splice instead of SQL queries. Will use more ram, but reduces db load.
|
2020-11-05 12:20:49 -05:00 |
|
Isaac Connor
|
ee89eb45e6
|
Fix EndTime to EndDateTime
|
2020-11-04 18:39:02 -05:00 |
|
Isaac Connor
|
e085e08caa
|
Fix missed StartTime to StartDateTime
|
2020-11-04 18:27:51 -05:00 |
|
Isaac Connor
|
130588eb8f
|
fix typos
|
2020-11-04 18:22:50 -05:00 |
|
Isaac Connor
|
d37bce4e0e
|
Fix missed StartTime to StartDateTime
|
2020-11-04 18:20:59 -05:00 |
|
Isaac Connor
|
289612a826
|
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
|
2020-11-04 18:10:55 -05:00 |
|
Isaac Connor
|
b17fa8f9c1
|
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
|
2020-11-04 13:58:03 -05:00 |
|
Isaac Connor
|
ce99a9456b
|
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
|
2020-11-04 13:56:44 -05:00 |
|
Isaac Connor
|
68ad1cf1f7
|
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
|
2020-11-04 13:56:37 -05:00 |
|
Isaac Connor
|
786e2fec92
|
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
|
2020-11-04 13:56:27 -05:00 |
|
Isaac Connor
|
af9e279f9e
|
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
|
2020-11-04 13:55:27 -05:00 |
|
Isaac Connor
|
d75e93249c
|
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
|
2020-11-04 13:54:12 -05:00 |
|
Isaac Connor
|
9d22de98a3
|
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
|
2020-11-04 13:53:45 -05:00 |
|
Isaac Connor
|
9e6a9cad80
|
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
|
2020-11-04 13:53:17 -05:00 |
|
Isaac Connor
|
8029f59eac
|
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
|
2020-11-04 13:52:50 -05:00 |
|
Isaac Connor
|
2d33dd5386
|
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
|
2020-11-04 13:52:32 -05:00 |
|
Isaac Connor
|
0d404ac66f
|
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
|
2020-11-04 13:50:45 -05:00 |
|
Isaac Connor
|
4731041a40
|
FS Storage DiskSpace isn't implemented.
|
2020-11-04 12:42:04 -05:00 |
|
Isaac Connor
|
e67532ef76
|
implement is_valid_attr. Fix incorrect EventDiskspace vs FS DiskSpace. FS DiskSpace isn't implemented. DiskPercent is.
|
2020-11-04 12:40:43 -05:00 |
|
Isaac Connor
|
387b2b1fc2
|
add attr validation to addTerm. Add addTerms
|
2020-11-04 12:39:42 -05:00 |
|
Isaac Connor
|
af399bb174
|
Reqiure Id to have a value not just be set
|
2020-11-04 09:18:41 -05:00 |
|
Isaac Connor
|
2c899bd3c5
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-11-03 12:11:58 -05:00 |
|
Isaac Connor
|
6112db627c
|
Even if we found the filter in the db, if it is present in the query string, update the object with the new values
|
2020-11-03 11:59:28 -05:00 |
|
Isaac Connor
|
b2385ccecc
|
colour match a:link to navbar colour. This has the effect of brightening up all links.
|
2020-11-03 11:53:15 -05:00 |
|
Isaac Connor
|
dda1decfb1
|
When redirecting after execute, redirect to the full filter querystring, as it may not have an Id and may have additional changes
|
2020-11-03 11:45:22 -05:00 |
|
Isaac Connor
|
f7c9a0e03d
|
Must urlencode [Id]=
|
2020-11-03 11:44:54 -05:00 |
|
Isaac Connor
|
3b785cfde0
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-11-02 16:31:53 -05:00 |
Andrew Bauer
|
736c2e4cf5
|
Merge pull request #3068 from ZoneMinder/fix_endtime
Test for EndTime value before using strftime on it.
|
2020-11-02 15:21:43 -06:00 |
|
Isaac Connor
|
0f74e24bfc
|
Join Monitors as M as well in total and totalNotFiltered queries
|
2020-11-02 15:50:38 -05:00 |
|
Isaac Connor
|
bd1d4f954b
|
Test for EndTime value before using strftime on it.
|
2020-11-02 15:45:05 -05:00 |
|
Andrew Bauer
|
96a9a73320
|
roll back events.php
|
2020-11-02 14:33:40 -06:00 |
|
Isaac Connor
|
7650e0bf51
|
cleanup my totalNotFiltered code. Join Monitors as well as they can be referenced by the filter
|
2020-11-02 12:43:45 -05:00 |
|
Isaac Connor
|
492e65c2fd
|
Add missing PathToAPI
|
2020-11-02 12:42:30 -05:00 |
|
Isaac Connor
|
73e6d5a9d0
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-11-01 18:44:15 -05:00 |
Matt N
|
6e3eb922e0
|
Use relative symlinks for monitor event directories
This way the link continues to work from backups and after the user moves ZM data to a new directory.
|
2020-11-01 14:55:08 -08:00 |
|
Andrew Bauer
|
3d795be864
|
remove the thumbnail col if WEB_LIST_THUMBS is off
|
2020-11-01 15:46:43 -06:00 |
|
Isaac Connor
|
787953559d
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-11-01 16:11:10 -05:00 |
|
Andrew Bauer
|
824f38c746
|
hide settings buttons rather than disable for non Local monitors
|
2020-11-01 08:05:53 -06:00 |
|
Isaac Connor
|
30e0e49ee7
|
Fix total rows when using search
|
2020-10-31 14:09:47 -04:00 |
|
Andrew Bauer
|
5047c28157
|
attempt to fix totalnotfiltered
|
2020-10-31 11:26:29 -05:00 |
|
Isaac Connor
|
41e88fad6e
|
translate \n to <br/>. Fixes #3064
|
2020-10-29 15:08:14 -04:00 |
|
Isaac Connor
|
75ec13871d
|
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
|
2020-10-29 09:40:49 -04:00 |
|
Isaac Connor
|
97f4d9e7a2
|
Make the event count and diskspace in the storage row be a link to events for that storage area.
|
2020-10-29 09:40:14 -04:00 |
|
Isaac Connor
|
638a05b207
|
Fix totalrows in pagination. Still figuring this out.
|
2020-10-29 09:39:48 -04:00 |
|
Isaac Connor
|
368c1649fe
|
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
|
2020-10-29 08:47:34 -04:00 |
|
Isaac Connor
|
858674c0b2
|
Merge branch 'master' into filter_locking
|
2020-10-28 12:52:52 -04:00 |
|
Isaac Connor
|
686f793d09
|
fix truth value for ZM_OPT_USE_GEOLOCATION
|
2020-10-28 12:49:39 -04:00 |
|
Isaac Connor
|
b3a28b2ba2
|
fix confusion in syslog reporting web_php when the error was actually web_js
|
2020-10-28 12:49:03 -04:00 |
|
Isaac Connor
|
df788f2810
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-10-28 12:40:00 -04:00 |
|
Isaac Connor
|
c67b3c5a1f
|
fix button disabled status. We now have checkboxes that aren't actions so we need to be more explicit
|
2020-10-26 18:49:41 -04:00 |
|
Isaac Connor
|
1690bcbd38
|
update auth_relay when we update auth_hash
|
2020-10-26 18:49:14 -04:00 |
|
Isaac Connor
|
a5bb2365b5
|
update auth_relay when we update auth_hash
|
2020-10-26 18:49:03 -04:00 |
|
Isaac Connor
|
ffc5249a66
|
add LockRows to Filters
|
2020-10-26 18:47:55 -04:00 |
|
Isaac Connor
|
a2596505e9
|
add LockRows to Filters
|
2020-10-26 18:47:17 -04:00 |
|
Andrew Bauer
|
7b106e2522
|
don't use wildcards in advanced search
|
2020-10-26 12:20:26 -05:00 |
|
Andrew Bauer
|
fad4339713
|
no need for full page reload with server pagination
|
2020-10-26 12:12:50 -05:00 |
|
Isaac Connor
|
5ed168bccd
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-10-26 13:07:18 -04:00 |
|
Isaac Connor
|
1f64a263eb
|
give better log when jqxhr is empty
|
2020-10-26 13:06:41 -04:00 |
|
Isaac Connor
|
59cf5c33c2
|
reset search on events load
|
2020-10-26 13:06:22 -04:00 |
|
Isaac Connor
|
da87b5b475
|
Make invalid sort field non-fatal. Fix column specification in search and advscearch and fix resulting sql due to = instead of .=
|
2020-10-26 13:06:05 -04:00 |
|
Andrew Bauer
|
97573122bc
|
fix EndTime
|
2020-10-26 09:33:11 -05:00 |
|
Andrew Bauer
|
27b39a0258
|
comment out warning used for debug
|
2020-10-26 09:19:08 -05:00 |
|
Isaac Connor
|
4abfa61bbc
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-10-26 10:03:12 -04:00 |
|
Isaac Connor
|
4c791b390f
|
fix warning due to undefined vars being used
|
2020-10-26 09:59:15 -04:00 |
|
Isaac Connor
|
706bf085f4
|
Add pre and post sql conditions and pre-populate the return
|
2020-10-26 09:58:47 -04:00 |
|
Andrew Bauer
|
e5563dc901
|
remove unwanted #
|
2020-10-25 16:06:37 -05:00 |
|
Andrew Bauer
|
6d00924c9b
|
deploy server pagination for events view
|
2020-10-25 12:11:34 -05:00 |
|
Andrew Bauer
|
8cf899efc5
|
remove commented line
|
2020-10-25 10:58:27 -05:00 |
|
Andrew Bauer
|
e9b71b4ce1
|
events view server pagination - fix sorting name & monitor
|
2020-10-25 10:40:29 -05:00 |
|
Andrew Bauer
|
cb073950b9
|
events view server pagination WIP
|
2020-10-25 10:28:22 -05:00 |
|
Andrew Bauer
|
f87be2d289
|
specify the table name when we sort in events view
|
2020-10-25 08:24:56 -05:00 |
|
Isaac Connor
|
a2dc4b5f08
|
handle params.daa not existing
|
2020-10-24 09:45:38 -04:00 |
|
Isaac Connor
|
90c5f63d6d
|
Fix session.gc SQL issue. Don't need a * when deleting
|
2020-10-24 09:05:39 -04:00 |
|
Isaac Connor
|
efaf95beda
|
dirty hack to rename data.filter to data.advsearch
|
2020-10-24 08:51:26 -04:00 |
|
Isaac Connor
|
760e20bc0f
|
Populate Monitor name and use event class DiskSpace to get DiskSpace when it hasn't been populated in the db yet
|
2020-10-24 08:50:59 -04:00 |
|
Isaac Connor
|
2178da387d
|
pass desired object name into querystring()
|
2020-10-23 17:56:38 -04:00 |
|
Isaac Connor
|
b6004012e9
|
implement passing the object name to use when constructing the querystring
|
2020-10-23 17:56:05 -04:00 |
|
Isaac Connor
|
2ebd686d19
|
Use a ZM\Filter for initial filtering. SELECT E.*,M.* to match how we do it in Filters and older event code. pass the row into new Event() so that it doesn't go back to the DB to get the Event property data.
|
2020-10-23 17:55:43 -04:00 |
|
Isaac Connor
|
da080d44c1
|
rename filter from bootstrap-table to advsearch so as not to conflict with our existing filter
|
2020-10-23 16:44:50 -04:00 |
|
Isaac Connor
|
8a3e0e108c
|
Put back filter query code
|
2020-10-23 14:02:27 -04:00 |
|
Isaac Connor
|
ad137adb4c
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-10-23 11:30:19 -04:00 |
|
Andrew Bauer
|
d425d1006e
|
push newevents.php to master
|
2020-10-23 10:21:32 -05:00 |
|
Isaac Connor
|
5d7e3b0510
|
handle no responseText in jqxhr
|
2020-10-23 11:12:57 -04:00 |
|
Isaac Connor
|
d62a5caccd
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-10-23 09:35:13 -04:00 |
|
Isaac Connor
|
90e81c5774
|
Merge branch 'release-1.34'
|
2020-10-23 09:34:35 -04:00 |
|
Isaac Connor
|
c8392feba3
|
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
|
2020-10-22 16:35:44 -04:00 |
|
Andrew Bauer
|
235dd2a2fb
|
don't use wildcards in event view advanced search fields
|
2020-10-22 15:06:06 -05:00 |
|
Andrew Bauer
|
29819d8044
|
fix copy/paste error with events.php
|
2020-10-22 13:27:47 -05:00 |
|
Andrew Bauer
|
d117e993ad
|
add create task to ajax/log.php
|
2020-10-22 10:17:34 -05:00 |
|
Andrew Bauer
|
230f35f0c0
|
comment out debug in events.js
|
2020-10-22 08:50:06 -05:00 |
|
Andrew Bauer
|
0d14dcfbfa
|
WIP events view server pagination
|
2020-10-22 08:49:07 -05:00 |
|
Isaac Connor
|
9372b2ef8c
|
remove debug
|
2020-10-22 08:53:05 -04:00 |
|
Isaac Connor
|
4a0ada5335
|
improve logging of invalid task in ajax/log
|
2020-10-22 08:52:54 -04:00 |
|
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 |
|
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 |
|
Andrew Bauer
|
89f298771f
|
server pagination backend improvements
|
2020-10-19 12:25:13 -05: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 |
|
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 |
|
Andrew Bauer
|
f98a885ed5
|
update the watch view header
|
2020-10-16 08:08:23 -05:00 |
|
Isaac Connor
|
4f56f9d82b
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-10-15 17:20:10 -04:00 |
|
Isaac Connor
|
12b75e93b8
|
Merge branch 'release-1.34'
|
2020-10-15 17:19:56 -04:00 |
|
Isaac Connor
|
78cbacae2e
|
When changing rates, if not using video.js, send CMD_VARPLAY to tell zms what to do
|
2020-10-15 17:18:38 -04:00 |
|
Isaac Connor
|
5869817e0d
|
set playbackrates in video.js to match the ones offered by the zms player. Use the rates array set in includes/config.php
|
2020-10-15 17:17:20 -04:00 |
|
Isaac Connor
|
3c5dc8e8b3
|
Add line breaks in select options
|
2020-10-15 17:16:14 -04:00 |
|
Isaac Connor
|
7bb227283d
|
Update rates in includes/config.php
|
2020-10-15 17:15:54 -04:00 |
|
Andrew Bauer
|
2fbbe11079
|
make the filter button style consistent
|
2020-10-15 08:01:32 -05:00 |
|
Andrew Bauer
|
f32a7aaff5
|
deploy insertModalHtml
|
2020-10-14 15:58:39 -05:00 |
|
Andrew Bauer
|
ec040b1bfd
|
don't set popup flag in event view
|
2020-10-14 13:59:15 -05:00 |
|
Andrew Bauer
|
e69b3800c7
|
set return status for cancel and restart commands
|
2020-10-14 12:22:21 -05:00 |
|
Andrew Bauer
|
a60815a700
|
eslint
|
2020-10-14 11:20:37 -05:00 |