Isaac Connor
|
368c1649fe
|
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
|
2020-10-29 08:47:34 -04:00 |
Isaac Connor
|
a35c143094
|
Prevent extra foreign keys from being created and fix we can't delete from Zones. Must be done manually
|
2020-10-28 15:01:14 -04:00 |
Isaac Connor
|
9a9f80c15c
|
show which user we are updating permissions for
|
2020-10-28 14:07:29 -04:00 |
Isaac Connor
|
86bf491fe1
|
Add Locking to filters, bump db to 1.35.12.
|
2020-10-28 12:55:32 -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
|
4c92c99ba1
|
bump version for 1.35.11 db updates
|
2020-10-28 12:39:50 -04:00 |
Isaac Connor
|
43b7021f9c
|
ALTER Events.Id to BIGINT. This update got lost at somepoint. Add FOREIGN KEYS to Frames, Stats and Zones tables
|
2020-10-28 12:38:44 -04:00 |
Isaac Connor
|
59884375fa
|
Add references permission so that our zmupdate can add foreign keys
|
2020-10-28 09:23:46 -04:00 |
Isaac Connor
|
3825af8243
|
Add FOREIGN KEYS for EventId in Frames, Stats. MonitorId, ZoneId in Stats. MonitorId in Zones.
|
2020-10-28 09:19:54 -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
|
f3f0a6baff
|
remove debug
|
2020-10-26 18:48:43 -04:00 |
Isaac Connor
|
cd9b16a467
|
add LockRows to Filters
|
2020-10-26 18:48:16 -04:00 |
Isaac Connor
|
ffc5249a66
|
add LockRows to Filters
|
2020-10-26 18:47:55 -04:00 |
Isaac Connor
|
7a65a64644
|
add LockRows to Filters
|
2020-10-26 18:47:40 -04:00 |
Isaac Connor
|
a2596505e9
|
add LockRows to Filters
|
2020-10-26 18:47:17 -04:00 |
Isaac Connor
|
1fde123ebc
|
add LockRows to Filters
|
2020-10-26 18:47:03 -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 |
Isaac Connor
|
cdab6701c2
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-10-25 11:48:15 -04: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
|
32d7f5ec13
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-10-23 18:35:03 -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 |