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
|
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
|
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 |